Change ESLint's one-var to error
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
This commit is contained in:
Maurício Meneghini Fauth
parent
ef99fef8d6
commit
3a00dd69a5
@ -28,7 +28,7 @@
|
||||
"no-unneeded-ternary": "error",
|
||||
"no-useless-escape": "warn",
|
||||
"object-curly-spacing": ["error", "always"],
|
||||
"one-var": ["warn", "never"],
|
||||
"one-var": ["error", "never"],
|
||||
"padded-blocks": ["error", "never"],
|
||||
"quotes": ["error", "single"],
|
||||
"semi": "error",
|
||||
|
||||
@ -45,7 +45,9 @@ var AJAX = {
|
||||
hash: function (key) {
|
||||
/* http://burtleburtle.net/bob/hash/doobs.html#one */
|
||||
key += '';
|
||||
var len = key.length, hash = 0, i = 0;
|
||||
var len = key.length;
|
||||
var hash = 0;
|
||||
var i = 0;
|
||||
for (; i < len; ++i) {
|
||||
hash += key.charCodeAt(i);
|
||||
hash += (hash << 10);
|
||||
|
||||
22
js/chart.js
22
js/chart.js
@ -293,8 +293,10 @@ JQPlotLineChart.prototype.populateOptions = function (dataTable, options) {
|
||||
};
|
||||
|
||||
JQPlotLineChart.prototype.prepareData = function (dataTable) {
|
||||
var data = dataTable.getData(), row;
|
||||
var retData = [], retRow;
|
||||
var data = dataTable.getData();
|
||||
var row;
|
||||
var retData = [];
|
||||
var retRow;
|
||||
for (var i = 0; i < data.length; i++) {
|
||||
row = data[i];
|
||||
for (var j = 1; j < row.length; j++) {
|
||||
@ -389,8 +391,10 @@ JQPlotScatterChart.prototype.populateOptions = function (dataTable, options) {
|
||||
};
|
||||
|
||||
JQPlotScatterChart.prototype.prepareData = function (dataTable) {
|
||||
var data = dataTable.getData(), row;
|
||||
var retData = [], retRow;
|
||||
var data = dataTable.getData();
|
||||
var row;
|
||||
var retData = [];
|
||||
var retRow;
|
||||
for (var i = 0; i < data.length; i++) {
|
||||
row = data[i];
|
||||
if (row[0]) {
|
||||
@ -443,8 +447,11 @@ JQPlotTimelineChart.prototype.populateOptions = function (dataTable, options) {
|
||||
};
|
||||
|
||||
JQPlotTimelineChart.prototype.prepareData = function (dataTable) {
|
||||
var data = dataTable.getData(), row, d;
|
||||
var retData = [], retRow;
|
||||
var data = dataTable.getData();
|
||||
var row;
|
||||
var d;
|
||||
var retData = [];
|
||||
var retRow;
|
||||
for (var i = 0; i < data.length; i++) {
|
||||
row = data[i];
|
||||
d = row[0];
|
||||
@ -620,7 +627,8 @@ JQPlotPieChart.prototype.populateOptions = function (dataTable, options) {
|
||||
};
|
||||
|
||||
JQPlotPieChart.prototype.prepareData = function (dataTable) {
|
||||
var data = dataTable.getData(), row;
|
||||
var data = dataTable.getData();
|
||||
var row;
|
||||
var retData = [];
|
||||
for (var i = 0; i < data.length; i++) {
|
||||
row = data[i];
|
||||
|
||||
13
js/config.js
13
js/config.js
@ -120,7 +120,8 @@ function setFieldValue (field, field_type, value) {
|
||||
break;
|
||||
case 'select':
|
||||
var options = $field.prop('options');
|
||||
var i, imax = options.length;
|
||||
var i;
|
||||
var imax = options.length;
|
||||
if (value === undefined) {
|
||||
for (i = 0; i < imax; i++) {
|
||||
options[i].selected = options[i].defaultSelected;
|
||||
@ -157,7 +158,9 @@ function getFieldValue (field, field_type) {
|
||||
return $field.prop('checked');
|
||||
case 'select':
|
||||
var options = $field.prop('options');
|
||||
var i, imax = options.length, items = [];
|
||||
var i;
|
||||
var imax = options.length;
|
||||
var items = [];
|
||||
for (i = 0; i < imax; i++) {
|
||||
if (options[i].selected) {
|
||||
items.push(options[i].value);
|
||||
@ -174,7 +177,8 @@ function getFieldValue (field, field_type) {
|
||||
function getAllValues () {
|
||||
var $elements = $('fieldset input, fieldset select, fieldset textarea');
|
||||
var values = {};
|
||||
var type, value;
|
||||
var type;
|
||||
var value;
|
||||
for (var i = 0; i < $elements.length; i++) {
|
||||
type = getFieldType($elements[i]);
|
||||
value = getFieldValue($elements[i], type);
|
||||
@ -452,7 +456,8 @@ function validate_fieldset (fieldset, isKeyUp, errors) {
|
||||
* @param {Object} errors
|
||||
*/
|
||||
function validate_field (field, isKeyUp, errors) {
|
||||
var args, result;
|
||||
var args;
|
||||
var result;
|
||||
var $field = $(field);
|
||||
var field_id = $field.attr('id');
|
||||
errors[field_id] = [];
|
||||
|
||||
@ -1269,7 +1269,8 @@ PMA_consoleDebug = {
|
||||
$traceElem.append(
|
||||
$('<div class="message welcome">')
|
||||
);
|
||||
var step, $stepElem;
|
||||
var step;
|
||||
var $stepElem;
|
||||
for (var stepId in dbgTrace) {
|
||||
if (dbgTrace.hasOwnProperty(stepId)) {
|
||||
step = dbgTrace[stepId];
|
||||
@ -1317,7 +1318,11 @@ PMA_consoleDebug = {
|
||||
return $traceElem;
|
||||
},
|
||||
_formatQueryOrGroup: function (queryInfo, totalTime) {
|
||||
var grouped, queryText, queryTime, count, i;
|
||||
var grouped;
|
||||
var queryText;
|
||||
var queryTime;
|
||||
var count;
|
||||
var i;
|
||||
if (Array.isArray(queryInfo)) {
|
||||
// It is grouped
|
||||
grouped = true;
|
||||
@ -1390,7 +1395,8 @@ PMA_consoleDebug = {
|
||||
$('#debug_console').find('.debugLog').empty();
|
||||
$('#debug_console').find('.debug>.welcome').empty();
|
||||
|
||||
var debugJson = false, i;
|
||||
var debugJson = false;
|
||||
var i;
|
||||
if (typeof debugInfo === 'object' && 'queries' in debugInfo) {
|
||||
// Copy it to debugJson, so that it doesn't get changed
|
||||
if (!('queries' in debugInfo)) {
|
||||
@ -1432,7 +1438,8 @@ PMA_consoleDebug = {
|
||||
uniqueQueries[allQueries[i].hash].push(allQueries[i]);
|
||||
}
|
||||
// Count total unique queries, convert uniqueQueries to Array
|
||||
var totalUnique = 0, uniqueArray = [];
|
||||
var totalUnique = 0;
|
||||
var uniqueArray = [];
|
||||
for (var hash in uniqueQueries) {
|
||||
if (uniqueQueries.hasOwnProperty(hash)) {
|
||||
++totalUnique;
|
||||
@ -1462,7 +1469,9 @@ PMA_consoleDebug = {
|
||||
var order = ((PMA_consoleDebug.configParam('order') === 'asc') ? 1 : -1);
|
||||
if (Array.isArray(a) && Array.isArray(b)) {
|
||||
// It is grouped
|
||||
var timeA = 0, timeB = 0, i;
|
||||
var timeA = 0;
|
||||
var timeB = 0;
|
||||
var i;
|
||||
for (i in a) {
|
||||
timeA += a[i].time;
|
||||
}
|
||||
|
||||
@ -60,7 +60,8 @@ function PMA_adjustTotals () {
|
||||
|
||||
$allTr.each(function () {
|
||||
var $this = $(this);
|
||||
var i, tmpVal;
|
||||
var i;
|
||||
var tmpVal;
|
||||
// Get the number of rows for this SQL table
|
||||
var strRows = $this.find('.tbl_rows').text();
|
||||
// If the value is approximated
|
||||
@ -112,7 +113,8 @@ function PMA_adjustTotals () {
|
||||
strRowSum = '~' + strRowSum;
|
||||
}
|
||||
// Calculate the magnitude for the size and overhead values
|
||||
var size_magnitude = 0, overhead_magnitude = 0;
|
||||
var size_magnitude = 0;
|
||||
var overhead_magnitude = 0;
|
||||
while (sizeSum >= 1024) {
|
||||
sizeSum /= 1024;
|
||||
size_magnitude++;
|
||||
|
||||
@ -846,7 +846,12 @@ function checkTableEditForm (theForm, fieldsCnt) {
|
||||
// on the form but has not completed at least one field name
|
||||
|
||||
var atLeastOneField = 0;
|
||||
var i, elm, elm2, elm3, val, id;
|
||||
var i;
|
||||
var elm;
|
||||
var elm2;
|
||||
var elm3;
|
||||
var val;
|
||||
var id;
|
||||
|
||||
for (i = 0; i < fieldsCnt; i++) {
|
||||
id = '#field_' + i + '_2';
|
||||
@ -1035,7 +1040,8 @@ AJAX.registerOnload('functions.js', function () {
|
||||
} else {
|
||||
// handle the shift click
|
||||
PMA_clearSelection();
|
||||
var start, end;
|
||||
var start;
|
||||
var end;
|
||||
|
||||
// clear last shift click result
|
||||
if (last_shift_clicked_row >= 0) {
|
||||
@ -2191,7 +2197,8 @@ function PMA_updateCode ($base, htmlValue, rawValue) {
|
||||
}
|
||||
|
||||
// Determines the type of the content and appropriate CodeMirror mode.
|
||||
var type = '', mode = '';
|
||||
var type = '';
|
||||
var mode = '';
|
||||
if ($code.hasClass('json')) {
|
||||
type = 'json';
|
||||
mode = 'application/json';
|
||||
@ -2586,7 +2593,8 @@ function PMA_SQLPrettyPrint (string) {
|
||||
var mode = CodeMirror.getMode({}, 'text/x-mysql');
|
||||
var stream = new CodeMirror.StringStream(string);
|
||||
var state = mode.startState();
|
||||
var token, tokens = [];
|
||||
var token;
|
||||
var tokens = [];
|
||||
var output = '';
|
||||
var tabs = function (cnt) {
|
||||
var ret = '';
|
||||
@ -2627,11 +2635,13 @@ function PMA_SQLPrettyPrint (string) {
|
||||
// Holds the type of block from last iteration (the current is in blockStack[0])
|
||||
var previousBlock;
|
||||
// If a new code block is found, newBlock contains its type for one iteration and vice versa for endBlock
|
||||
var newBlock, endBlock;
|
||||
var newBlock;
|
||||
var endBlock;
|
||||
// How much to indent in the current line
|
||||
var indentLevel = 0;
|
||||
// Holds the "root-level" statements
|
||||
var statementPart, lastStatementPart = statements[currentStatement][0];
|
||||
var statementPart;
|
||||
var lastStatementPart = statements[currentStatement][0];
|
||||
|
||||
blockStack.unshift('statement');
|
||||
|
||||
@ -3384,7 +3394,9 @@ AJAX.registerOnload('functions.js', function () {
|
||||
// slashes on the fly, into an array
|
||||
var values = [];
|
||||
var in_string = false;
|
||||
var curr, next, buffer = '';
|
||||
var curr;
|
||||
var next;
|
||||
var buffer = '';
|
||||
for (i = 0; i < inputstring.length; i++) {
|
||||
curr = inputstring.charAt(i);
|
||||
next = i === inputstring.length ? '' : inputstring.charAt(i + 1);
|
||||
@ -4027,7 +4039,10 @@ var toggleButton = function ($obj) {
|
||||
var $msg = PMA_ajaxShowMessage();
|
||||
var $container = $(this);
|
||||
var callback = $('span.callback', this).text();
|
||||
var operator, url, removeClass, addClass;
|
||||
var operator;
|
||||
var url;
|
||||
var removeClass;
|
||||
var addClass;
|
||||
// Perform the actual toggle
|
||||
if ($(this).hasClass('on')) {
|
||||
if (right === 'right') {
|
||||
|
||||
@ -646,7 +646,8 @@ AJAX.registerOnload('indexes.js', function () {
|
||||
**/
|
||||
$(document).on('click', '#table_index tbody tr td.edit_index.ajax, #index_div .add_index.ajax', function (event) {
|
||||
event.preventDefault();
|
||||
var url, title;
|
||||
var url;
|
||||
var title;
|
||||
if ($(this).find('a').length === 0) {
|
||||
// Add index
|
||||
var valid = checkFormElementInRange(
|
||||
|
||||
@ -47,7 +47,8 @@ function onKeyDownArrowsHandler (e) {
|
||||
return;
|
||||
}
|
||||
|
||||
var x = pos[2], y = pos[1];
|
||||
var x = pos[2];
|
||||
var y = pos[1];
|
||||
|
||||
switch (e.keyCode) {
|
||||
case 38:
|
||||
|
||||
@ -129,7 +129,8 @@ PMA_MicroHistory = {
|
||||
* @return int
|
||||
*/
|
||||
size: function (obj) {
|
||||
var size = 0, key;
|
||||
var size = 0;
|
||||
var key;
|
||||
for (key in obj) {
|
||||
if (obj.hasOwnProperty(key)) {
|
||||
size++;
|
||||
@ -152,7 +153,9 @@ PMA_MicroHistory = {
|
||||
add: function (hash, content) {
|
||||
if (this.size(this.data) > PMA_MicroHistory.MAX) {
|
||||
// when the cache grows, we remove the oldest entry
|
||||
var oldest, key, init = 0;
|
||||
var oldest;
|
||||
var key;
|
||||
var init = 0;
|
||||
for (var i in this.data) {
|
||||
if (this.data[i]) {
|
||||
if (! init || this.data[i].timestamp.getTime() < oldest.getTime()) {
|
||||
|
||||
@ -1030,7 +1030,8 @@ function PMA_selectCurrentDb () {
|
||||
function PMA_navigationTreePagination ($this) {
|
||||
var $msgbox = PMA_ajaxShowMessage();
|
||||
var isDbSelector = $this.closest('div.pageselector').is('.dbselector');
|
||||
var url, params;
|
||||
var url;
|
||||
var params;
|
||||
if ($this[0].tagName === 'A') {
|
||||
url = $this.attr('href');
|
||||
params = 'ajax_request=true';
|
||||
@ -1264,10 +1265,10 @@ var ResizeHandler = function () {
|
||||
* @return void
|
||||
*/
|
||||
this.treeResize = function (event) {
|
||||
var $nav = $('#pma_navigation'),
|
||||
$nav_tree = $('#pma_navigation_tree'),
|
||||
$nav_header = $('#pma_navigation_header'),
|
||||
$nav_tree_content = $('#pma_navigation_tree_content');
|
||||
var $nav = $('#pma_navigation');
|
||||
var $nav_tree = $('#pma_navigation_tree');
|
||||
var $nav_header = $('#pma_navigation_header');
|
||||
var $nav_tree_content = $('#pma_navigation_tree_content');
|
||||
$nav_tree.height($nav.height() - $nav_header.height());
|
||||
if ($nav_tree_content.length > 0) {
|
||||
$nav_tree_content.height($nav_tree.height() - $nav_tree_content.position().top);
|
||||
|
||||
@ -61,7 +61,12 @@ function detail (index) {
|
||||
**/
|
||||
|
||||
function display (init, finit) {
|
||||
var str, i, j, k, sto, temp;
|
||||
var str;
|
||||
var i;
|
||||
var j;
|
||||
var k;
|
||||
var sto;
|
||||
var temp;
|
||||
// this part sorts the history array based on table name,this is needed for clubbing all object of same name together.
|
||||
for (i = init; i < finit; i++) {
|
||||
sto = history_array[i];
|
||||
|
||||
@ -3,7 +3,14 @@
|
||||
* Initialises the data required to run PMD, then fires it up.
|
||||
*/
|
||||
|
||||
var j_tabs, h_tabs, contr, display_field, server, db, selected_page, pmd_tables_enabled;
|
||||
var j_tabs;
|
||||
var h_tabs;
|
||||
var contr;
|
||||
var display_field;
|
||||
var server;
|
||||
var db;
|
||||
var selected_page;
|
||||
var pmd_tables_enabled;
|
||||
|
||||
AJAX.registerTeardown('pmd/init.js', function () {
|
||||
$('.trigger').off('click');
|
||||
|
||||
@ -2,12 +2,6 @@
|
||||
/**
|
||||
* @package PhpMyAdmin-Designer
|
||||
*/
|
||||
|
||||
/**
|
||||
* init
|
||||
*/
|
||||
|
||||
|
||||
var _change = 0; // variable to track any change in designer layout.
|
||||
var _staying = 0; // variable to check if the user stayed after seeing the confirmation prompt.
|
||||
var show_relation_lines = true;
|
||||
@ -49,10 +43,13 @@ function MarkUnsaved () {
|
||||
$('#saved_state').text('*');
|
||||
}
|
||||
|
||||
var dx, dy, dy2;
|
||||
var dx;
|
||||
var dy;
|
||||
var dy2;
|
||||
var cur_click = null;
|
||||
// update in Main()
|
||||
var sm_x = 2, sm_y = 2;
|
||||
var sm_x = 2;
|
||||
var sm_y = 2;
|
||||
var sm_s = 0;
|
||||
var sm_add = 10;
|
||||
var s_left = 0;
|
||||
@ -70,7 +67,8 @@ var canvas_height = 0;
|
||||
var osn_tab_width = 0;
|
||||
var osn_tab_height = 0;
|
||||
var height_field = 7;
|
||||
var Glob_X, Glob_Y;
|
||||
var Glob_X;
|
||||
var Glob_Y;
|
||||
var timeoutID;
|
||||
var layer_menu_cur_click = 0;
|
||||
var step = 10;
|
||||
@ -1375,8 +1373,17 @@ function Canvas_click (id, event) {
|
||||
var relation_name = 0;
|
||||
var selected = 0;
|
||||
var a = [];
|
||||
var Key0, Key1, Key2, Key3, Key, x1, x2;
|
||||
var K, key, key2, key3;
|
||||
var Key0;
|
||||
var Key1;
|
||||
var Key2;
|
||||
var Key3;
|
||||
var Key;
|
||||
var x1;
|
||||
var x2;
|
||||
var K;
|
||||
var key;
|
||||
var key2;
|
||||
var key3;
|
||||
var Local_X = isIE ? event.clientX + document.body.scrollLeft : event.pageX;
|
||||
var Local_Y = isIE ? event.clientY + document.body.scrollTop : event.pageY;
|
||||
Local_X -= $('#osn_tab').offset().left;
|
||||
@ -1534,7 +1541,10 @@ function in_array_k (x, m) {
|
||||
|
||||
function No_have_constr (id_this) {
|
||||
var a = [];
|
||||
var K, key, key2, key3;
|
||||
var K;
|
||||
var key;
|
||||
var key2;
|
||||
var key3;
|
||||
for (K in contr) {
|
||||
for (key in contr[K]) {
|
||||
// contr name
|
||||
@ -1809,7 +1819,8 @@ function store_column (id_this, owner, col) {
|
||||
**/
|
||||
|
||||
function add_object () {
|
||||
var p, where_obj;
|
||||
var p;
|
||||
var where_obj;
|
||||
var rel = document.getElementById('rel_opt');
|
||||
var sum = 0;
|
||||
var init = history_array.length;
|
||||
|
||||
@ -143,7 +143,8 @@ AJAX.registerOnload('server_databases.js', function () {
|
||||
var $filterField = $('#filterText');
|
||||
/* Event handler for database filter */
|
||||
$filterField.keyup(function () {
|
||||
var textFilter = null, val = $(this).val();
|
||||
var textFilter = null;
|
||||
var val = $(this).val();
|
||||
if (val.length !== 0) {
|
||||
try {
|
||||
textFilter = new RegExp(val.replace(/_/g, ' '), 'i');
|
||||
@ -165,7 +166,8 @@ AJAX.registerOnload('server_databases.js', function () {
|
||||
|
||||
/* Filters the rows by the user given regexp */
|
||||
function filterVariables (textFilter) {
|
||||
var $row, databasesCount = 0;
|
||||
var $row;
|
||||
var databasesCount = 0;
|
||||
$('#tabledatabases').find('.db-row').each(function () {
|
||||
$row = $(this);
|
||||
if (textFilter === null ||
|
||||
|
||||
@ -409,11 +409,11 @@ AJAX.registerOnload('server_privileges.js', function () {
|
||||
* Create submenu for simpler interface
|
||||
*/
|
||||
var addOrUpdateSubmenu = function () {
|
||||
var $topmenu2 = $('#topmenu2'),
|
||||
$edit_user_dialog = $('#edit_user_dialog'),
|
||||
submenu_label,
|
||||
submenu_link,
|
||||
link_number;
|
||||
var $topmenu2 = $('#topmenu2');
|
||||
var $edit_user_dialog = $('#edit_user_dialog');
|
||||
var submenu_label;
|
||||
var submenu_link;
|
||||
var link_number;
|
||||
|
||||
// if submenu exists yet, remove it first
|
||||
if ($topmenu2.length > 0) {
|
||||
|
||||
@ -40,7 +40,10 @@ AJAX.registerOnload('server_status_advisor.js', function () {
|
||||
});
|
||||
|
||||
var $cnt = $('#statustabs_advisor');
|
||||
var $tbody, $tr, str, even = true;
|
||||
var $tbody;
|
||||
var $tr;
|
||||
var str;
|
||||
var even = true;
|
||||
|
||||
data = JSON.parse($('#advisorData').text());
|
||||
$cnt.html('');
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
var runtime = {},
|
||||
server_time_diff,
|
||||
server_os,
|
||||
is_superuser,
|
||||
server_db_isLocal,
|
||||
chartSize;
|
||||
var runtime = {};
|
||||
var server_time_diff;
|
||||
var server_os;
|
||||
var is_superuser;
|
||||
var server_db_isLocal;
|
||||
var chartSize;
|
||||
AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
var $js_data_form = $('#js_data');
|
||||
server_time_diff = new Date().getTime() - $js_data_form.find('input[name=server_time]').val();
|
||||
@ -186,7 +186,10 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
|
||||
// time span selection
|
||||
var selectionTimeDiff = [];
|
||||
var selectionStartX, selectionStartY, selectionEndX, selectionEndY;
|
||||
var selectionStartX;
|
||||
var selectionStartY;
|
||||
var selectionEndX;
|
||||
var selectionEndY;
|
||||
var drawTimeSpan = false;
|
||||
|
||||
// chart tooltip
|
||||
@ -691,7 +694,9 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
} else {
|
||||
return serverResponseError();
|
||||
}
|
||||
var icon = PMA_getImage('s_success.png'), msg = '', str = '';
|
||||
var icon = PMA_getImage('s_success.png');
|
||||
var msg = '';
|
||||
var str = '';
|
||||
|
||||
if (logVars.general_log === 'ON') {
|
||||
if (logVars.slow_query_log === 'ON') {
|
||||
@ -1360,7 +1365,8 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
} else {
|
||||
return serverResponseError();
|
||||
}
|
||||
var value, i = 0;
|
||||
var value;
|
||||
var i = 0;
|
||||
var diff;
|
||||
var total;
|
||||
|
||||
@ -1674,7 +1680,8 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
* to group queries ignoring data in WHERE clauses
|
||||
*/
|
||||
function filterQueries (varFilterChange) {
|
||||
var cell, textFilter;
|
||||
var cell;
|
||||
var textFilter;
|
||||
var val = $('#filterQueryText').val();
|
||||
|
||||
if (val.length === 0) {
|
||||
@ -1691,12 +1698,17 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
}
|
||||
}
|
||||
|
||||
var rowSum = 0, totalSum = 0, i = 0, q;
|
||||
var rowSum = 0;
|
||||
var totalSum = 0;
|
||||
var i = 0;
|
||||
var q;
|
||||
var noVars = $('#noWHEREData').prop('checked');
|
||||
var equalsFilter = /([^=]+)=(\d+|((\'|"|).*?[^\\])\4((\s+)|$))/gi;
|
||||
var functionFilter = /([a-z0-9_]+)\(.+?\)/gi;
|
||||
var filteredQueries = {}, filteredQueriesLines = {};
|
||||
var hide = false, rowData;
|
||||
var filteredQueries = {};
|
||||
var filteredQueriesLines = {};
|
||||
var hide = false;
|
||||
var rowData;
|
||||
var queryColumnName = runtime.logDataCols[runtime.logDataCols.length - 2];
|
||||
var sumColumnName = runtime.logDataCols[runtime.logDataCols.length - 1];
|
||||
var isSlowLog = opts.src === 'slow';
|
||||
@ -1784,7 +1796,9 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
// We finished summarizing counts => Update count values of all grouped entries
|
||||
if (varFilterChange) {
|
||||
if (noVars) {
|
||||
var numCol, row, $table = $('#logTable').find('table tbody');
|
||||
var numCol;
|
||||
var row;
|
||||
var $table = $('#logTable').find('table tbody');
|
||||
$.each(filteredQueriesLines, function (key, value) {
|
||||
if (filteredQueries[key] <= 1) {
|
||||
return;
|
||||
@ -1848,7 +1862,9 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
var rows = data.rows;
|
||||
var cols = [];
|
||||
var $table = $('<table class="sortable"></table>');
|
||||
var $tBody, $tRow, $tCell;
|
||||
var $tBody;
|
||||
var $tRow;
|
||||
var $tCell;
|
||||
|
||||
$('#logTable').html($table);
|
||||
|
||||
@ -1983,7 +1999,8 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
database: db,
|
||||
server: PMA_commonParams.get('server')
|
||||
}, function (data) {
|
||||
var i, l;
|
||||
var i;
|
||||
var l;
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
data = data.message;
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
// TODO: tablesorter shouldn't sort already sorted columns
|
||||
function initTableSorter (tabid) {
|
||||
var $table, opts;
|
||||
var $table;
|
||||
var opts;
|
||||
switch (tabid) {
|
||||
case 'statustabs_queries':
|
||||
$table = $('#serverstatusqueriesdetails');
|
||||
|
||||
@ -28,7 +28,8 @@ AJAX.registerOnload('server_variables.js', function () {
|
||||
|
||||
/* Event handler for variables filter */
|
||||
$filterField.keyup(function () {
|
||||
var textFilter = null, val = $(this).val();
|
||||
var textFilter = null;
|
||||
var val = $(this).val();
|
||||
if (val.length !== 0) {
|
||||
try {
|
||||
textFilter = new RegExp('(^| )' + val.replace(/_/g, ' '), 'i');
|
||||
@ -50,7 +51,8 @@ AJAX.registerOnload('server_variables.js', function () {
|
||||
|
||||
/* Filters the rows by the user given regexp */
|
||||
function filterVariables (textFilter) {
|
||||
var mark_next = false, $row;
|
||||
var mark_next = false;
|
||||
var $row;
|
||||
$('#serverVariables').find('.var-row').not('.var-header').each(function () {
|
||||
$row = $(this);
|
||||
if (mark_next || textFilter === null ||
|
||||
|
||||
@ -10,7 +10,8 @@ var dateTimeCols = [];
|
||||
var numericCols = [];
|
||||
|
||||
function extractDate (dateString) {
|
||||
var matches, match;
|
||||
var matches;
|
||||
var match;
|
||||
var dateTimeRegExp = /[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/;
|
||||
var dateRegExp = /[0-9]{4}-[0-9]{2}-[0-9]{2}/;
|
||||
|
||||
@ -87,7 +88,10 @@ function PMA_queryChart (data, columnNames, settings) {
|
||||
$.each(settings.selectedSeries, function (index, element) {
|
||||
columnsToExtract.push(element);
|
||||
});
|
||||
var values = [], newRow, row, col;
|
||||
var values = [];
|
||||
var newRow;
|
||||
var row;
|
||||
var col;
|
||||
for (i = 0; i < data.length; i++) {
|
||||
row = data[i];
|
||||
newRow = [];
|
||||
@ -109,7 +113,8 @@ function PMA_queryChart (data, columnNames, settings) {
|
||||
}
|
||||
dataTable.setData(values);
|
||||
} else {
|
||||
var seriesNames = {}, seriesNumber = 1;
|
||||
var seriesNames = {};
|
||||
var seriesNumber = 1;
|
||||
var seriesColumnName = columnNames[settings.seriesColumn];
|
||||
for (i = 0; i < data.length; i++) {
|
||||
if (! seriesNames[data[i][seriesColumnName]]) {
|
||||
@ -122,7 +127,9 @@ function PMA_queryChart (data, columnNames, settings) {
|
||||
dataTable.addColumn(ColumnType.NUMBER, seriesName);
|
||||
});
|
||||
|
||||
var valueMap = {}, xValue, value;
|
||||
var valueMap = {};
|
||||
var xValue;
|
||||
var value;
|
||||
var mainAxisName = columnNames[settings.mainAxis];
|
||||
var valueColumnName = columnNames[settings.valueColumn];
|
||||
for (i = 0; i < data.length; i++) {
|
||||
|
||||
@ -33,8 +33,11 @@ function setDropdownValues ($dropdown, values, selectedValue) {
|
||||
* @param $dropdown the dropdown whose value got changed
|
||||
*/
|
||||
function getDropdownValues ($dropdown) {
|
||||
var foreignDb = null, foreignTable = null;
|
||||
var $databaseDd, $tableDd, $columnDd;
|
||||
var foreignDb = null;
|
||||
var foreignTable = null;
|
||||
var $databaseDd;
|
||||
var $tableDd;
|
||||
var $columnDd;
|
||||
var foreign = '';
|
||||
// if the changed dropdown is for foreign key constraints
|
||||
if ($dropdown.is('select[name^="destination_foreign"]')) {
|
||||
|
||||
@ -139,7 +139,13 @@ AJAX.registerOnload('tbl_structure.js', function () {
|
||||
}
|
||||
|
||||
function checkIfConfirmRequired ($form, $field_cnt) {
|
||||
var i = 0, id, elm, val, name_orig, elm_orig, val_orig;
|
||||
var i = 0;
|
||||
var id;
|
||||
var elm;
|
||||
var val;
|
||||
var name_orig;
|
||||
var elm_orig;
|
||||
var val_orig;
|
||||
var checkRequired = false;
|
||||
for (i = 0; i < field_cnt; i++) {
|
||||
id = '#field_' + i + '_5';
|
||||
|
||||
@ -450,7 +450,8 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
|
||||
var series = [];
|
||||
var xCord = [];
|
||||
var yCord = [];
|
||||
var tempX, tempY;
|
||||
var tempX;
|
||||
var tempY;
|
||||
var it = 0;
|
||||
var xMax; // xAxis extreme max
|
||||
var xMin; // xAxis extreme min
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
