diff options
| author | cmrd Senya <35317-cmrd-senya@users.noreply.gitlab.gnome.org> | 2022-07-17 13:06:53 +0300 |
|---|---|---|
| committer | cmrd Senya <35317-cmrd-senya@users.noreply.gitlab.gnome.org> | 2022-07-17 13:07:09 +0300 |
| commit | 3c3b988603feb43a47aafbdb68f6a68643b8ba1d (patch) | |
| tree | d3598650ec862db7ea3f2236f6b18f776cc4d9c0 /app/assets | |
| parent | 551841e0ad4dcb4fcc174aeeb02dd4c1455fdab6 (diff) | |
| parent | d0af34c0790e13eef187813d12f35ffe6f11b373 (diff) | |
Merge branch 'develop' into use-yarn-for-assets
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/helpers/post_photo_uploader.es6 | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/mobile/mobile_profile_photo_uploader.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/helpers/post_photo_uploader.es6 b/app/assets/javascripts/helpers/post_photo_uploader.es6 index ba94ec5ed..8f1f5695b 100644 --- a/app/assets/javascripts/helpers/post_photo_uploader.es6 +++ b/app/assets/javascripts/helpers/post_photo_uploader.es6 @@ -59,8 +59,8 @@ Diaspora.PostPhotoUploader = class { promptForName: true }, validation: { - acceptFiles: "image/png, image/jpeg, image/gif", - allowedExtensions: ["jpg", "jpeg", "png", "gif"], + acceptFiles: "image/png, image/jpeg, image/gif, image/webp", + allowedExtensions: ["jpg", "jpeg", "png", "gif", "webp"], sizeLimit: (window.Promise && qq.supportedFeatures.scaling ? null : this.sizeLimit) }, messages: { diff --git a/app/assets/javascripts/mobile/mobile_profile_photo_uploader.js b/app/assets/javascripts/mobile/mobile_profile_photo_uploader.js index cc70ba1c1..f3a5a9c08 100644 --- a/app/assets/javascripts/mobile/mobile_profile_photo_uploader.js +++ b/app/assets/javascripts/mobile/mobile_profile_photo_uploader.js @@ -11,8 +11,8 @@ Diaspora.ProfilePhotoUploader.prototype = { new qq.FineUploaderBasic({ element: document.getElementById("file-upload"), validation: { - acceptFiles: "image/png, image/jpeg, image/gif", - allowedExtensions: ["jpg", "jpeg", "png"], + acceptFiles: "image/png, image/jpeg, image/gif, image/webp", + allowedExtensions: ["png", "jpg", "jpeg", "gif", "webp"], sizeLimit: 4194304 }, request: { |