From 5c6c70d78927d706fe80ee7706bdac4e3bfe1291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 29 May 2019 20:13:05 -0300 Subject: [PATCH] Rename multi_column_sort.js vars to use camel case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- js/multi_column_sort.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/js/multi_column_sort.js b/js/multi_column_sort.js index ad9b307d3f..206686eb5a 100644 --- a/js/multi_column_sort.js +++ b/js/multi_column_sort.js @@ -8,13 +8,13 @@ */ function captureURL (url) { + var newUrl = '' + url; var URL = {}; - url = '' + url; // Exclude the url part till HTTP - url = url.substr(url.search('sql.php'), url.length); + newUrl = newUrl.substr(newUrl.search('sql.php'), newUrl.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); + URL.head = newUrl.substr(0, newUrl.indexOf('ORDER+BY') + 9); + URL.tail = newUrl.substr(newUrl.indexOf('&session_max_rows'), newUrl.length); return URL; } @@ -30,8 +30,8 @@ function removeColumnFromMultiSort (target, parent) { var begin = target.indexOf('ORDER+BY') + 8; var end = target.indexOf(CommonParams.get('arg_separator') + '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 betweenPart = target.substr(begin, end - begin); + var columns = betweenPart.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 === '') { @@ -50,8 +50,8 @@ function removeColumnFromMultiSort (target, parent) { URL.tail += CommonParams.get('arg_separator') + 'discard_remembered_sort=1'; } URL.head = URL.head.substring(URL.head.indexOf('?') + 1); - var middle_part = columns.join('%2C+'); - params = URL.head + middle_part + URL.tail; + var middlePart = columns.join('%2C+'); + params = URL.head + middlePart + URL.tail; return params; }