diff --git a/js/console.js b/js/console.js index 7edeaf560c..d3829e5b3d 100644 --- a/js/console.js +++ b/js/console.js @@ -810,9 +810,9 @@ var PMA_consoleMessages = { var msgId = Math.round(Math.random()*(899999999999)+100000000000); var now = new Date(); var $newMessage = - $('
'); + $(''); switch(msgType) { case 'query': $newMessage.append(''); @@ -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')}); } }); diff --git a/js/db_structure.js b/js/db_structure.js index 2a3be33cb6..6f991ae9fd 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -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) { diff --git a/js/functions.js b/js/functions.js index 3fb41961cf..b4460dd8aa 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1714,10 +1714,10 @@ function loadForeignKeyCheckbox() { 'get_default_fk_check_value': true }; $.get('sql.php', params, function (data) { - var html = '' - + '' - + ''; + var html = '' + + '' + + ''; $('.load-default-fk-check-value').replaceWith(html); }); } diff --git a/js/makegrid.js b/js/makegrid.js index 6eaed4f8fb..6cf5c96761 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -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 ''; + return ''; }); // wrap remaining cells, except actions cell, with span diff --git a/js/menu-resizer.js b/js/menu-resizer.js index eb68083008..392f94be34 100644 --- a/js/menu-resizer.js +++ b/js/menu-resizer.js @@ -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) diff --git a/js/pmd/history.js b/js/pmd/history.js index 1246dad72f..151efbaddd 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -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'}); -}); \ No newline at end of file +}); diff --git a/js/pmd/move.js b/js/pmd/move.js index e2844f037b..15ab7d9934 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -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 { diff --git a/js/tbl_chart.js b/js/tbl_chart.js index d8360d221f..868172f1a0 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -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(); -}); \ No newline at end of file +});