From ce8d11c8589ebf87453de4f476f98f2d4043705c Mon Sep 17 00:00:00 2001 From: Piyush Vijay Date: Mon, 23 Jul 2018 03:32:16 +0530 Subject: [PATCH] Add todo for code that will not be used in future after revamping all the files. Signed-Off-By: Piyush Vijay --- js/common_params.php | 3 ++- js/functions.js | 2 ++ js/src/ajax.js | 3 +-- js/src/functions/navigation.js | 5 ++-- js/src/index.js | 2 +- js/src/server_databases.js | 25 +------------------ js/src/server_privileges.js | 11 +------- .../{extend_jquery.js => JqueryExtended.js} | 2 +- js/src/utils/menu_resizer.js | 1 - js/src/utils/password.js | 2 -- js/src/utils/show_ajax_messages.js | 1 - js/src/variables/common_params.js | 3 --- js/src/variables/import_variables.js | 3 --- libraries/classes/Header.php | 14 +++++------ 14 files changed, 18 insertions(+), 59 deletions(-) rename js/src/utils/{extend_jquery.js => JqueryExtended.js} (98%) diff --git a/js/common_params.php b/js/common_params.php index fd0ad3c22f..d7a5cf7c39 100644 --- a/js/common_params.php +++ b/js/common_params.php @@ -1,7 +1,8 @@ div'), db, 'database', !table); diff --git a/js/src/index.js b/js/src/index.js index 0aa76ce765..b3019a997c 100644 --- a/js/src/index.js +++ b/js/src/index.js @@ -1,6 +1,6 @@ import { AJAX } from './ajax'; import './variables/import_variables'; -import { jQuery as $ } from './utils/extend_jquery'; +import { jQuery as $ } from './utils/JqueryExtended'; import files from './consts/files'; /** diff --git a/js/src/server_databases.js b/js/src/server_databases.js index 1e10afaa33..af5c2c350f 100644 --- a/js/src/server_databases.js +++ b/js/src/server_databases.js @@ -12,22 +12,14 @@ import './variables/import_variables'; import { PMA_ajaxShowMessage } from './utils/show_ajax_messages'; import { escapeHtml } from './utils/Sanitise'; import { PMA_Messages as PMA_messages } from './variables/export_variables'; -import { jQuery as $ } from './utils/extend_jquery'; +import { jQuery as $ } from './utils/JqueryExtended'; import { AJAX } from './ajax'; import { PMA_commonParams } from './variables/common_params'; -// console.log(AJAX.test); -// console.log(PMA_messages); -// console.log(PMA_commonParams.get('server')); -// console.log(AJAX.test); -// AJAX.checkTest(); -// console.log(AJAX.test); -// console.log(a.test); /** * Unbind all event handlers before tearing down a page */ export function teardown1 () { - // console.log('firing event'); $(document).off('submit', '#dbStatsForm'); $(document).off('submit', '#create_database_form.ajax'); } @@ -157,18 +149,3 @@ export function onload1 () { }); }); } -// export default function server_databases () { -// console.log('aadd'); -// AJAX.registerTeardown('server_databases_new.js', ); -// -// /** -// * AJAX scripts for server_databases.php -// * -// * Actions ajaxified here: -// * Drop Databases -// * -// */ -// -// AJAX.registerOnload('server_databases_new.js', ); // end $() -// -// }; diff --git a/js/src/server_privileges.js b/js/src/server_privileges.js index d621008b48..8bbc69c386 100644 --- a/js/src/server_privileges.js +++ b/js/src/server_privileges.js @@ -14,12 +14,7 @@ import { checkPasswordStrength, displayPasswordGenerateButton } from './utils/pa import { PMA_Messages as PMA_messages } from './variables/export_variables'; import { PMA_ajaxShowMessage, PMA_ajaxRemoveMessage } from './utils/show_ajax_messages'; import { PMA_commonParams } from './variables/common_params'; -import { jQuery as $ } from './utils/extend_jquery'; - - -// console.log(AJAX.test); -// AJAX.test = true; -// console.log(AJAX.test); +import { jQuery as $ } from './utils/JqueryExtended'; /** * AJAX scripts for server_privileges page. @@ -36,7 +31,6 @@ import { jQuery as $ } from './utils/extend_jquery'; * @name document.ready */ -// console.log(AJAX.test); /** * Unbind all event handlers before tearing down a page */ @@ -88,7 +82,6 @@ export function onload1 () { var meter_obj_label; var username; $(document).on('keyup', '#text_pma_pw', function () { - console.log('random'); meter_obj = $('#password_strength_meter'); meter_obj_label = $('#password_strength'); username = $('input[name="username"]'); @@ -433,9 +426,7 @@ export function onload1 () { $('input.autofocus').focus(); $(checkboxes_sel).trigger('change'); - console.log('randmo1'); displayPasswordGenerateButton(); - console.log('randmo2'); if ($('#edit_user_dialog').length > 0) { addOrUpdateSubmenu(); } diff --git a/js/src/utils/extend_jquery.js b/js/src/utils/JqueryExtended.js similarity index 98% rename from js/src/utils/extend_jquery.js rename to js/src/utils/JqueryExtended.js index 8338c99cee..155abbd4eb 100644 --- a/js/src/utils/extend_jquery.js +++ b/js/src/utils/JqueryExtended.js @@ -140,7 +140,7 @@ $.fn.PMA_confirm = function (question, url, callbackFn, openCallback) { $.fn.getPostData = function () { var dataPost = this.attr('data-post'); // Strip possible leading ? - if (dataPost !== undefined && dataPost.substring(0,1) == '?') { + if (dataPost !== undefined && dataPost.substring(0,1) === '?') { dataPost = dataPost.substr(1); } return dataPost; diff --git a/js/src/utils/menu_resizer.js b/js/src/utils/menu_resizer.js index 3ffeb6a686..d09a4fc5ea 100644 --- a/js/src/utils/menu_resizer.js +++ b/js/src/utils/menu_resizer.js @@ -21,7 +21,6 @@ */ function MenuResizer ($container, widthCalculator) { var self = this; - console.log(this); self.$container = $container; self.widthCalculator = widthCalculator; var windowWidth = $(window).width(); diff --git a/js/src/utils/password.js b/js/src/utils/password.js index e15d392cc9..99293230af 100644 --- a/js/src/utils/password.js +++ b/js/src/utils/password.js @@ -52,7 +52,6 @@ export function suggestPassword (passwd_form) { * */ export function displayPasswordGenerateButton () { - console.log('random'); var generatePwdRow = $('').addClass('vmiddle'); $('').html(PMA_messages.strGeneratePassword).appendTo(generatePwdRow); var pwdCell = $('').appendTo(generatePwdRow); @@ -76,7 +75,6 @@ export function displayPasswordGenerateButton () { .appendTo(generatePwdDiv); pwdButton.clone(true).appendTo(optionsSpan); pwdTextbox.clone(true).appendTo(generatePwdDiv); - console.log($('#div_element_before_generate_password')); $('#div_element_before_generate_password').parent().append(generatePwdDiv); } diff --git a/js/src/utils/show_ajax_messages.js b/js/src/utils/show_ajax_messages.js index d536e7722a..6aeebf8dfd 100644 --- a/js/src/utils/show_ajax_messages.js +++ b/js/src/utils/show_ajax_messages.js @@ -8,7 +8,6 @@ * Module imports */ import { PMA_Messages as PMA_messages } from '../variables/export_variables'; -// import { PMA_highlightSQL } from './sql'; /** * @var int ajax_message_count Number of AJAX messages shown since page load diff --git a/js/src/variables/common_params.js b/js/src/variables/common_params.js index 46c7e20828..1446992f16 100644 --- a/js/src/variables/common_params.js +++ b/js/src/variables/common_params.js @@ -27,8 +27,6 @@ export const PMA_commonParams = (function () { var updateNavigation = false; for (var i in obj) { if (params[i] !== undefined && params[i] !== obj[i]) { - console.log('randoma5sd'); - if (i === 'db' || i === 'table') { updateNavigation = true; } @@ -39,7 +37,6 @@ export const PMA_commonParams = (function () { if (updateNavigation && $('#pma_navigation_tree').hasClass('synced') ) { - console.log('random'); PMA_showCurrentNavigation(); } }, diff --git a/js/src/variables/import_variables.js b/js/src/variables/import_variables.js index 702e2ac619..23baf33133 100644 --- a/js/src/variables/import_variables.js +++ b/js/src/variables/import_variables.js @@ -5,8 +5,6 @@ var jqueryValidations = { validationFormat: window.validateFormat, validationMessage: window.validationMessage }; -// console.log('random'); -// console.log(window.PMA_messages); Variables.setAllMessages(window.PMA_messages); Variables.setTimePickerVars({ datePicker: window.datePicker, @@ -14,7 +12,6 @@ Variables.setTimePickerVars({ }); Variables.setValidatorMessages(jqueryValidations); Variables.setGlobalVars(window.globalVars); -// console.log(Variables.getMessages()); /** * This statement to be placed in the file going to be diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 8a0e20cf40..b83a7f3219 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -164,18 +164,18 @@ class Header private function _addDefaultScripts(): void { // Localised strings - $this->_scripts->addFile('vendor/jquery/jquery.min.js');///////////////////// - $this->_scripts->addFile('vendor/jquery/jquery-migrate.js');///////////////// + $this->_scripts->addFile('vendor/jquery/jquery.min.js'); + $this->_scripts->addFile('vendor/jquery/jquery-migrate.js'); $this->_scripts->addFile('whitelist.php'); $this->_scripts->addFile('vendor/sprintf.js'); $this->_scripts->addFile('ajax.js'); $this->_scripts->addFile('keyhandler.js'); - $this->_scripts->addFile('vendor/jquery/jquery-ui.min.js');///////////////// + $this->_scripts->addFile('vendor/jquery/jquery-ui.min.js'); $this->_scripts->addFile('vendor/js.cookie.js'); - $this->_scripts->addFile('vendor/jquery/jquery.mousewheel.js');///////////// - $this->_scripts->addFile('vendor/jquery/jquery.event.drag-2.2.js');///////// - $this->_scripts->addFile('vendor/jquery/jquery.validate.js');/////////////// - $this->_scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js');//// + $this->_scripts->addFile('vendor/jquery/jquery.mousewheel.js'); + $this->_scripts->addFile('vendor/jquery/jquery.event.drag-2.2.js'); + $this->_scripts->addFile('vendor/jquery/jquery.validate.js'); + $this->_scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js'); $this->_scripts->addFile('vendor/jquery/jquery.ba-hashchange-1.3.js'); $this->_scripts->addFile('vendor/jquery/jquery.debounce-1.0.5.js'); $this->_scripts->addFile('menu_resizer.js');