diff options
author | Maurício Meneghini Fauth <mauriciofauth@gmail.com> | 2018-05-12 11:02:30 +0300 |
---|---|---|
committer | Maurício Meneghini Fauth <mauriciofauth@gmail.com> | 2018-05-12 11:02:30 +0300 |
commit | 9eea50ef3dfed5b16b579b32bc11b81a27dff85d (patch) | |
tree | 408d781712e7cf4bd072b2275cc358f21bca04d9 /js | |
parent | f262824d45aa8487460f685b65139adaa3ff5bb2 (diff) |
ESLint automatic fixes
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Diffstat (limited to 'js')
-rw-r--r-- | js/console.js | 2 | ||||
-rw-r--r-- | js/db_multi_table_query.js | 10 | ||||
-rw-r--r-- | js/db_operations.js | 2 | ||||
-rw-r--r-- | js/designer/move.js | 1 | ||||
-rw-r--r-- | js/u2f.js | 12 |
5 files changed, 14 insertions, 13 deletions
diff --git a/js/console.js b/js/console.js index a0fe38f24b..98a4716c6f 100644 --- a/js/console.js +++ b/js/console.js @@ -281,7 +281,7 @@ var PMA_console = { PMA_console.setConfig('Mode', 'show'); var pmaConsoleHeight = Math.max(92, PMA_console.config.Height); - pmaConsoleHeight = Math.min(PMA_console.config.Height, (window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight)-25); + pmaConsoleHeight = Math.min(PMA_console.config.Height, (window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight) - 25); PMA_console.$consoleContent.css({ display:'block' }); if (PMA_console.$consoleToolbar.hasClass('collapsed')) { PMA_console.$consoleToolbar.removeClass('collapsed'); diff --git a/js/db_multi_table_query.js b/js/db_multi_table_query.js index 5f0451b416..86d096b390 100644 --- a/js/db_multi_table_query.js +++ b/js/db_multi_table_query.js @@ -73,18 +73,20 @@ AJAX.registerOnload('db_multi_table_query.js', function () { } query = 'SELECT '; - if(columns[0][1] == '*') + if (columns[0][1] == '*') { query += '`' + escapeBacktick(columns[0][0]) + '`.' + escapeBacktick(columns[0][1]) + ''; - else + } else { query += '`' + escapeBacktick(columns[0][0]) + '`.`' + escapeBacktick(columns[0][1]) + '`'; + } if (columns[0][2] !== '') { query += ' AS ' + columns[0][2]; } for (var i = 1; i < columns.length; i++) { - if(columns[i][1] == '*') + if (columns[i][1] == '*') { query += ', `' + escapeBacktick(columns[i][0]) + '`.' + escapeBacktick(columns[i][1]) + ''; - else + } else { query += ', `' + escapeBacktick(columns[i][0]) + '`.`' + escapeBacktick(columns[i][1]) + '`'; + } if (columns[i][2] !== '') { query += ' AS `' + escapeBacktick(columns[0][2]) + '`'; } diff --git a/js/db_operations.js b/js/db_operations.js index b65733d896..3c408d89ba 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -108,7 +108,7 @@ AJAX.registerOnload('db_operations.js', function () { * Change tables columns visible only if change tables is checked */ $('#span_change_all_tables_columns_collations').hide(); - $('#checkbox_change_all_tables_collations').on('click', function() { + $('#checkbox_change_all_tables_collations').on('click', function () { $('#span_change_all_tables_columns_collations').toggle(); }); diff --git a/js/designer/move.js b/js/designer/move.js index 31f328d458..a964df73f5 100644 --- a/js/designer/move.js +++ b/js/designer/move.js @@ -1755,7 +1755,6 @@ function Close_option () { document.getElementById('h_operator').value = '---'; document.getElementById('having').value = ''; document.getElementById('orderby').value = '---'; - } function Select_all (id_this, owner) { @@ -6,12 +6,12 @@ AJAX.registerOnload('u2f.js', function () { if ($inputReg.length > 0) { var $formReg = $inputReg.parents('form'); $formReg.find('input[type=submit]').hide(); - setTimeout(function() { + setTimeout(function () { // A magic JS function that talks to the USB device. This function will keep polling for the USB device until it finds one. var request = JSON.parse($inputReg.attr('data-request')); - u2f.register(request.appId, [request], JSON.parse($inputReg.attr('data-signatures')), function(data) { + u2f.register(request.appId, [request], JSON.parse($inputReg.attr('data-signatures')), function (data) { // Handle returning error data - if(data.errorCode && data.errorCode !== 0) { + if (data.errorCode && data.errorCode !== 0) { if (data.errorCode === 5) { PMA_ajaxShowMessage(PMA_messages.strU2FTimeout, false); } else { @@ -32,14 +32,14 @@ AJAX.registerOnload('u2f.js', function () { if ($inputAuth.length > 0) { var $formAuth = $inputAuth.parents('form'); $formAuth.find('input[type=submit]').hide(); - setTimeout(function() { + setTimeout(function () { // Magic JavaScript talking to your HID // appid, challenge, authenticateRequests var request = JSON.parse($inputAuth.attr('data-request')); var handles = [request[0].keyHandle]; - u2f.sign(request[0].appId, request[0].challenge, request, function(data) { + u2f.sign(request[0].appId, request[0].challenge, request, function (data) { // Handle returning error data - if(data.errorCode && data.errorCode !== 0) { + if (data.errorCode && data.errorCode !== 0) { if (data.errorCode === 5) { PMA_ajaxShowMessage(PMA_messages.strU2FTimeout, false); } else { |