gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disallow variable redeclaration in JavaScript files

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2019-06-06 23:58:48 -03:00
parent 4260eb0a73
commit 0a16b56ace
11 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.json
View File

@ -37,7 +37,6 @@
"no-new-func": "error",
"no-new-object": "error",
"no-param-reassign": "error",
"no-redeclare": "warn",
"no-trailing-spaces": "error",
"no-underscore-dangle": "error",
"no-unneeded-ternary": "error",

5
js/designer/database.js
View File

@ -24,13 +24,14 @@ var DesignerOfflineDB = (function () {
var db = e.target.result;
e.target.transaction.onerror = designerDB.onerror;
for (var t in designerTables) {
var t;
for (t in designerTables) {
if (db.objectStoreNames.contains(designerTables[t].name)) {
db.deleteObjectStore(designerTables[t].name);
}
}
for (var t in designerTables) {
for (t in designerTables) {
db.createObjectStore(designerTables[t].name, {
keyPath: designerTables[t].key,
autoIncrement: designerTables[t].autoIncrement

11
js/designer/move.js
View File

@ -631,10 +631,11 @@ DesignerMove.save = function (url) {
};
DesignerMove.getUrlPos = function (forceString) {
var key;
if (designerTablesEnabled || forceString) {
var poststr = '';
var argsep = CommonParams.get('arg_separator');
for (var key in jTabs) {
for (key in jTabs) {
poststr += argsep + 't_x[' + key + ']=' + parseInt(document.getElementById(key).style.left, 10);
poststr += argsep + 't_y[' + key + ']=' + parseInt(document.getElementById(key).style.top, 10);
poststr += argsep + 't_v[' + key + ']=' + (document.getElementById('id_tbody_' + key).style.display === 'none' ? 0 : 1);
@ -643,7 +644,7 @@ DesignerMove.getUrlPos = function (forceString) {
return poststr;
} else {
var coords = [];
for (var key in jTabs) {
for (key in jTabs) {
if (document.getElementById('check_vis_' + key).checked) {
var x = parseInt(document.getElementById(key).style.left, 10);
var y = parseInt(document.getElementById(key).style.top, 10);
@ -1681,9 +1682,9 @@ var TargetColors = [];
DesignerMove.getColorByTarget = function (target) {
var color = ''; // "rgba(0,100,150,1)";
for (var a in TargetColors) {
if (TargetColors[a][0] === target) {
color = TargetColors[a][1];
for (var targetColor in TargetColors) {
if (TargetColors[targetColor][0] === target) {
color = TargetColors[targetColor][1];
break;
}
}

6
js/functions.js
View File

@ -490,6 +490,8 @@ Functions.suggestPassword = function (passwordForm) {
passwd.value = '';
var i;
// First we're going to try to use a built-in CSPRNG
if (window.crypto && window.crypto.getRandomValues) {
window.crypto.getRandomValues(randomWords);
@ -498,12 +500,12 @@ Functions.suggestPassword = function (passwordForm) {
window.msCrypto.getRandomValues(randomWords);
} else {
// Fallback to Math.random
for (var i = 0; i < passwordlength; i++) {
for (i = 0; i < passwordlength; i++) {
randomWords[i] = Math.floor(Math.random() * pwchars.length);
}
}
for (var i = 0; i < passwordlength; i++) {
for (i = 0; i < passwordlength; i++) {
passwd.value += pwchars.charAt(Math.abs(randomWords[i]) % pwchars.length);
}

3
js/indexes.js
View File

@ -382,12 +382,12 @@ Indexes.showAddIndexDialog = function (sourceArray, arrayIndex, targetColumns, c
Functions.ajaxShowMessage(data.error, false);
} else {
Functions.ajaxRemoveMessage($msgbox);
var $div = $('<div></div>');
if (showDialogLocal) {
// Show dialog if the request was successful
if ($('#addIndex').length > 0) {
$('#addIndex').remove();
}
var $div = $('<div></div>');
$div
.append(data.message)
.dialog({
@ -416,7 +416,6 @@ Indexes.showAddIndexDialog = function (sourceArray, arrayIndex, targetColumns, c
}
});
} else {
var $div = $('<div></div>');
$div
.append(data.message);
$div.css({ 'display' : 'none' });

19
js/makegrid.js
View File

@ -144,14 +144,15 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
* @param e event
*/
dragMove: function (e) {
var dx;
if (g.colRsz) {
var dx = e.pageX - g.colRsz.x0;
dx = e.pageX - g.colRsz.x0;
if (g.colRsz.objWidth + dx > g.minColWidth) {
$(g.colRsz.obj).css('left', g.colRsz.objLeft + dx + 'px');
}
} else if (g.colReorder) {
// dragged column animation
var dx = e.pageX - g.colReorder.x0;
dx = e.pageX - g.colReorder.x0;
$(g.cCpy)
.css('left', g.colReorder.objLeft + dx)
.show();
@ -866,6 +867,7 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
// reset the position of the edit_area div after closing datetime picker
$(g.cEdit).find('.edit_area').css({ 'top' :'0','position':'' });
var postParams;
if ($td.is('.relation')) {
// handle relations
$editArea.addClass('edit_area_loading');
@ -876,7 +878,7 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
/**
* @var post_params Object containing parameters for the POST request
*/
var postParams = {
postParams = {
'ajax_request' : true,
'get_relational_values' : true,
'server' : g.server,
@ -922,7 +924,7 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
/**
* @var post_params Object containing parameters for the POST request
*/
var postParams = {
postParams = {
'ajax_request' : true,
'get_enum_values' : true,
'server' : g.server,
@ -1056,7 +1058,7 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
if (datetimeValue) {
datetimeValue += '000000';
var datetimeValue = datetimeValue.substring(0, datetimeValue.indexOf('.') + 7);
datetimeValue = datetimeValue.substring(0, datetimeValue.indexOf('.') + 7);
$inputField.val(datetimeValue);
}
} else {
@ -1065,7 +1067,7 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
if (datetimeValue) {
datetimeValue += '000';
var datetimeValue = datetimeValue.substring(0, datetimeValue.indexOf('.') + 4);
datetimeValue = datetimeValue.substring(0, datetimeValue.indexOf('.') + 4);
$inputField.val(datetimeValue);
}
}
@ -1599,14 +1601,15 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
// initialize column order
var $colOrder = $(g.o).find('.col_order'); // check if column order is passed from PHP
var i;
if ($colOrder.length > 0) {
g.colOrder = $colOrder.val().split(',');
for (var i = 0; i < g.colOrder.length; i++) {
for (i = 0; i < g.colOrder.length; i++) {
g.colOrder[i] = parseInt(g.colOrder[i], 10);
}
} else {
g.colOrder = [];
for (var i = 0; i < $firstRowCols.length; i++) {
for (i = 0; i < $firstRowCols.length; i++) {
g.colOrder.push(i);
}
}

5
js/multi_column_sort.js
View File

@ -59,9 +59,10 @@ AJAX.registerOnload('keyhandler.js', function () {
$('th.draggable.column_heading.pointer.marker a').on('click', function (event) {
var url = $(this).parent().find('input').val();
var argsep = CommonParams.get('arg_separator');
var params;
if (event.ctrlKey || event.altKey) {
event.preventDefault();
var params = removeColumnFromMultiSort(url, $(this).parent());
params = removeColumnFromMultiSort(url, $(this).parent());
if (params) {
AJAX.source = $(this);
Functions.ajaxShowMessage();
@ -72,7 +73,7 @@ AJAX.registerOnload('keyhandler.js', function () {
event.preventDefault();
AJAX.source = $(this);
Functions.ajaxShowMessage();
var params = url.substring(url.indexOf('?') + 1);
params = url.substring(url.indexOf('?') + 1);
params += argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true';
$.post('sql.php', params, AJAX.responseHandler);
}

10
js/navigation.js
View File

@ -761,8 +761,9 @@ Navigation.showCurrent = function () {
$('#pma_navigation_tree')
.find('li.selected')
.removeClass('selected');
var $dbItem;
if (db) {
var $dbItem = findLoadedItem(
$dbItem = findLoadedItem(
$('#pma_navigation_tree').find('> div'), db, 'database', !table
);
if ($('#navi_db_select').length &&
@ -801,7 +802,7 @@ Navigation.showCurrent = function () {
}
});
var $dbItem = findLoadedItem(
$dbItem = findLoadedItem(
$('#pma_navigation_tree').find('> div'), dbItemName, 'database', !table
);
@ -1093,8 +1094,9 @@ Navigation.treePagination = function ($this) {
$.post(url, params, function (data) {
if (typeof data !== 'undefined' && data.success) {
Functions.ajaxRemoveMessage($msgbox);
var val;
if (isDbSelector) {
var val = Navigation.FastFilter.getSearchClause();
val = Navigation.FastFilter.getSearchClause();
$('#pma_navigation_tree')
.html(data.message)
.children('div')
@ -1106,7 +1108,7 @@ Navigation.treePagination = function ($this) {
}
} else {
var $parent = $this.closest('div.list_container').parent();
var val = Navigation.FastFilter.getSearchClause2($this);
val = Navigation.FastFilter.getSearchClause2($this);
$this.closest('div.list_container').html(
$(data.message).children().show()
);

3
js/tbl_chart.js
View File

@ -81,6 +81,7 @@ function queryChart (data, columnNames, settings) {
}
var i;
var values = [];
if (settings.seriesColumn === null) {
$.each(settings.selectedSeries, function (index, element) {
dataTable.addColumn(ColumnType.NUMBER, columnNames[element]);
@ -91,7 +92,6 @@ function queryChart (data, columnNames, settings) {
$.each(settings.selectedSeries, function (index, element) {
columnsToExtract.push(element);
});
var values = [];
var newRow;
var row;
var col;
@ -146,7 +146,6 @@ function queryChart (data, columnNames, settings) {
value[seriesNumber] = parseFloat(data[i][valueColumnName]);
}
var values = [];
$.each(valueMap, function (index, value) {
values.push(value);
});

6
js/tbl_operations.js
View File

@ -202,13 +202,11 @@ AJAX.registerOnload('tbl_operations.js', function () {
}
if ($('#partition_operation_DROP').is(':checked')) {
var question = Messages.strDropPartitionWarning;
$form.confirm(question, $form.attr('action'), function () {
$form.confirm(Messages.strDropPartitionWarning, $form.attr('action'), function () {
submitPartitionMaintenance();
});
} else if ($('#partition_operation_TRUNCATE').is(':checked')) {
var question = Messages.strTruncatePartitionWarning;
$form.confirm(question, $form.attr('action'), function () {
$form.confirm(Messages.strTruncatePartitionWarning, $form.attr('action'), function () {
submitPartitionMaintenance();
});
} else {

6
js/tbl_structure.js
View File

@ -435,13 +435,11 @@ AJAX.registerOnload('tbl_structure.js', function () {
}
if ($link.is('#partition_action_DROP')) {
var question = Messages.strDropPartitionWarning;
$link.confirm(question, $link.attr('href'), function (url) {
$link.confirm(Messages.strDropPartitionWarning, $link.attr('href'), function (url) {
submitPartitionAction(url);
});
} else if ($link.is('#partition_action_TRUNCATE')) {
var question = Messages.strTruncatePartitionWarning;
$link.confirm(question, $link.attr('href'), function (url) {
$link.confirm(Messages.strTruncatePartitionWarning, $link.attr('href'), function (url) {
submitPartitionAction(url);
});
} else {