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

Make Scrutinizer Happy

Browse Source 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
This commit is contained in:
Nisarg Jhaveri 2015-06-30 21:58:21 +05:30
parent 69e1c473de
commit befe89ad4e
8 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/console.js
View File

@ -810,9 +810,9 @@ var PMA_consoleMessages = {
var msgId = Math.round(Math.random()*(899999999999)+100000000000);
var now = new Date();
var $newMessage =
$('<div class="message '
+ (PMA_console.config.alwaysExpand ? 'expanded' : 'collapsed')
+'" msgid="' + msgId + '"><div class="action_content"></div></div>');
$('<div class="message ' +
(PMA_console.config.alwaysExpand ? 'expanded' : 'collapsed') +
'" msgid="' + msgId + '"><div class="action_content"></div></div>');
switch(msgType) {
case 'query':
$newMessage.append('<div class="query highlighted"></div>');
@ -893,8 +893,9 @@ var PMA_consoleMessages = {
$targetMessage.find('.action.requery').click(function () {
var query = $(this).parent().siblings('.query').text();
var $message = $(this).closest('.message');
if (confirm(PMA_messages.strConsoleRequeryConfirm + '\n'
+ (query.length<100 ? query : query.slice(0, 100) + '...'))) {
if (confirm(PMA_messages.strConsoleRequeryConfirm + '\n' +
(query.length<100 ? query : query.slice(0, 100) + '...'))
) {
PMA_console.execute(query, {db: $message.attr('targetdb'), table: $message.attr('targettable')});
}
});

6
js/db_structure.js
View File

@ -243,9 +243,9 @@ AJAX.registerOnload('db_structure.js', function () {
/**
* @var question String containing the question to be asked for confirmation
*/
var question = PMA_messages.strTruncateTableStrongWarning + ' '
+ PMA_sprintf(PMA_messages.strDoYouReally, 'TRUNCATE ' + escapeHtml(curr_table_name))
+ getForeignKeyCheckboxLoader();
var question = PMA_messages.strTruncateTableStrongWarning + ' ' +
PMA_sprintf(PMA_messages.strDoYouReally, 'TRUNCATE ' + escapeHtml(curr_table_name)) +
getForeignKeyCheckboxLoader();
$this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function (url) {

8
js/functions.js
View File

@ -1714,10 +1714,10 @@ function loadForeignKeyCheckbox() {
'get_default_fk_check_value': true
};
$.get('sql.php', params, function (data) {
var html = '<input type="hidden" name="fk_checks" value="0" />'
+ '<input type="checkbox" name="fk_checks" id="fk_checks"'
+ (data.default_fk_check_value ? ' checked="checked"' : '') + ' />'
+ '<label for="fk_checks">' + PMA_messages.strForeignKeyCheck + '</label>';
var html = '<input type="hidden" name="fk_checks" value="0" />' +
'<input type="checkbox" name="fk_checks" id="fk_checks"' +
(data.default_fk_check_value ? ' checked="checked"' : '') + ' />' +
'<label for="fk_checks">' + PMA_messages.strForeignKeyCheck + '</label>';
$('.load-default-fk-check-value').replaceWith(html);
});
}

11
js/makegrid.js
View File

@ -1659,16 +1659,17 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
// get data columns in the first row of the table
var $firstRowCols = $(g.t).find('tr:first th.draggable');
var i;
// initialize column visibility
var $col_visib = $(g.o).find('.col_visib'); // check if column visibility is passed from PHP
if ($col_visib.length > 0) {
g.colVisib = $col_visib.val().split(',');
for (var i = 0; i < g.colVisib.length; i++) {
for (i = 0; i < g.colVisib.length; i++) {
g.colVisib[i] = parseInt(g.colVisib[i], 10);
}
} else {
g.colVisib = [];
for (var i = 0; i < $firstRowCols.length; i++) {
for (i = 0; i < $firstRowCols.length; i++) {
g.colVisib.push(1);
}
}
@ -1708,7 +1709,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
}
};
for (var i = 0; i < $firstRowCols.length; i++) {
for (i = 0; i < $firstRowCols.length; i++) {
var currHeader = $firstRowCols[i];
var listElmt = document.createElement('div');
$(listElmt).text($(currHeader).text())
@ -2118,8 +2119,8 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
// todo update the original length after a grid edit
$(t).find('td.data.truncated:not(:has(span))')
.wrapInner(function() {
return '<span title="' + PMA_messages.strOriginalLength + ' '
+ $(this).data('originallength') + '"></span>';
return '<span title="' + PMA_messages.strOriginalLength + ' ' +
$(this).data('originallength') + '"></span>';
});
// wrap remaining cells, except actions cell, with span

5
js/menu-resizer.js
View File

@ -68,7 +68,8 @@
// Calculate the total width used by all the shown tabs
var total_len = more_shown ? submenu_w : 0;
var l = $li.length - 1;
for (var i = 0; i < l; i++) {
var i;
for (i = 0; i < l; i++) {
total_len += $($li[i]).outerWidth(true);
}
// Now hide menu elements that don't fit into the menubar
@ -91,7 +92,7 @@
// If we didn't hide any tabs, then there might be some space to show some
if (! hidden) {
// Show menu elements that do fit into the menubar
for (var i = 0, l = $li2.length; i < l; i++) {
for (i = 0, l = $li2.length; i < l; i++) {
total_len += $($li2[i]).data('width');
// item fits or (it is the last item
// and it would fit if More got removed)

6
js/pmd/history.js
View File

@ -563,8 +563,8 @@ function query_orderby()
var str = "";
for (i = 0; i < history_array.length;i++) {
if (history_array[i].get_type() == "OrderBy") {
str += "`" + history_array[i].get_column_name() + "` "
+ history_array[i].get_obj().get_order() + ", ";
str += "`" + history_array[i].get_column_name() + "` " +
history_array[i].get_obj().get_order() + ", ";
}
}
str = str.substr(0, str.length - 2);
@ -847,4 +847,4 @@ AJAX.registerOnload('pmd/history.js', function () {
edit('Where');
});
$('#ab').accordion({collapsible : true, active : 'none'});
});
});

4
js/pmd/move.js
View File

@ -423,8 +423,8 @@ function Re_load()
row_offset_top = 0;
tab_hide_button = document.getElementById('id_hide_tbody_' + contr[K][key][key2][key3][0]);
if (tab_hide_button.innerHTML == 'v') {
var toColumn = document.getElementById(contr[K][key][key2][key3][0]
+ '.' + contr[K][key][key2][key3][1]);
var toColumn = document.getElementById(contr[K][key][key2][key3][0] +
'.' + contr[K][key][key2][key3][1]);
if (toColumn) {
row_offset_top = toColumn.offsetTop;
} else {

9
js/tbl_chart.js
View File

@ -73,6 +73,7 @@ function PMA_queryChart(data, columnNames, settings) {
dataTable.addColumn(ColumnType.STRING, columnNames[settings.mainAxis]);
}
var i;
if (settings.seriesColumn === null) {
$.each(settings.selectedSeries, function (index, element) {
dataTable.addColumn(ColumnType.NUMBER, columnNames[element]);
@ -84,7 +85,7 @@ function PMA_queryChart(data, columnNames, settings) {
columnsToExtract.push(element);
});
var values = [], newRow, row, col;
for (var i = 0; i < data.length; i++) {
for (i = 0; i < data.length; i++) {
row = data[i];
newRow = [];
for (var j = 0; j < columnsToExtract.length; j++) {
@ -107,7 +108,7 @@ function PMA_queryChart(data, columnNames, settings) {
} else {
var seriesNames = {}, seriesNumber = 1;
var seriesColumnName = columnNames[settings.seriesColumn];
for (var i = 0; i < data.length; i++) {
for (i = 0; i < data.length; i++) {
if (! seriesNames[data[i][seriesColumnName]]) {
seriesNames[data[i][seriesColumnName]] = seriesNumber;
seriesNumber++;
@ -121,7 +122,7 @@ function PMA_queryChart(data, columnNames, settings) {
var valueMap = {}, xValue, value;
var mainAxisName = columnNames[settings.mainAxis];
var valueColumnName = columnNames[settings.valueColumn];
for (var i = 0; i < data.length; i++) {
for (i = 0; i < data.length; i++) {
xValue = data[i][mainAxisName];
value = valueMap[xValue];
if (! value) {
@ -424,4 +425,4 @@ AJAX.registerOnload('tbl_chart.js', function () {
onDataSeriesChange();
$("#tblchartform").submit();
});
});