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:
authorAnn + J.M <phpMyAdmin@ZweiSteinSoft.de>2014-07-03 00:29:42 +0400
committerAnn + J.M <phpMyAdmin@ZweiSteinSoft.de>2014-07-03 00:30:18 +0400
commitc7b2ee28f3e78c3b816c4852d63bae6ad211f100 (patch)
treeefd2a667a48daec06739a11bc3b303a1beff876a /js/multi_column_sort.js
parenta995e28258db781478b0b42f4d8d5bda1f9fa37c (diff)
Fix coding style in JS files
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
Diffstat (limited to 'js/multi_column_sort.js')
-rw-r--r--js/multi_column_sort.js40
1 files changed, 20 insertions, 20 deletions
diff --git a/js/multi_column_sort.js b/js/multi_column_sort.js
index 51ea76b34e..e72728fe21 100644
--- a/js/multi_column_sort.js
+++ b/js/multi_column_sort.js
@@ -1,12 +1,12 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
- * @fileoverview Implements the shiftkey + click remove column
+ * @fileoverview Implements the shiftkey + click remove column
* from order by clause funcationality
* @name columndelete
*
* @requires jQuery
*/
-
+
function captureURL(url)
{
var URL = {};
@@ -14,15 +14,15 @@ function captureURL(url)
// Exclude the url part till HTTP
url = url.substr(url.search("sql.php"), url.length);
// The url part between ORDER BY and &session_max_rows needs to be replaced.
- URL['head'] = url.substr(0, url.indexOf('ORDER+BY') + 9);
- URL['tail'] = url.substr(url.indexOf("&session_max_rows"), url.length);
- return URL;
+ URL.head = url.substr(0, url.indexOf('ORDER+BY') + 9);
+ URL.tail = url.substr(url.indexOf("&session_max_rows"), url.length);
+ return URL;
}
/**
* This function is for navigating to the generated URL
*
- * @param object target HTMLAnchor element
+ * @param object target HTMLAnchor element
* @param object parent HTMLDom Object
*/
@@ -33,31 +33,31 @@ function removeColumnFromMultiSort(target, parent)
var end = target.indexOf('&session_max_rows');
// get the names of the columns involved
var between_part = target.substr(begin, end-begin);
- var columns = between_part.split('%2C+');
+ var columns = between_part.split('%2C+');
// 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 == ''){
+ var index = parent.find('small').length ? parent.find('small').text() : '';
+ if (index === ''){
return;
}
// Remove the current clicked column
- columns.splice(index-1, 1);
+ columns.splice(index-1, 1);
// If all the columns have been removed dont submit a query with nothing
// After order by clause.
- if (columns.length == 0){
- var head = URL['head'];
- head = head.slice(0,head.indexOf('ORDER+BY'));
- URL['head'] = head;
- // removing the last sort order should have priority over what
+ if (columns.length === 0) {
+ var head = URL.head;
+ head = head.slice(0,head.indexOf('ORDER+BY'));
+ URL.head = head;
+ // removing the last sort order should have priority over what
// is remembered via the RememberSorting directive
- URL['tail'] += '&discard_remembered_sort=1';
+ URL.tail += '&discard_remembered_sort=1';
}
- var middle_part = columns.join('%2C+');
- url = URL['head'] + middle_part + URL['tail'];
+ var middle_part = columns.join('%2C+');
+ url = URL.head + middle_part + URL.tail;
return url;
}
AJAX.registerOnload('keyhandler.js', function () {
- $("th.draggable.column_heading.pointer.marker a").on('click', function (event) {
+ $("th.draggable.column_heading.pointer.marker a").on('click', function (event) {
var url = $(this).parent().find('input').val();
if (event.ctrlKey) {
event.preventDefault();
@@ -69,7 +69,7 @@ AJAX.registerOnload('keyhandler.js', function () {
AJAX.source = $(this);
$.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler);
}
- });
+ });
});
AJAX.registerTeardown('keyhandler.js', function () {