Photos v.2.1.2

Leonix · Leonix · commit a77359b97cb1 · 2022-06-15T11:43:12.000+03:00
* Fixed viewing of photos, after selecting a tag written in non-Latin letters, in the app’s backend.
  * Added support for WebP images.
  * Minor user interface improvement.
diff --git a/wa-apps/photos/js/jquery.fileupload-wa.js b/wa-apps/photos/js/jquery.fileupload-wa.js
@@ -455,7 +455,7 @@
             // only browsers with support for the File API report the type:
             if (!(this.options.acceptFileTypes.test(file.type) ||
                     this.options.acceptFileTypes.test(file.name))) {
-                return $_('Files with extensions *.gif, *.jpg, *.jpeg, *.png are allowed only.');
+                return $_('Files with extensions *.gif, *.jpg, *.jpeg, *.png, *.webp are allowed only.');
             }
             if (this.options.maxFileSize &&
                     file.size > this.options.maxFileSize) {
diff --git a/wa-apps/photos/js/legacy/jquery.fileupload-wa.js b/wa-apps/photos/js/legacy/jquery.fileupload-wa.js
@@ -450,7 +450,7 @@
             // only browsers with support for the File API report the type:
             if (!(this.options.acceptFileTypes.test(file.type) ||
                     this.options.acceptFileTypes.test(file.name))) {
-                return $_('Files with extensions *.gif, *.jpg, *.jpeg, *.png are allowed only.');
+                return $_('Files with extensions *.gif, *.jpg, *.jpeg, *.png, *.webp are allowed only.');
             }
             if (this.options.maxFileSize &&
                     file.size > this.options.maxFileSize) {
diff --git a/wa-apps/photos/js/legacy/photos.js b/wa-apps/photos/js/legacy/photos.js
@@ -2971,10 +2971,10 @@
                     $(".lazyloading-wrapper .lazyloading-link").hide();
                     $.post(
                         '?module=photo&action=loadList',
-                        { offset : offset, hash: $.photos.hash },
+                        { offset : offset, hash: decodeURI($.photos.hash) },
                         function (r) {
                             // if hash has changed already than ignore
-                            if (r.data.hash != $.photos.hash) {
+                            if (r.data.hash != decodeURI($.photos.hash)) {
                                 return;
                             }
                             var target = $("#photo-list");
diff --git a/wa-apps/photos/js/photos.js b/wa-apps/photos/js/photos.js
@@ -3165,10 +3165,10 @@
                     $(".lazyloading-wrapper .lazyloading-link").hide();
                     $.post(
                         '?module=photo&action=loadList',
-                        { offset : offset, hash: $.photos.hash },
+                        { offset : offset, hash: decodeURI($.photos.hash) },
                         function (r) {
                             // if hash has changed already than ignore
-                            if (r.data.hash != $.photos.hash) {
+                            if (r.data.hash != decodeURI($.photos.hash)) {
                                 return;
                             }
                             var target = $("#photo-list");
diff --git a/wa-apps/photos/js/sidebar.js b/wa-apps/photos/js/sidebar.js
@@ -346,30 +346,27 @@
         },
 
         initHandlers: function() {
+            let dialog;
+
             $("#p-upload-link").on('click', function (e) {
                 e.preventDefault();
-                let $dialog = $('#p-uploader')
+
+                if (dialog) {
+                    dialog.show();
+                    return;
+                }
+
+                let $dialog = $('#p-uploader');
 
                 if($dialog.length) {
-                    $.waDialog({
+                    dialog = $.waDialog({
                         $wrapper: $dialog,
                         onOpen($_dialog, dialog_instance) {
                             $.photos.onUploadDialog($_dialog, dialog_instance)
                         },
                         onClose(dialog_instance) {
-                            let $dialog = dialog_instance.$wrapper;
-                            if (dialog_instance.animate) {
-                                dialog_instance.animateDialog(false).then( function() {
-                                    dialog_instance.$wrapper.hide();
-                                });
-                            } else {
-                                dialog_instance.$wrapper.hide();
-                            }
-
-                            if (dialog_instance.lock_body_scroll) {
-                                document.querySelector('body').classList.remove('is-locked')
-                            }
                             $.photos.dialogClearSteps.call($dialog);
+                            dialog_instance.hide();
                             return false;
                         }
                     });
diff --git a/wa-apps/photos/lib/actions/backend/photosBackendLoc.action.php b/wa-apps/photos/lib/actions/backend/photosBackendLoc.action.php
@@ -28,7 +28,7 @@ public function execute()
             'Plugins', //_w('Plugins')
             'Settings', //_w('Settings')
             'add a tag', //_w('add a tag'),
-            'Files with extensions *.gif, *.jpg, *.jpeg, *.png are allowed only.', //_w('Files with extensions *.gif, *.jpg, *.jpeg, *.png are allowed only.'),
+            'Files with extensions *.gif, *.jpg, *.jpeg, *.png, *.webp are allowed only.', //_w('Files with extensions *.gif, *.jpg, *.jpeg, *.png, *.webp are allowed only.'),
             'Close', //_w('Close'),
             'Stop upload', //_w('Stop upload'),
             'Edit title...', //_w('Edit title...'),
diff --git a/wa-apps/photos/lib/config/app.php b/wa-apps/photos/lib/config/app.php
@@ -10,7 +10,7 @@
     'plugins' => true,
     'pages' => true,
     'mobile' => true,
-    'version' => '2.1.1',
+    'version' => '2.1.2',
     'vendor' => 'webasyst',
     'my_account' => true,
     'sash_color' => '#af71b3',
diff --git a/wa-apps/photos/locale/en_US/LC_MESSAGES/photos.po b/wa-apps/photos/locale/en_US/LC_MESSAGES/photos.po
@@ -465,8 +465,8 @@ msgstr ""
 msgid "Upload photos (%d)"
 msgstr ""
 
-msgid "Files with extensions *.gif, *.jpg, *.jpeg, *.png are allowed only."
-msgstr "Only files with name extensions .gif, .jpg, .jpeg, .png are allowed."
+msgid "Files with extensions *.gif, *.jpg, *.jpeg, *.png, *.webp are allowed only."
+msgstr "Only files with name extensions *.gif, *.jpg, *.jpeg, *.png, *.webp are allowed."
 
 msgid "You don't have sufficient access rights"
 msgstr "You don't have sufficient access rights."
diff --git a/wa-apps/photos/locale/ru_RU/LC_MESSAGES/photos.po b/wa-apps/photos/locale/ru_RU/LC_MESSAGES/photos.po
@@ -511,8 +511,8 @@ msgstr "Применить фильтр резкости при создании
 msgid "Click “Save” button below to apply this change."
 msgstr "Щелкните по кнопке «Сохранить» внизу, чтобы применить это изменение."
 
-msgid "Files with extensions *.gif, *.jpg, *.jpeg, *.png are allowed only."
-msgstr "Допускаются только файлы с расширениями имени .gif, .jpg, .jpeg, .png"
+msgid "Files with extensions *.gif, *.jpg, *.jpeg, *.png, *.webp are allowed only."
+msgstr "Допускаются только файлы с расширениями имени *.gif, *.jpg, *.jpeg, *.png, *.webp"
 
 msgid "You don't have sufficient access rights"
 msgstr "У вас недостаточно прав доступа."
diff --git a/wa-apps/photos/templates/actions-legacy/upload/Upload.html b/wa-apps/photos/templates/actions-legacy/upload/Upload.html
@@ -240,7 +240,7 @@ <h1>
         });
         // Initialize the jQuery File Upload widget:
         $('#fileupload').fileupload({
-            acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
+            acceptFileTypes: /(\.|\/)(gif|jpe?g|png|webp)$/i
         });
     });
 </script>
diff --git a/wa-apps/photos/templates/actions/backend/BackendAlbums.html b/wa-apps/photos/templates/actions/backend/BackendAlbums.html
@@ -1,4 +1,4 @@
-<section class="content hide-scrollbar box contentbox">
+<section class="content box contentbox">
 
 {if !count($albums)}
 
diff --git a/wa-apps/photos/templates/actions/photo/PhotoEmbedSelector.html b/wa-apps/photos/templates/actions/photo/PhotoEmbedSelector.html
@@ -10,7 +10,7 @@
 #photo-embedded-selector img.p-app16x16icon-menu { width: 16px; height: 16px; position: absolute; left: 2px; }
 </style>
 <div id="photo-embedded-selector">
-    <aside class="sidebar hide-scrollbar scrolls-with-content right width-12rem">
+    <aside class="sidebar scrolls-with-content right width-12rem">
         <div class="block">
             {if $app_albums}
                 <div class="hierarchical">
@@ -35,7 +35,7 @@
         </div>
     </aside>
 
-    <section class="content hide-scrollbar box">
+    <section class="content box">
         <ul class="thumbs li100px">
         {foreach $photos as $p}
             <li data-photo-id="{$p.id}">
@@ -174,4 +174,4 @@
         return false;
     }
 
-})();</script>
+})();</script>
diff --git a/wa-apps/photos/templates/actions/photo/PhotoList.html b/wa-apps/photos/templates/actions/photo/PhotoList.html
@@ -1,6 +1,6 @@
 <script type="text/javascript" src="{$wa_app_static_url}js/lazy.load.js?v={$wa->version()}"></script>
-<div class="box contentbox flexbox content hide-scrollbar">
-<section class="content hide-scrollbar" id="p-content">
+<div class="box contentbox flexbox content">
+<section class="content" id="p-content">
 
     {if empty($photos) && empty($album) && empty($hash)}
         <div class="article" id="welcome-block">
diff --git a/wa-apps/photos/templates/actions/upload/Upload.html b/wa-apps/photos/templates/actions/upload/Upload.html
@@ -275,7 +275,7 @@ <h3>
 
         // Initialize the jQuery File Upload widget:
         $('#fileupload').fileupload({
-            acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
+            acceptFileTypes: /(\.|\/)(gif|jpe?g|png|webp)$/i
         });
     });
 </script>
diff --git a/wa-apps/photos/templates/layouts/Default.html b/wa-apps/photos/templates/layouts/Default.html
@@ -58,7 +58,7 @@
     <div class="p-app-wrapper" id="wa-app">
         <div class="flexbox wrap-mobile">
             {include "templates/layouts/Sidebar.html"}
-            <div class="content blank p-app-content flexbox hide-scrollbar" id="content">
+            <div class="content blank p-app-content flexbox" id="content">
                 {if isset($content)}{$content}{/if}
             </div>
         </div>
@@ -300,7 +300,7 @@ <h5 class="heading custom-mt-0 custom-mb-4 custom-ml-0">[`Tags`]</h5>
 {/literal}{/capture}
 
 {capture name="template-p-block"}
-<section class="content hide-scrollbar" id="p-content">
+<section class="content" id="p-content">
     <div id="p-block"></div>
     <div id="changable-area"></div>
     <div id="cover" class="dialog-background" style="display:none;">
diff --git a/wa-apps/photos/templates/layouts/Sidebar.html b/wa-apps/photos/templates/layouts/Sidebar.html
@@ -1,4 +1,4 @@
-<div class="p-app-sidebar sidebar hide-scrollbar flexbox overflow-visible width-adaptive-wider mobile-friendly" id="js-app-sidebar">
+<div class="p-app-sidebar sidebar flexbox overflow-visible width-adaptive-wider mobile-friendly" id="js-app-sidebar">
     <nav class="sidebar-mobile-toggle">
         <div class="box align-center">
             <a href="javascript:void(0);"><i class="fas fa-bars"></i> [`Show navigation`]</a>
@@ -14,7 +14,7 @@
         </div>
     </div>
     {/if}
-    <div class="sidebar-body hide-scrollbar p-sidebar-block">
+    <div class="sidebar-body p-sidebar-block">
         <ul class="menu">
             <li id="sidebar-all-albums">
                 <a href="#/albums/">

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@`
`455`	`455`	`// only browsers with support for the File API report the type:`
`456`	`456`	`if (!(this.options.acceptFileTypes.test(file.type) \|\|`
`457`	`457`	`this.options.acceptFileTypes.test(file.name))) {`
`458`		`- return $_('Files with extensions .gif, .jpg, .jpeg, .png are allowed only.');`
	`458`	`+ return $_('Files with extensions .gif, .jpg, .jpeg, .png, *.webp are allowed only.');`
`459`	`459`	`}`
`460`	`460`	`if (this.options.maxFileSize &&`
`461`	`461`	`file.size > this.options.maxFileSize) {`
Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@`
`450`	`450`	`// only browsers with support for the File API report the type:`
`451`	`451`	`if (!(this.options.acceptFileTypes.test(file.type) \|\|`
`452`	`452`	`this.options.acceptFileTypes.test(file.name))) {`
`453`		`- return $_('Files with extensions .gif, .jpg, .jpeg, .png are allowed only.');`
	`453`	`+ return $_('Files with extensions .gif, .jpg, .jpeg, .png, *.webp are allowed only.');`
`454`	`454`	`}`
`455`	`455`	`if (this.options.maxFileSize &&`
`456`	`456`	`file.size > this.options.maxFileSize) {`