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('