Merge remote-tracking branch 'origin/master'

phpmyadmin · Oct 20, 2014 · c541114 · c541114
2 parents 03b8471 + d2aec03
commit c541114
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/js/navigation.js b/js/navigation.js
@@ -1309,19 +1309,21 @@ PMA_fastFilter.filter.prototype.request = function () {
             type: 'post',
             dataType: 'json',
             data: params,
-            complete: function (jqXHR) {
-                var data = $.parseJSON(jqXHR.responseText);
-                self.$this.find('li.fast_filter').find('div.throbber').remove();
-                if (data && data.results) {
-                    var $listItem = $('<li />', {'class': 'moreResults'})
-                        .appendTo(self.$this.find('li.fast_filter'));
-                    $('<a />', {href: '#'})
-                        .text(data.results)
-                        .appendTo($listItem)
-                        .click(function (event) {
-                            event.preventDefault();
-                            self.swap.apply(self, [data.message]);
-                        });
+            complete: function (jqXHR, status) {
+                if (status != 'abort') {
+                    var data = $.parseJSON(jqXHR.responseText);
+                    self.$this.find('li.fast_filter').find('div.throbber').remove();
+                    if (data && data.results) {
+                        var $listItem = $('<li />', {'class': 'moreResults'})
+                            .appendTo(self.$this.find('li.fast_filter'));
+                        $('<a />', {href: '#'})
+                            .text(data.results)
+                            .appendTo($listItem)
+                            .click(function (event) {
+                                event.preventDefault();
+                                self.swap.apply(self, [data.message]);
+                            });
+                    }
                 }
             }
         });