nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6803 from Flaburgan/5396-fix-error-message-on-mobile-upload

Browse source 
Fix error message on mobile image upload, close #5396
This commit is contained in:
Dennis Schubert 2016-04-21 07:24:59 +02:00
commit e9fb29eba4
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -117,6 +117,7 @@ Contributions are very welcome, the hard work is done!
* Fixed eye not stopping all processes when trying to exit `script/server` [#6693](https://github.com/diaspora/diaspora/pull/6693) * Fixed eye not stopping all processes when trying to exit `script/server` [#6693](https://github.com/diaspora/diaspora/pull/6693)
* Do not change contacts count when marking notifications on the contacts page as read [#6718](https://github.com/diaspora/diaspora/pull/6718) * Do not change contacts count when marking notifications on the contacts page as read [#6718](https://github.com/diaspora/diaspora/pull/6718)
* Fix typeahead for non-latin characters [#6741](https://github.com/diaspora/diaspora/pull/6741) * Fix typeahead for non-latin characters [#6741](https://github.com/diaspora/diaspora/pull/6741)
* Fix upload size error on mobile [#6803](https://github.com/diaspora/diaspora/pull/6803)
## Features ## Features
* Support color themes [#6033](https://github.com/diaspora/diaspora/pull/6033) * Support color themes [#6033](https://github.com/diaspora/diaspora/pull/6033)

15
app/assets/javascripts/mobile/mobile_file_uploader.js
View file

@ -2,7 +2,6 @@
//= require js_image_paths //= require js_image_paths
function createUploader(){ function createUploader(){
var aspectIds = gon.preloads.aspect_ids; var aspectIds = gon.preloads.aspect_ids;
new qq.FileUploaderBasic({ new qq.FileUploaderBasic({
@ -10,7 +9,7 @@ function createUploader(){
params: {'photo' : {'pending' : 'true', 'aspect_ids' : aspectIds},}, params: {'photo' : {'pending' : 'true', 'aspect_ids' : aspectIds},},
allowedExtensions: ['jpg', 'jpeg', 'png', 'gif', 'tiff'], allowedExtensions: ['jpg', 'jpeg', 'png', 'gif', 'tiff'],
action: "/photos", action: "/photos",
debug: true, debug: false,
button: document.getElementById('file-upload-publisher'), button: document.getElementById('file-upload-publisher'),
sizeLimit: 4194304, sizeLimit: 4194304,
@ -21,8 +20,8 @@ function createUploader(){
messages: { messages: {
typeError: Diaspora.I18n.t("photo_uploader.invalid_ext"), typeError: Diaspora.I18n.t("photo_uploader.invalid_ext"),
sizeError: Diaspora.I18n.t("photo_uploader.new_photo.size_error"), sizeError: Diaspora.I18n.t("photo_uploader.size_error"),
emptyError: Diaspora.I18n.t("photo_uploader.new_photo.empty") emptyError: Diaspora.I18n.t("photo_uploader.empty")
}, },
onSubmit: function(){ onSubmit: function(){
@ -75,10 +74,10 @@ function createUploader(){
}); });
}, },
onAllComplete: function(){ onAllComplete: function(){}
}
}); });
} }
createUploader(); window.addEventListener("load", function() {
createUploader();
});
// @license-end // @license-end