Commit e9fb29eb authored by Dennis Schubert's avatar Dennis Schubert
Browse files

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

Fix error message on mobile image upload, close #5396
parents 2b5f20ef 96e0635b

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -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)

* 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 upload size error on mobile [#6803](https://github.com/diaspora/diaspora/pull/6803)



## Features

* Support color themes [#6033](https://github.com/diaspora/diaspora/pull/6033)

app/assets/javascripts/mobile/mobile_file_uploader.js

+7 −8
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
//= require js_image_paths



function createUploader(){



   var aspectIds = gon.preloads.aspect_ids;



   new qq.FileUploaderBasic({
@@ -10,7 +9,7 @@ function createUploader(){ 
       params: {'photo' : {'pending' : 'true', 'aspect_ids' : aspectIds},},

       allowedExtensions: ['jpg', 'jpeg', 'png', 'gif', 'tiff'],

       action: "/photos",

       debug: true,

       debug: false,

       button: document.getElementById('file-upload-publisher'),

       sizeLimit: 4194304,
@@ -21,8 +20,8 @@ function createUploader(){ 


       messages: {

          typeError: Diaspora.I18n.t("photo_uploader.invalid_ext"),

          sizeError: Diaspora.I18n.t("photo_uploader.new_photo.size_error"),

          emptyError: Diaspora.I18n.t("photo_uploader.new_photo.empty")

          sizeError: Diaspora.I18n.t("photo_uploader.size_error"),

          emptyError: Diaspora.I18n.t("photo_uploader.empty")

       },



       onSubmit: function(){
@@ -75,10 +74,10 @@ function createUploader(){ 
        });

       },



       onAllComplete: function(){

       }



       onAllComplete: function(){}

   });

}

window.addEventListener("load", function() {

  createUploader();

});

// @license-end