From fc51a91713b1e99e0aee9aa778402ee59f860d3d Mon Sep 17 00:00:00 2001 From: Gemorroj Date: Sat, 26 Jan 2013 15:35:29 +0300 Subject: [PATCH] many some minor fixes (sorry, see diff) --- js/ajax.js | 8 ++-- js/config.js | 16 ++++--- js/db_operations.js | 10 ++-- js/db_search.js | 11 +++-- js/db_structure.js | 2 +- js/functions.js | 45 +++++++++--------- js/get_image.js.php | 4 +- js/gis_data_editor.js | 46 +++++++++---------- js/keyhandler.js | 6 +-- js/makegrid.js | 25 ++++------ js/navigation.js | 4 +- js/pmd/history.js | 17 ++++--- js/pmd/iecanvas.js | 26 +++++------ js/pmd/move.js | 39 +++++++++------- js/rte.js | 2 +- js/server_privileges.js | 4 +- js/server_status_monitor.js | 20 ++++---- js/sql.js | 8 +++- js/tbl_change.js | 6 +-- js/tbl_chart.js | 8 ++-- js/tbl_structure.js | 6 +-- js/tbl_zoom_plot_jqplot.js | 34 ++++++++------ libraries/display_import.lib.php | 2 +- .../plugins/auth/swekey/swekey.auth.lib.php | 2 +- libraries/plugins/auth/swekey/swekey.php | 2 +- libraries/schema/User_Schema.class.php | 2 +- libraries/sqlparser.data.php | 8 ---- pmd_pdf.php | 6 +-- setup/scripts.js | 4 +- version_check.php | 2 +- 30 files changed, 192 insertions(+), 183 deletions(-) diff --git a/js/ajax.js b/js/ajax.js index 1bd2e93e40f8..e26fe7686964 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -57,7 +57,7 @@ var AJAX = { * @return self For chaining */ registerOnload: function (file, func) { - eventName = 'onload_' + AJAX.hash(file); + var eventName = 'onload_' + AJAX.hash(file); $(document).bind(eventName, func); this._debug && console.log( // no need to translate @@ -76,7 +76,7 @@ var AJAX = { * @return self For chaining */ registerTeardown: function (file, func) { - eventName = 'teardown_' + AJAX.hash(file); + var eventName = 'teardown_' + AJAX.hash(file); $(document).bind(eventName, func); this._debug && console.log( // no need to translate @@ -93,7 +93,7 @@ var AJAX = { * @return void */ fireOnload: function (file) { - eventName = 'onload_' + AJAX.hash(file); + var eventName = 'onload_' + AJAX.hash(file); $(document).trigger(eventName); this._debug && console.log( // no need to translate @@ -109,7 +109,7 @@ var AJAX = { * @return void */ fireTeardown: function (file) { - eventName = 'teardown_' + AJAX.hash(file); + var eventName = 'teardown_' + AJAX.hash(file); $(document).triggerHandler(eventName); this._debug && console.log( // no need to translate diff --git a/js/config.js b/js/config.js index d694c31e8824..2141b656e515 100644 --- a/js/config.js +++ b/js/config.js @@ -61,9 +61,11 @@ function setFieldValue(field, field_type, value) field = $(field); switch (field_type) { case 'text': + //TODO: replace to .val() field.attr('value', (value != undefined ? value : field.attr('defaultValue'))); break; case 'checkbox': + //TODO: replace to .prop() field.attr('checked', (value != undefined ? value : field.attr('defaultChecked'))); break; case 'select': @@ -642,15 +644,15 @@ AJAX.registerOnload('config.js', function() { // enable JavaScript dependent fields radios - .attr('disabled', false) + .prop('disabled', false) .add('#export_text_file, #import_text_file') .click(function(){ var enable_id = $(this).attr('id'); var disable_id = enable_id.match(/local_storage$/) ? enable_id.replace(/local_storage$/, 'text_file') : enable_id.replace(/text_file$/, 'local_storage'); - $('#opts_'+disable_id).addClass('disabled').find('input').attr('disabled', true); - $('#opts_'+enable_id).removeClass('disabled').find('input').attr('disabled', false); + $('#opts_'+disable_id).addClass('disabled').find('input').prop('disabled', true); + $('#opts_'+enable_id).removeClass('disabled').find('input').prop('disabled', false); }); // detect localStorage state @@ -665,12 +667,12 @@ AJAX.registerOnload('config.js', function() { var form = $(this); var disabled = false; if (!ls_supported) { - disabled = form.find('input[type=radio][value$=local_storage]').attr('checked'); + disabled = form.find('input[type=radio][value$=local_storage]').prop('checked'); } else if (!ls_exists && form.attr('name') == 'prefs_import' && $('#import_local_storage')[0].checked) { disabled = true; } - form.find('input[type=submit]').attr('disabled', disabled); + form.find('input[type=submit]').prop('disabled', disabled); }).submit(function(e) { var form = $(this); if (form.attr('name') == 'prefs_export' && $('#export_local_storage')[0].checked) { @@ -702,7 +704,7 @@ function savePrefsToLocalStorage(form) { form = $(form); var submit = form.find('input[type=submit]'); - submit.attr('disabled', true); + submit.prop('disabled', true); $.ajax({ url: 'prefs_manage.php', cache: false, @@ -725,7 +727,7 @@ function savePrefsToLocalStorage(form) form.prev('.click-hide-message').show('fast'); }, complete: function() { - submit.attr('disabled', false); + submit.prop('disabled', false); } }); } diff --git a/js/db_operations.js b/js/db_operations.js index 329bd56d0a01..848f984d225b 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -63,7 +63,7 @@ AJAX.registerOnload('db_operations.js', function() { } else { PMA_ajaxShowMessage(data.error, false); } - }) // end $.get() + }); // end $.get() }) }); // end Rename Database @@ -92,8 +92,8 @@ AJAX.registerOnload('db_operations.js', function() { } else { PMA_ajaxShowMessage(data.error, false); } - }) // end $.get - }) // end copy database + }); // end $.get + }); // end copy database /** * Ajax Event handler for 'Change Charset' of the database @@ -109,6 +109,6 @@ AJAX.registerOnload('db_operations.js', function() { } else { PMA_ajaxShowMessage(data.error, false); } - }) // end $.get() - }) // end change charset + }); // end $.get() + }); // end change charset }); diff --git a/js/db_search.js b/js/db_search.js index b24848a56177..495abadc38d2 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -147,8 +147,9 @@ AJAX.registerOnload('db_search.js', function() { * Changing the displayed text according to * the hide/show criteria in search form */ - $("#togglequerybox").hide(); - $("#togglequerybox").bind('click', function() { + $("#togglequerybox") + .hide() + .bind('click', function() { var $link = $(this); $('#sqlqueryform').slideToggle("medium"); if ($link.text() == PMA_messages['strHideQueryBox']) { @@ -187,7 +188,7 @@ AJAX.registerOnload('db_search.js', function() { var $msgbox = PMA_ajaxShowMessage(PMA_messages['strSearching'], false); // jQuery object to reuse - $form = $(this); + var $form = $(this); PMA_prepareForAjaxRequest($form); @@ -199,7 +200,7 @@ AJAX.registerOnload('db_search.js', function() { $('#togglesearchresultlink') // always start with the Show message - .text(PMA_messages['strHideSearchResults']) + .text(PMA_messages['strHideSearchResults']); $('#togglesearchresultsdiv') // now it's time to show the div containing the link .show(); @@ -212,7 +213,7 @@ AJAX.registerOnload('db_search.js', function() { .hide(); $('#togglesearchformlink') // always start with the Show message - .text(PMA_messages['strShowSearchCriteria']) + .text(PMA_messages['strShowSearchCriteria']); $('#togglesearchformdiv') // now it's time to show the div containing the link .show(); diff --git a/js/db_structure.js b/js/db_structure.js index 34f326fe1b66..5081d0274ed5 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -319,7 +319,7 @@ AJAX.registerOnload('db_structure.js', function() { } // Make the removed table visible in the list of 'Untracked tables'. - $untracked_table = $('table#noversions'); + var $untracked_table = $('table#noversions'); // This won't work if no untracked tables are there. if ($untracked_table.length > 0) { diff --git a/js/functions.js b/js/functions.js index a834ed59df4a..07355aa33d14 100644 --- a/js/functions.js +++ b/js/functions.js @@ -17,7 +17,7 @@ var sql_box_locked = false; /** * @var array holds elements which content should only selected once */ -var only_once_elements = new Array(); +var only_once_elements = []; /** * @var int ajax_message_count Number of AJAX messages shown since page load @@ -37,7 +37,7 @@ var codemirror_inline_editor = false; /** * @var chart_activeTimeouts object active timeouts that refresh the charts. When disabling a realtime chart, this can be used to stop the continuous ajax requests */ -var chart_activeTimeouts = new Object(); +var chart_activeTimeouts = {}; /** * Make sure that ajax requests will not be cached @@ -82,7 +82,7 @@ function suggestPassword(passwd_form) var passwd = passwd_form.generated_pw; passwd.value = ''; - for ( i = 0; i < passwordlength; i++ ) { + for (var i = 0; i < passwordlength; i++ ) { passwd.value += pwchars.charAt( Math.floor( Math.random() * pwchars.length ) ); } passwd_form.text_pma_pw.value = passwd.value; @@ -138,9 +138,9 @@ function PMA_current_version(data) ); if (Math.floor(latest / 10000) === Math.floor(current / 10000)) { /* Security update */ - klass = 'error'; + var klass = 'error'; } else { - klass = 'notice'; + var klass = 'notice'; } $('#maincontainer').after('
' + message + '
'); } @@ -676,7 +676,7 @@ var last_shift_clicked_row = -1; /** * This array is used to remember mark status of rows in browse mode */ -var marked_row = new Array; +var marked_row = []; /** * marks all rows and selects its first checkbox inside the given element @@ -830,7 +830,7 @@ function insertValueQuery() //IE support } else if (document.selection) { myQuery.focus(); - sel = document.selection.createRange(); + var sel = document.selection.createRange(); sel.text = chaineAj; document.sqlform.insert.focus(); } @@ -873,11 +873,11 @@ function refreshLayout() var paper = 'A4'; } if (orientation == 'P') { - posa = 'x'; - posb = 'y'; + var posa = 'x'; + var posb = 'y'; } else { - posa = 'y'; - posb = 'x'; + var posa = 'y'; + var posb = 'x'; } $elm.css('width', pdfPaperSize(paper, posa) + 'px'); $elm.css('height', pdfPaperSize(paper, posb) + 'px'); @@ -1356,8 +1356,8 @@ AJAX.registerOnload('functions.js', function() { var old_text = $inner_sql.html(); var new_content = "\n"; - new_content += "\n"; - new_content += "\n"; + new_content += "\n"; + new_content += "\n"; var $editor_area = $('div#inline_editor'); if ($editor_area.length == 0) { $editor_area = $('
'); @@ -1377,11 +1377,11 @@ AJAX.registerOnload('functions.js', function() { var sql_query = $(this).prev().val(); } - $form = $("a.inline_edit_sql").prev('form'); + var $form = $("a.inline_edit_sql").prev('form'); var $fake_form = $('
', {action: 'import.php', method: 'post'}) .append($form.find("input[name=server], input[name=db], input[name=table], input[name=token]").clone()) - .append($('', {type: 'hidden', name: 'show_query', value: 1})) - .append($('', {type: 'hidden', name: 'sql_query', value: sql_query})); + .append($('', {type: 'hidden', name: 'show_query', value: 1})) + .append($('', {type: 'hidden', name: 'sql_query', value: sql_query})); $fake_form.appendTo($('body')).submit(); }); @@ -1640,8 +1640,7 @@ $(function() { $('span.ajax_notification a, span.ajax_notification button, span.ajax_notification input') .live('mouseover', function () { $(this).parents('span.ajax_notification').tooltip('disable'); - }); - $('span.ajax_notification a, span.ajax_notification button, span.ajax_notification input') + }) .live('mouseout', function () { $(this).parents('span.ajax_notification').tooltip('enable'); }); @@ -2498,7 +2497,7 @@ function PMA_hideShowDefaultValue($default_type) function PMA_validateDefaultValue($null_checkbox) { if (! $null_checkbox.prop('checked')) { - $default = $null_checkbox.closest('tr').find('.default_type'); + var $default = $null_checkbox.closest('tr').find('.default_type'); if ($default.val() == 'NULL') { $default.val('NONE'); } @@ -2617,7 +2616,7 @@ AJAX.registerOnload('functions.js', function() { buttonOptions[PMA_messages['strGo']] = function () { // When the submit button is clicked, // put the data back into the original form - var value_array = new Array(); + var value_array = []; $(this).find(".values input").each(function(index, elm) { var val = elm.value.replace(/\\/g, '\\\\').replace(/'/g, "''"); value_array.push("'" + val + "'"); @@ -2902,7 +2901,7 @@ AJAX.registerOnload('functions.js', function() { function PMA_mainMenuResizerCallback() { // 5 px margin for jumping menu in Chrome - return $('body').width() - 5; + return $(document.body).width() - 5; } // This must be fired only once after the inital page load $(function() { @@ -3098,7 +3097,7 @@ AJAX.registerOnload('functions.js', function() { // for all td of the same vertical row, toggle hover $('.vpointer').filter('.row_' + row_num).toggleClass('hover'); } - ); + ); /** @@ -3507,7 +3506,7 @@ function PMA_tooltip($elements, item, myContent, additionalOptions) track: true, show: false, hide: false - } + }; $elements.tooltip($.extend(true, defaultOptions, additionalOptions)); } diff --git a/js/get_image.js.php b/js/get_image.js.php index d61e094f1093..0861fa3c5f37 100644 --- a/js/get_image.js.php +++ b/js/get_image.js.php @@ -52,7 +52,7 @@ */ function PMA_getImage(image, alternate, attributes) { var in_array = function (needle, haystack) { - for (i in haystack) { + for (var i in haystack) { if (haystack[i] == needle) { return true; } @@ -134,5 +134,5 @@ function PMA_getImage(image, alternate, attributes) { } return retval; -}; +} // \ No newline at end of file diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js index 2cae190fd024..99dc70d529f2 100644 --- a/js/gis_data_editor.js +++ b/js/gis_data_editor.js @@ -14,7 +14,7 @@ var gisEditorLoaded = false; function closeGISEditor(){ $("#popup_background").fadeOut("fast"); $("#gis_editor").fadeOut("fast", function () { - $(this).html(''); + $(this).empty(); }); } @@ -26,7 +26,7 @@ function prepareJSVersion() { $("#gis_editor input[name='gis_data[save]']") .val(PMA_messages['strCopy']) .insertAfter($('#gis_data_textarea')) - .before('

'); + .before('

'); // Add close and cancel links $('#gis_data_editor').prepend('' + PMA_messages['strClose'] + ''); @@ -56,11 +56,11 @@ function prepareJSVersion() { * @returns the HTML for a data point */ function addDataPoint(pointNumber, prefix) { - return '
' + $.sprintf(PMA_messages['strPointN'], (pointNumber + 1)) + ': ' + return '
' + $.sprintf(PMA_messages['strPointN'], (pointNumber + 1)) + ': ' + '' - + '' + + '' + '' - + ''; + + ''; } /** @@ -97,7 +97,7 @@ function loadJSAndGISEditor(value, field, type, input_name, token) { 'js/jquery/jquery.event.drag-2.0.js', 'js/tbl_gis_visualization.js' ]; - for (i = 0; i < smallScripts.length; i++) { + for (var i = 0; i < smallScripts.length; i++) { script = document.createElement('script'); script.type = 'text/javascript'; script.src = smallScripts[i]; @@ -175,7 +175,7 @@ function openGISEditor() { $backgrouond.css({"opacity":"0.7"}); $gis_editor.append('
' + + pmaThemeImage + 'ajax_clock_small.gif" alt=""/>' ); // Make it appear @@ -313,7 +313,7 @@ AJAX.registerOnload('gis_data_editor.js', function() { var noOfLines = parseInt($noOfLinesInput.val()); // Add the new linesting of inner ring based on the type - var html = '
'; + var html = '
'; if (type == 'MULTILINESTRING') { html += PMA_messages['strLineString'] + ' ' + (noOfLines + 1) + ':'; var noOfPoints = 2; @@ -321,12 +321,12 @@ AJAX.registerOnload('gis_data_editor.js', function() { html += PMA_messages['strInnerRing'] + ' ' + noOfLines + ':'; var noOfPoints = 4; } - html += ''; - for (i = 0; i < noOfPoints; i++) { + html += ''; + for (var i = 0; i < noOfPoints; i++) { html += addDataPoint(i, (prefix + '[' + noOfLines + ']')); } html += '+ ' - + PMA_messages['strAddPoint'] + '
'; + + PMA_messages['strAddPoint'] + '
'; $a.before(html); $noOfLinesInput.val(noOfLines + 1); @@ -345,17 +345,17 @@ AJAX.registerOnload('gis_data_editor.js', function() { var noOfPolygons = parseInt($noOfPolygonsInput.val()); // Add the new polygon - var html = PMA_messages['strPolygon'] + ' ' + (noOfPolygons + 1) + ':
'; - html += ''; - + '
' + PMA_messages['strOuterRing'] + ':'; - + ''; - for (i = 0; i < 4; i++) { + var html = PMA_messages['strPolygon'] + ' ' + (noOfPolygons + 1) + ':
'; + html += ''; + + '
' + PMA_messages['strOuterRing'] + ':'; + + ''; + for (var i = 0; i < 4; i++) { html += addDataPoint(i, (prefix + '[' + noOfPolygons + '][0]')); } html += '+ ' - + PMA_messages['strAddPoint'] + '
' + + PMA_messages['strAddPoint'] + '
' + '+ ' - + PMA_messages['strAddInnerRing'] + '

'; + + PMA_messages['strAddInnerRing'] + '

'; $a.before(html); $noOfPolygonsInput.val(noOfPolygons + 1); @@ -371,15 +371,15 @@ AJAX.registerOnload('gis_data_editor.js', function() { var $noOfGeomsInput = $("input[name='" + prefix + "[geom_count]" + "']"); var noOfGeoms = parseInt($noOfGeomsInput.val()); - var html1 = PMA_messages['strGeometry'] + ' ' + (noOfGeoms + 1) + ':
'; + var html1 = PMA_messages['strGeometry'] + ' ' + (noOfGeoms + 1) + ':
'; var $geomType = $("select[name='gis_data[" + (noOfGeoms - 1) + "][gis_type]']").clone(); $geomType.attr('name', 'gis_data[' + noOfGeoms + '][gis_type]').val('POINT'); - var html2 = '
' + PMA_messages['strPoint'] + ' :' + var html2 = '
' + PMA_messages['strPoint'] + ' :' + '' - + '' + + '' + '' - + '' - + '

'; + + '' + + '

'; $a.before(html1); $geomType.insertBefore($a); $a.before(html2); $noOfGeomsInput.val(noOfGeoms + 1); diff --git a/js/keyhandler.js b/js/keyhandler.js index 2d11731a9828..70c0019adccf 100644 --- a/js/keyhandler.js +++ b/js/keyhandler.js @@ -35,7 +35,7 @@ function onKeyDownArrowsHandler(e) var x = pos[2], y=pos[1]; // skip non existent fields - for (i=0; i<10; i++) + for (var i=0; i<10; i++) { if (switch_movement) { switch(e.keyCode) { @@ -84,8 +84,8 @@ function onKeyDownArrowsHandler(e) var id = "field_" + y + "_" + x; var nO = document.getElementById(id); if (!nO) { - var id = "field_" + y + "_" + x + "_0"; - var nO = document.getElementById(id); + id = "field_" + y + "_" + x + "_0"; + nO = document.getElementById(id); } if (nO) { break; diff --git a/js/makegrid.js b/js/makegrid.js index a1c6c34e663a..3f9125916429 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -29,10 +29,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi tableCreateTime: null, // table creation time, used for saving column order and visibility to server, only available in "Browse tab" // Column reordering variables - colOrder: new Array(), // array of column order + colOrder: [], // array of column order // Column visibility variables - colVisib: new Array(), // array of column visibility + colVisib: [], // array of column visibility showAllColText: '', // string, text for "show all" button under column visibility list visibleHeadersCount: 0, // number of visible data headers @@ -87,8 +87,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi objLeft: $(obj).position().left, objWidth: $(g.t).find('th.draggable:visible:eq(' + n + ') span').outerWidth() }; - $('body').css('cursor', 'col-resize'); - $('body').noSelect(); + $(document.body).css('cursor', 'col-resize').noSelect(); if (g.isCellEditActive) { g.hideEditCell(); } @@ -127,8 +126,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi objLeft: objPos.left }; - $('body').css('cursor', 'move'); - $('body').noSelect(); + $(document.body).css('cursor', 'move').noSelect(); if (g.isCellEditActive) { g.hideEditCell(); } @@ -223,8 +221,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.colReorder = false; } - $('body').css('cursor', 'inherit'); - $('body').noSelect(false); + $(document.body).css('cursor', 'inherit').noSelect(false); }, /** @@ -303,7 +300,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.colOrder.splice(newn, 0, tmp); // adjust the colVisib if (g.colVisib.length > 0) { - var tmp = g.colVisib[oldn]; + tmp = g.colVisib[oldn]; g.colVisib.splice(oldn, 1); g.colVisib.splice(newn, 0, tmp); } @@ -1443,7 +1440,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.colOrder[i] = parseInt(g.colOrder[i]); } } else { - g.colOrder = new Array(); + g.colOrder = []; for (var i = 0; i < $firstRowCols.length; i++) { g.colOrder.push(i); } @@ -1532,7 +1529,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.colVisib[i] = parseInt(g.colVisib[i]); } } else { - g.colVisib = new Array(); + g.colVisib = []; for (var i = 0; i < $firstRowCols.length; i++) { g.colVisib.push(1); } @@ -1716,8 +1713,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi if ($(e.target).parents().index(g.cEdit) == -1) { g.hideEditCell(); } - }); - $('html').keydown(function(e) { + }).keydown(function(e) { if (e.which == 27 && g.isCellEditActive) { // cancel on pressing "Esc" @@ -1858,5 +1854,4 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // some adjustment $(t).removeClass('data'); $(g.gDiv).addClass('data'); -}; - +} diff --git a/js/navigation.js b/js/navigation.js index d8bf9188c43e..256fd126953f 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -270,7 +270,7 @@ function PMA_reloadNavigation(callback) { PMA_ajaxShowMessage(data.error); } }); -}; +} /** * Handles any requests to change the page in a branch of a tree @@ -339,7 +339,7 @@ function PMA_navigationTreePagination($this) PMA_ajaxShowMessage(data.error); } }); -}; +} /** * @var ResizeHandler Custom object that manages the resizing of the navigation diff --git a/js/pmd/history.js b/js/pmd/history.js index e427cbba51bd..310f0e590faa 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -285,7 +285,7 @@ function history(ncolumn_name,nobj,ntab,nobj_no,ntype) }; this.get_and_or = function() { return and_or; - } + }; this.get_relation = function() { return and_or; }; @@ -309,17 +309,17 @@ function history(ncolumn_name,nobj,ntab,nobj_no,ntype) }; this.set_type = function(ntype) { type = ntype; - } + }; this.get_type = function() { return type; - } + }; this.set_obj_no(nobj_no); this.set_tab(ntab); this.set_and_or(0); this.set_obj(nobj); this.set_column_name(ncolumn_name); this.set_type(ntype); -}; +} /** * where object closure, makes an object with all information of where @@ -430,7 +430,7 @@ var aggregate = function(noperator) { function unique(arrayName) { - var newArray=new Array(); + var newArray=[]; label:for (var i=0; i"); this.element_.insertAdjacentHTML("beforeEnd", Str.join("")); - this.pmd_arr = Array(); + this.pmd_arr = []; } - }; + } } diff --git a/js/pmd/move.js b/js/pmd/move.js index acf27920bc49..eed06f84aa9c 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -245,7 +245,7 @@ function Rezize_osn_tab() { var max_X = 0; var max_Y = 0; - for (key in j_tabs) { + for (var key in j_tabs) { var k_x = parseInt(document.getElementById(key).style.left) + document.getElementById(key).offsetWidth; var k_y = parseInt(document.getElementById(key).style.top) + document.getElementById(key).offsetHeight; max_X = max_X < k_x ? k_x : max_X; @@ -269,7 +269,11 @@ function Re_load() var n; var x1; var x2; - var a = new Array(); + var a = []; + var K; + var key; + var key2; + var key3; Clear(); for (K in contr) { for (key in contr[K]) { @@ -508,7 +512,7 @@ function Exit_fullscreen() //------------------------------ SAVE ------------------------------------------ function Save(url) // (del?) no for pdf { - for (key in j_tabs) { + for (var key in j_tabs) { document.getElementById('t_x_' + key + '_').value = parseInt(document.getElementById(key).style.left); document.getElementById('t_y_' + key + '_').value = parseInt(document.getElementById(key).style.top); document.getElementById('t_v_' + key + '_').value = document.getElementById('id_tbody_' + key).style.display == 'none' ? 0 : 1; @@ -521,7 +525,7 @@ function Save(url) // (del?) no for pdf function Get_url_pos() { var poststr = ''; - for (key in j_tabs) { + for (var key in j_tabs) { poststr += '&t_x[' + key + ']=' + parseInt(document.getElementById(key).style.left); poststr += '&t_y[' + key + ']=' + parseInt(document.getElementById(key).style.top); poststr += '&t_v[' + key + ']=' + (document.getElementById('id_tbody_' + key).style.display == 'none' ? 0 : 1); @@ -667,7 +671,7 @@ function Start_tab_upd(table) function Small_tab_all(id_this) // max/min all tables { if (id_this.alt == "v") { - for (key in j_tabs) { + for (var key in j_tabs) { if (document.getElementById('id_hide_tbody_'+key).innerHTML == "v") { Small_tab(key, 0); } @@ -675,7 +679,7 @@ function Small_tab_all(id_this) // max/min all tables id_this.alt = ">"; id_this.src = pmaThemeImage + "pmd/rightarrow1.png"; } else { - for (key in j_tabs) { + for (var key in j_tabs) { if (document.getElementById('id_hide_tbody_'+key).innerHTML != "v") { Small_tab(key, 0); } @@ -688,7 +692,7 @@ function Small_tab_all(id_this) // max/min all tables function Small_tab_invert() // invert max/min all tables { - for (key in j_tabs) { + for (var key in j_tabs) { Small_tab(key, 0); } Re_load(); @@ -702,7 +706,7 @@ function Relation_lines_invert() function Small_tab_refresh() { - for (key in j_tabs) { + for (var key in j_tabs) { if(document.getElementById('id_hide_tbody_'+key).innerHTML != "v") { Small_tab(key, 0); Small_tab(key, 0); @@ -749,8 +753,9 @@ function Canvas_click(id) var n = 0; var relation_name = 0; var selected = 0; - var a = new Array(); + var a = []; var Key0, Key1, Key2, Key3, Key, x1, x2; + var K, key, key2, key3; var Local_X = $.FullScreen.isFullScreen() ? Glob_X : Glob_X - document.getElementById("canvas_outer").offsetLeft; var Local_Y = Glob_Y - document.getElementById("canvas_outer").offsetTop; Clear(); @@ -859,7 +864,7 @@ function Hide_tab_all(id_this) // max/min all tables id_this.src = pmaThemeImage + "pmd/downarrow1.png"; } var E = document.form1; - for (i = 0; i < E.elements.length; i++) { + for (var i = 0; i < E.elements.length; i++) { if (E.elements[i].type == "checkbox" && E.elements[i].id.substring(0, 10) == 'check_vis_') { if (id_this.alt == 'v') { E.elements[i].checked = true; @@ -876,7 +881,7 @@ function Hide_tab_all(id_this) // max/min all tables function in_array_k(x, m) { var b = 0; - for (u in m) { + for (var u in m) { if (x == u) { b=1; break; @@ -887,7 +892,8 @@ function in_array_k(x, m) function No_have_constr(id_this) { - var a = new Array(); + var a = []; + var K, key, key2, key3; for (K in contr) { for (key in contr[K]) { // contr name @@ -909,7 +915,7 @@ function No_have_constr(id_this) id_this.src = pmaThemeImage + "pmd/downarrow2.png"; } var E = document.form1; - for (i = 0; i < E.elements.length; i++) { + for (var i = 0; i < E.elements.length; i++) { if (E.elements[i].type == "checkbox" && E.elements[i].id.substring(0, 10) == 'check_vis_') { if (!in_array_k(E.elements[i].value, a)) { if (id_this.alt == 'v') { @@ -1038,12 +1044,12 @@ function Start_display_field() } } //------------------------------------------------------------------------------ -var TargetColors = new Array(); +var TargetColors = []; function getColorByTarget( target ) { var color = ''; //"rgba(0,100,150,1)"; - for (i in TargetColors) { + for (var i in TargetColors) { if (TargetColors[i][0]==target) { color = TargetColors[i][1]; break; @@ -1068,7 +1074,7 @@ function getColorByTarget( target ) var a = color_case[d][0]; var b = color_case[d][1]; var c = color_case[d][2]; - e = (1 - (j - 1) / 6); + var e = (1 - (j - 1) / 6); var r = Math.round(a * 200 * e); var g = Math.round(b * 200 * e); @@ -1105,6 +1111,7 @@ function Select_all(id_this,owner) var parent= document.form1; downer =owner; var i; + var k; var tab = []; for (i = 0; i < parent.elements.length; i++) { if (parent.elements[i].type == "checkbox" && parent.elements[i].id.substring(0,(9 + id_this.length)) == 'select_' + id_this + '._') { diff --git a/js/rte.js b/js/rte.js index 55e55612c2f5..e9863a4d01e6 100644 --- a/js/rte.js +++ b/js/rte.js @@ -200,7 +200,7 @@ RTE.COMMON = { that.$ajaxDialog.dialog('close'); // If we are in 'edit' mode, we must // remove the reference to the old row. - if (mode === 'edit') {this + if (mode === 'edit') { $edit_row.remove(); } // Sometimes, like when moving a trigger from diff --git a/js/server_privileges.js b/js/server_privileges.js index 38b1a6a0fb49..192475e9befc 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -78,7 +78,7 @@ function appendNewUser(new_user_string, new_user_initial, new_user_initial_strin //update the checkall checkbox $(checkboxes_sel).trigger("change"); -}; +} /** * AJAX scripts for server_privileges page. @@ -275,7 +275,7 @@ AJAX.registerOnload('server_privileges.js', function() { PMA_ajaxShowMessage(PMA_messages['strRemovingSelectedUsers']); - $form = $("#usersForm"); + var $form = $("#usersForm"); $.post($form.attr('action'), $form.serialize() + "&delete=" + $(this).val() + "&ajax_request=true", function(data) { if (data.success == true) { diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 2ec0d668994c..937cd4d5a273 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -184,7 +184,7 @@ AJAX.registerOnload('server_status_monitor.js', function() { }; // time span selection - var selectionTimeDiff = new Array(); + var selectionTimeDiff = []; var selectionStartX, selectionStartY, selectionEndX, selectionEndY; var drawTimeSpan = false; @@ -323,7 +323,7 @@ AJAX.registerOnload('server_status_monitor.js', function() { } // Default setting for the chart grid - defaultChartGrid = { + var defaultChartGrid = { 'c0': { title: PMA_messages['strQuestions'], series: [{label: PMA_messages['strQuestions']}], nodes: [{dataPoints: [{ type: 'statusvar', name: 'Questions' }], display: 'differential' }], @@ -611,7 +611,7 @@ AJAX.registerOnload('server_status_monitor.js', function() { $presetList.find(':selected').text() ); $('#chartPreset').prop('checked', true); - }) + }); $('#chartPreset').click(function () { $('input[name="chartTitle"]').val( $presetList.find(':selected').text() @@ -775,7 +775,7 @@ AJAX.registerOnload('server_status_monitor.js', function() { }).find('img.ajaxIcon').show(); var loadLogVars = function(getvars) { - vars = { ajax_request: true, logging_vars: true }; + var vars = { ajax_request: true, logging_vars: true }; if (getvars) { $.extend(vars, getvars); } @@ -807,7 +807,7 @@ AJAX.registerOnload('server_status_monitor.js', function() { msg = PMA_messages['strBothLogOff']; } - str = '' + PMA_messages['strCurrentSettings'] + '
'; + str = '' + PMA_messages['strCurrentSettings'] + '
'; str += icon + msg + '
'; if (logVars['log_output'] != 'TABLE') { @@ -991,7 +991,7 @@ AJAX.registerOnload('server_status_monitor.js', function() { str += serie.valueDivisor ? (', ' + $.sprintf(PMA_messages['strDividedBy'], serie.valueDivisor)) : ''; str += serie.unit ? (', ' + PMA_messages['strUnit'] + ': ' + serie.unit) : ''; - $('#seriesPreview').append('- ' + serie.name + str + '
'); + $('#seriesPreview').append('- ' + serie.name + str + '
'); newChart.nodes.push(serie); @@ -1368,9 +1368,9 @@ AJAX.registerOnload('server_status_monitor.js', function() { function PMA_getLogAnalyseDialog(min, max) { $('#logAnalyseDialog input[name="dateStart"]') - .attr('value', formatDate(min, 'yyyy-MM-dd HH:mm:ss')); + .val(formatDate(min, 'yyyy-MM-dd HH:mm:ss')); $('#logAnalyseDialog input[name="dateEnd"]') - .attr('value', formatDate(max, 'yyyy-MM-dd HH:mm:ss')); + .val(formatDate(max, 'yyyy-MM-dd HH:mm:ss')); var dlgBtns = { }; @@ -1924,7 +1924,7 @@ AJAX.registerOnload('server_status_monitor.js', function() { /* Constructs the log table out of the retrieved server data */ function buildLogTable(data) { var rows = data.rows; - var cols = new Array(); + var cols = []; var $table = $('
'); var $tBody, $tRow, $tCell; @@ -2226,5 +2226,5 @@ function destroyGrid() { $('#chartGrid').html(''); runtime.charts = null; runtime.chartAI = 0; - monitorSettings = null; + monitorSettings = null; //TODO:this not global variable } diff --git a/js/sql.js b/js/sql.js index f42ee5659b9d..0dee20515052 100644 --- a/js/sql.js +++ b/js/sql.js @@ -20,6 +20,12 @@ function PMA_urldecode(str) return decodeURIComponent(str.replace(/\+/g, '%20')); } +/** + * endecode a string URL_decoded + * + * @param string str + * @return string the URL-encoded string + */ function PMA_urlencode(str) { return encodeURIComponent(str).replace(/\%20/g, '+'); @@ -559,7 +565,7 @@ function makeProfilingChart() return; } - var data = new Array(); + var data = []; $.each(jQuery.parseJSON($('#profilingchart').html()),function(key,value) { data.push([key,parseFloat(value)]); }); diff --git a/js/tbl_change.js b/js/tbl_change.js index debf8ac5ce43..7b7d8e65e1bd 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -100,7 +100,7 @@ function isDate(val,tmstmp) } val=arrayVal.join("-"); var pos=2; - dtexp=new RegExp(/^([0-9]{4})-(((01|03|05|07|08|10|12)-((0[0-9])|([1-2][0-9])|(3[0-1])))|((02|04|06|09|11)-((0[0-9])|([1-2][0-9])|30)))$/); + var dtexp=new RegExp(/^([0-9]{4})-(((01|03|05|07|08|10|12)-((0[0-9])|([1-2][0-9])|(3[0-1])))|((02|04|06|09|11)-((0[0-9])|([1-2][0-9])|30)))$/); if (val.length == 8) { pos=0; } @@ -182,7 +182,7 @@ function verificationsAfterFieldChange(urlField, multi_edit, theType) return false; } } else if (theType=="datetime"||theType=="timestamp") { - tmstmp=false; + var tmstmp=false; if (dt_value == "CURRENT_TIMESTAMP") { return true; } @@ -421,7 +421,7 @@ AJAX.registerOnload('tbl_change.js', function() { .end() .find('.foreign_values_anchor') .each(function() { - $anchor = $(this); + var $anchor = $(this); var new_value = 'rownumber=' + new_row_index; // needs improvement in case something else inside // the href contains this pattern diff --git a/js/tbl_chart.js b/js/tbl_chart.js index 7e9582c45f59..1518f04ed402 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -76,16 +76,14 @@ AJAX.registerOnload('tbl_chart.js', function() { // handle changes in chart title $('input[name="chartTitle"]').focus(function() { temp_chart_title = $(this).val(); - }); - $('input[name="chartTitle"]').keyup(function() { + }).keyup(function() { var title = $(this).val(); if (title.length == 0) { title = ' '; } currentSettings.title = $('input[name="chartTitle"]').val(); drawChart(); - }); - $('input[name="chartTitle"]').blur(function() { + }).blur(function() { if ($(this).val() != temp_chart_title) { drawChart(); } @@ -241,7 +239,7 @@ function PMA_queryChart(data, columnNames, settings) { return; } - jqPlotSettings = { + var jqPlotSettings = { title : { text : settings.title, escapeHtml: true diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 5f622be5778e..06e4b9c3c9f7 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -224,7 +224,7 @@ AJAX.registerOnload('tbl_structure.js', function() { */ $('a.drop_primary_key_index_anchor.ajax').live('click', function(event) { event.preventDefault(); - $anchor = $(this); + var $anchor = $(this); /** * @var $curr_row Object containing reference to the current field's row */ @@ -466,13 +466,13 @@ function PMA_tbl_structure_menu_resizer_callback() { var $columns = $('#tablestructure').find('tr:eq(1)').find('td,th'); $columns.not(':last').each(function (){ columnsWidth += $(this).outerWidth(true) - }) + }); var totalCellSpacing = $('#tablestructure').width(); $columns.each(function (){ totalCellSpacing -= $(this).outerWidth(true); }); return pagewidth - columnsWidth - totalCellSpacing - 15; // 15px extra margin -}; +} /** Handler for "More" dropdown in structure table rows */ AJAX.registerOnload('tbl_structure.js', function() { diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js index ad805136511f..83c7db5273d6 100644 --- a/js/tbl_zoom_plot_jqplot.js +++ b/js/tbl_zoom_plot_jqplot.js @@ -58,7 +58,7 @@ function isEmpty(obj) { **/ function getTimeStamp(val, type) { if (type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return getDateFromFormat(val, 'yyyy-MM-dd HH:mm:ss', val); + return getDateFromFormat(val, 'yyyy-MM-dd HH:mm:ss'); } else if (type.toString().search(/time/i) != -1) { return getDateFromFormat('1970-01-01 ' + val, 'yyyy-MM-dd HH:mm:ss'); @@ -87,7 +87,7 @@ function getType(field) { ** @param array categorical values array **/ function getCord(arr) { - var newCord = new Array(); + var newCord = []; var original = $.extend(true, [], arr); var arr = jQuery.unique(arr).sort(); $.each(original, function(index, value) { @@ -275,14 +275,15 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function() { */ buttonOptions[PMA_messages['strSave']] = function () { //Find changed values by comparing form values with selectedRow Object - var newValues = new Object();//Stores the values changed from original - var sqlTypes = new Object(); + var newValues = {};//Stores the values changed from original + var sqlTypes = {}; var it = 0; var xChange = false; var yChange = false; + var key; for (key in selectedRow) { var oldVal = selectedRow[key]; - var newVal = ($('#edit_fields_null_id_' + it).attr('checked')) ? null : $('#edit_fieldID_' + it).val(); + var newVal = ($('#edit_fields_null_id_' + it).prop('checked')) ? null : $('#edit_fieldID_' + it).val(); if (newVal instanceof Array) { // when the column is of type SET newVal = $('#edit_fieldID_' + it).map(function(){ return $(this).val(); @@ -437,9 +438,9 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function() { $('#togglesearchformdiv').show(); var selectedRow; var colorCodes = ['#FF0000', '#00FFFF', '#0000FF', '#0000A0', '#FF0080', '#800080', '#FFFF00', '#00FF00', '#FF00FF']; - var series = new Array(); - var xCord = new Array(); - var yCord = new Array(); + var series = []; + var xCord = []; + var yCord = []; var tempX, tempY; var it = 0; var xMax; // xAxis extreme max @@ -479,7 +480,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function() { zoom: true, showTooltip: false } - } + }; // If data label is not set, do not show tooltips if (dataLabel == '') { @@ -491,10 +492,11 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function() { yType = getType(yType); // could have multiple series but we'll have just one - series[0] = new Array(); + series[0] = []; if (xType == 'time') { - originalXType = $('#types_0').val(); + var originalXType = $('#types_0').val(); + var format; if (originalXType == 'date') { format = '%Y-%m-%d'; } @@ -512,7 +514,8 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function() { }); } if (yType == 'time') { - originalYType = $('#types_1').val(); + var originalYType = $('#types_1').val(); + var format; if (originalYType == 'date') { format = '%Y-%m-%d'; } @@ -583,14 +586,15 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function() { $.post('tbl_zoom_select.php', post_params, function(data) { // Row is contained in data.row_info, // now fill the displayResultForm with row values + var key; for (key in data.row_info) { $field = $('#edit_fieldID_' + field_id); $field_null = $('#edit_fields_null_id_' + field_id); if (data.row_info[key] == null) { - $field_null.attr('checked', true); + $field_null.prop('checked', true); $field.val(''); } else { - $field_null.attr('checked', false); + $field_null.prop('checked', false); if ($field.attr('multiple')) { // when the column is of type SET $field.val(data.row_info[key].split(',')); } else { @@ -599,7 +603,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function() { } field_id++; } - selectedRow = new Object(); + selectedRow = {}; selectedRow = data.row_info; }); diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 3e88eb343379..72659e053153 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -145,7 +145,7 @@ function(response) { setTimeout(perform_upload, 1000); } }); - } + }; setTimeout(perform_upload, 1000); " . htmlspecialchars($swekey_id); + $result .= "
" . htmlspecialchars($swekey_id); } unset($_SESSION['SWEKEY']['CONF_LOADED']); // reload the conf file } diff --git a/libraries/plugins/auth/swekey/swekey.php b/libraries/plugins/auth/swekey/swekey.php index 940b9a8d087b..d495d45b4fbe 100644 --- a/libraries/plugins/auth/swekey/swekey.php +++ b/libraries/plugins/auth/swekey/swekey.php @@ -416,7 +416,7 @@ function Swekey_GetFastRndToken() { $res = Swekey_GetFastHalfRndToken(); if (strlen($res) == 64) { - return substr($res, 0, 32).strtoupper(md5("Musbe Authentication Key" + mt_rand() + date(DATE_ATOM))); + return substr($res, 0, 32).strtoupper(md5("Musbe Authentication Key" . mt_rand() . date(DATE_ATOM))); } return ""; } diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 12d965bb3a01..b20498e1b7cf 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -329,7 +329,7 @@ public function showTableDashBoard() echo 'even'; } echo '">'; - $odd_row != $odd_row; + $odd_row = !$odd_row; echo ''; echo ' +

- +
diff --git a/setup/scripts.js b/setup/scripts.js index 1c31a5a7d988..fe7f0e2fa823 100644 --- a/setup/scripts.js +++ b/setup/scripts.js @@ -192,10 +192,10 @@ $(function() { return; } var el = $(this).find('input'); - if (el.attr('disabled')) { + if (el.prop('disabled')) { return; } - el.attr('checked', !el.attr('checked')); + el.prop('checked', !el.prop('checked')); }); }); diff --git a/version_check.php b/version_check.php index f44ba7beb518..522e423daf31 100644 --- a/version_check.php +++ b/version_check.php @@ -25,7 +25,7 @@ } else if (function_exists('curl_init')) { $curl_handle = curl_init($file); curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, 1); - $response = curl_exec(); + $response = curl_exec($curl_handle); } }