Merge #15865 - Fix #12969 - Tap and hold will not dismiss Error box

Pull-request: #15865 Fixes: #12969 Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Feb 23, 2020 · aa4f18c · williamdes · Feb 23, 2020 · aa4f18c
2 parents 731ddfe + 50c4bc2
commit aa4f18c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/js/designer/move.js b/js/designer/move.js
@@ -2128,7 +2128,7 @@ AJAX.registerOnload('designer/move.js', function () {
     });
     $('#SaveAs').on('click', function () {
         DesignerMove.saveAs();
-        $(document).ajaxStop(function () {
+        $(document).on('ajaxStop', function () {
             $('#selected_value').on('click', function () {
                 $('#save_page_new').prop('checked', true);
             });

diff --git a/js/functions.js b/js/functions.js
@@ -2466,8 +2466,18 @@ $(function () {
      * Allows the user to dismiss a notification
      * created with Functions.ajaxShowMessage()
      */
-    $(document).on('click', 'span.ajax_notification.dismissable', function () {
-        Functions.ajaxRemoveMessage($(this));
+    var holdStarter = null;
+    $(document).on('mousedown', 'span.ajax_notification.dismissable', function () {
+        holdStarter = setTimeout(function () {
+            holdStarter = null;
+        }, 250);
+    });
+
+    $(document).on('mouseup', 'span.ajax_notification.dismissable', function () {
+        if (holdStarter && event.which === 1) {
+            clearTimeout(holdStarter);
+            Functions.ajaxRemoveMessage($(this));
+        }
     });
     /**
      * The below two functions hide the "Dismiss notification" tooltip when a user