Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2014-12-08 09:06:51 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2014-12-08 09:06:51 +0300
commit669e8981d7a78c5c02b05237a1ac39111158a9ac (patch)
tree7edc1df52ce799ca6bb74b9d880d0537dc16e504 /js/multi_column_sort.js
parenta8a158e0f0045554b65bacb3e63ff301b65a2d11 (diff)
bug #4626 Ctrl + click on a column not in sort triggers a server call to erroneous url
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'js/multi_column_sort.js')
-rw-r--r--js/multi_column_sort.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/js/multi_column_sort.js b/js/multi_column_sort.js
index e72728fe21..58e197ef97 100644
--- a/js/multi_column_sort.js
+++ b/js/multi_column_sort.js
@@ -37,7 +37,7 @@ function removeColumnFromMultiSort(target, parent)
// If the given column is not part of the order clause exit from this function
var index = parent.find('small').length ? parent.find('small').text() : '';
if (index === ''){
- return;
+ return '';
}
// Remove the current clicked column
columns.splice(index-1, 1);
@@ -62,8 +62,10 @@ AJAX.registerOnload('keyhandler.js', function () {
if (event.ctrlKey) {
event.preventDefault();
url = removeColumnFromMultiSort(url, $(this).parent());
- AJAX.source = $(this);
- $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler);
+ if (url) {
+ AJAX.source = $(this);
+ $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler);
+ }
} else if (event.shiftKey) {
event.preventDefault();
AJAX.source = $(this);