Merge remote-tracking branch 'origin/master'

2014-05-12 08:31:04 +02:00 · 2014-05-12 08:31:04 +02:00 · b7c231790d
commit b7c231790d
parent 52a7e216f1 b6ad6c4860
1 changed files with 4 additions and 1 deletions
--- a/js/ajax.js
+++ b/js/ajax.js
@ -192,7 +192,10 @@ var AJAX = {
                break;
            }
        };
-        if (event.type === 'click' && isInputAltered && confirm(PMA_messages['strConfirmNavigation']) === false) {
+        if (event.type === 'click'
+            && event.isTrigger !== true
+            && isInputAltered
+            && confirm(PMA_messages['strConfirmNavigation']) === false) {
            return false;
        }
        //reset