From ce71901de52623d98f93decfdf63f805fb50c80f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Tue, 21 May 2019 15:37:52 -0300 Subject: [PATCH] Refactor js/functions.js to use a module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds Functions module in js/functions.js to reduce the number of global variables. Signed-off-by: Maurício Meneghini Fauth --- error_report.php | 2 +- js/ajax.js | 72 +- js/common.js | 4 +- js/config.js | 8 +- js/console.js | 16 +- js/db_central_columns.js | 14 +- js/db_multi_table_query.js | 20 +- js/db_operations.js | 42 +- js/db_qbe.js | 4 +- js/db_query_generator.js | 26 +- js/db_search.js | 24 +- js/db_structure.js | 42 +- js/db_tracking.js | 10 +- js/designer/history.js | 14 +- js/designer/move.js | 106 +-- js/designer/page.js | 2 +- js/drag_drop_import.js | 4 +- js/error_report.js | 18 +- js/export.js | 32 +- js/functions.js | 751 +++++++++--------- js/gis_data_editor.js | 10 +- js/import.js | 12 +- js/indexes.js | 46 +- js/makegrid.js | 36 +- js/menu-resizer.js | 6 +- js/microhistory.js | 4 +- js/multi_column_sort.js | 4 +- js/navigation.js | 46 +- js/normalization.js | 42 +- js/replication.js | 4 +- js/rte.js | 78 +- js/server_databases.js | 22 +- js/server_privileges.js | 56 +- js/server_status_monitor.js | 70 +- js/server_status_processes.js | 8 +- js/server_status_queries.js | 2 +- js/server_user_groups.js | 2 +- js/server_variables.js | 14 +- js/sql.js | 64 +- js/tbl_change.js | 2 +- js/tbl_chart.js | 16 +- js/tbl_find_replace.js | 6 +- js/tbl_gis_visualization.js | 2 +- js/tbl_operations.js | 84 +- js/tbl_relation.js | 20 +- js/tbl_select.js | 22 +- js/tbl_structure.js | 60 +- js/tbl_tracking.js | 12 +- js/tbl_zoom_plot_jqplot.js | 16 +- js/transformations/sql_editor.js | 2 +- js/u2f.js | 12 +- libraries/classes/ErrorHandler.php | 12 +- libraries/classes/Operations.php | 8 +- .../Plugins/Auth/AuthenticationCookie.php | 2 +- .../Abs/SQLTransformationsPlugin.php | 1 - libraries/classes/Rte/Footer.php | 2 +- libraries/classes/SqlQueryForm.php | 8 +- libraries/classes/Util.php | 2 +- templates/database/search/main.twig | 4 +- templates/display/export/select_options.twig | 4 +- templates/display/import/javascript.twig | 10 +- .../display/results/table_navigation.twig | 6 +- .../replication/master_add_slave_user.twig | 2 +- templates/sql/bookmark.twig | 2 +- templates/view_create.twig | 2 +- .../Plugins/Auth/AuthenticationCookieTest.php | 2 +- test/classes/SqlQueryFormTest.php | 2 +- 67 files changed, 1019 insertions(+), 1041 deletions(-) diff --git a/error_report.php b/error_report.php index a002c114f3..41dd12d833 100644 --- a/error_report.php +++ b/error_report.php @@ -110,7 +110,7 @@ if (isset($_POST['send_error_report']) $response->addJSON('_errSubmitMsg', $msg); } } elseif ($_POST['exception_type'] == 'php') { - $jsCode = 'PMA_ajaxShowMessage("
' + $jsCode = 'Functions.ajaxShowMessage("
' . $msg . '
", false);'; $response->getFooter()->getScripts()->addCode($jsCode); diff --git a/js/ajax.js b/js/ajax.js index f4323e1da0..0774aa2c30 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -31,7 +31,7 @@ var AJAX = { _debug: false, /** * @var object $msgbox A reference to a jQuery object that links to a message - * box that is generated by PMA_ajaxShowMessage() + * box that is generated by Functions.ajaxShowMessage() */ $msgbox: null, /** @@ -181,7 +181,7 @@ var AJAX = { // Show lock icon if locked targets is not empty. // otherwise remove lock icon if (!jQuery.isEmptyObject(AJAX.lockedTargets)) { - $('#lock_page_icon').html(PMA_getImage('s_lock', Messages.strLockToolTip).toString()); + $('#lock_page_icon').html(Functions.getImage('s_lock', Messages.strLockToolTip).toString()); } else { $('#lock_page_icon').html(''); } @@ -201,7 +201,7 @@ var AJAX = { // Remove duplicate wrapper // TODO: don't send it in the response .children().first().remove(); - $('#topmenu').menuResizer(PMA_mainMenuResizerCallback); + $('#topmenu').menuResizer(Functions.mainMenuResizerCallback); } }, /** @@ -270,7 +270,7 @@ var AJAX = { AJAX.xhr.abort(); if (AJAX.xhr.status === 0 && AJAX.xhr.statusText === 'abort') { // If aborted - AJAX.$msgbox = PMA_ajaxShowMessage(Messages.strAbortedRequest); + AJAX.$msgbox = Functions.ajaxShowMessage(Messages.strAbortedRequest); AJAX.active = false; AJAX.xhr = null; previousLinkAborted = true; @@ -309,7 +309,7 @@ var AJAX = { if (isLink) { AJAX.active = true; - AJAX.$msgbox = PMA_ajaxShowMessage(); + AJAX.$msgbox = Functions.ajaxShowMessage(); // Save reference for the new link request AJAX.xhr = $.get(url, params, AJAX.responseHandler); if (history && history.pushState) { @@ -335,7 +335,7 @@ var AJAX = { // or if it returns a value that evaluates to true if (typeof onsubmit !== 'function' || onsubmit.apply(this, [event])) { AJAX.active = true; - AJAX.$msgbox = PMA_ajaxShowMessage(); + AJAX.$msgbox = Functions.ajaxShowMessage(); if ($(this).attr('id') === 'login_form') { $.post(url, params, AJAX.loginResponseHandler); } else { @@ -358,7 +358,7 @@ var AJAX = { if (typeof data === 'undefined' || data === null) { return; } - PMA_ajaxRemoveMessage(AJAX.$msgbox); + Functions.ajaxRemoveMessage(AJAX.$msgbox); CommonParams.set('token', data.new_token); @@ -366,7 +366,7 @@ var AJAX = { if (data._displayMessage) { $('#page_content').prepend(data._displayMessage); - PMA_highlightSQL($('#page_content')); + Functions.highlightSql($('#page_content')); } $('#pma_errors').remove(); @@ -382,11 +382,11 @@ var AJAX = { // bind for php error reporting forms (bottom) $('#pma_ignore_errors_bottom').on('click', function (e) { e.preventDefault(); - PMA_ignorePhpErrors(); + Functions.ignorePhpErrors(); }); $('#pma_ignore_all_errors_bottom').on('click', function (e) { e.preventDefault(); - PMA_ignorePhpErrors(false); + Functions.ignorePhpErrors(false); }); // In case of 'sendErrorReport'='always' // submit the hidden error reporting form. @@ -394,7 +394,7 @@ var AJAX = { data._stopErrorReportLoop !== '1' ) { $('#pma_report_errors_form').submit(); - PMA_ajaxShowMessage(Messages.phpErrorsBeingSubmitted, false); + Functions.ajaxShowMessage(Messages.phpErrorsBeingSubmitted, false); $('html, body').animate({ scrollTop:$(document).height() }, 'slow'); } else if (data._promptPhpErrors) { // otherwise just prompt user if it is set so. @@ -404,20 +404,20 @@ var AJAX = { } } - PMA_ajaxShowMessage(msg, false); + Functions.ajaxShowMessage(msg, false); // bind for php error reporting forms (popup) $('#pma_ignore_errors_popup').on('click', function () { - PMA_ignorePhpErrors(); + Functions.ignorePhpErrors(); }); $('#pma_ignore_all_errors_popup').on('click', function () { - PMA_ignorePhpErrors(false); + Functions.ignorePhpErrors(false); }); if (typeof data.success !== 'undefined' && data.success) { // reload page if user trying to login has changed if (CommonParams.get('user') !== data._params.user) { window.location = 'index.php'; - PMA_ajaxShowMessage(Messages.strLoading, false); + Functions.ajaxShowMessage(Messages.strLoading, false); AJAX.active = false; AJAX.xhr = null; return; @@ -437,10 +437,10 @@ var AJAX = { } else if (typeof data.logged_in !== 'undefined' && data.logged_in === 0) { $('#modalOverlay').replaceWith(data.error); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); AJAX.active = false; AJAX.xhr = null; - PMA_handleRedirectAndReload(data); + Functions.handleRedirectAndReload(data); if (data.fieldWithError) { $(':input.error').removeClass('error'); $('#' + data.fieldWithError).addClass('error'); @@ -466,10 +466,10 @@ var AJAX = { } if (typeof data.success !== 'undefined' && data.success) { $('html, body').animate({ scrollTop: 0 }, 'fast'); - PMA_ajaxRemoveMessage(AJAX.$msgbox); + Functions.ajaxRemoveMessage(AJAX.$msgbox); if (data._redirect) { - PMA_ajaxShowMessage(data._redirect, false); + Functions.ajaxShowMessage(data._redirect, false); AJAX.active = false; AJAX.xhr = null; return; @@ -524,8 +524,8 @@ var AJAX = { $('#page_content').replaceWith( '
' + data.message + '
' ); - PMA_highlightSQL($('#page_content')); - checkNumberOfFields(); + Functions.highlightSql($('#page_content')); + Functions.checkNumberOfFields(); } if (data._selflink) { @@ -561,7 +561,7 @@ var AJAX = { } if (data._displayMessage) { $('#page_content').prepend(data._displayMessage); - PMA_highlightSQL($('#page_content')); + Functions.highlightSql($('#page_content')); } $('#pma_errors').remove(); @@ -577,11 +577,11 @@ var AJAX = { // bind for php error reporting forms (bottom) $('#pma_ignore_errors_bottom').on('click', function (e) { e.preventDefault(); - PMA_ignorePhpErrors(); + Functions.ignorePhpErrors(); }); $('#pma_ignore_all_errors_bottom').on('click', function (e) { e.preventDefault(); - PMA_ignorePhpErrors(false); + Functions.ignorePhpErrors(false); }); // In case of 'sendErrorReport'='always' // submit the hidden error reporting form. @@ -589,7 +589,7 @@ var AJAX = { data._stopErrorReportLoop !== '1' ) { $('#pma_report_errors_form').submit(); - PMA_ajaxShowMessage(Messages.phpErrorsBeingSubmitted, false); + Functions.ajaxShowMessage(Messages.phpErrorsBeingSubmitted, false); $('html, body').animate({ scrollTop:$(document).height() }, 'slow'); } else if (data._promptPhpErrors) { // otherwise just prompt user if it is set so. @@ -598,13 +598,13 @@ var AJAX = { $('html, body').animate({ scrollTop:$(document).height() }, 'slow'); } } - PMA_ajaxShowMessage(msg, false); + Functions.ajaxShowMessage(msg, false); // bind for php error reporting forms (popup) $('#pma_ignore_errors_popup').on('click', function () { - PMA_ignorePhpErrors(); + Functions.ignorePhpErrors(); }); $('#pma_ignore_all_errors_popup').on('click', function () { - PMA_ignorePhpErrors(false); + Functions.ignorePhpErrors(false); }); if (typeof AJAX._callback === 'function') { @@ -613,8 +613,8 @@ var AJAX = { AJAX._callback = function () {}; }); } else { - PMA_ajaxShowMessage(data.error, false); - PMA_ajaxRemoveMessage(AJAX.$msgbox); + Functions.ajaxShowMessage(data.error, false); + Functions.ajaxRemoveMessage(AJAX.$msgbox); $ajaxError = $('
'); $ajaxError.attr({ 'id': 'ajaxError' }); $('#page_content').append($ajaxError); @@ -622,7 +622,7 @@ var AJAX = { $('html, body').animate({ scrollTop: $(document).height() }, 200); AJAX.active = false; AJAX.xhr = null; - PMA_handleRedirectAndReload(data); + Functions.handleRedirectAndReload(data); if (data.fieldWithError) { $(':input.error').removeClass('error'); $('#' + data.fieldWithError).addClass('error'); @@ -877,7 +877,7 @@ $(function () { } var state = event.originalEvent.state; if (state && state.menu) { - AJAX.$msgbox = PMA_ajaxShowMessage(); + AJAX.$msgbox = Functions.ajaxShowMessage(); var params = 'ajax_request=true' + CommonParams.get('arg_separator') + 'ajax_page_request=true'; var url = state.url || location.href; $.get(url, params, AJAX.responseHandler); @@ -935,13 +935,13 @@ $(document).ajaxError(function (event, request, settings) { var state = request.state(); if (request.status !== 0) { - details += '
' + escapeHtml(PMA_sprintf(Messages.strErrorCode, request.status)) + '
'; + details += '
' + Functions.escapeHtml(Functions.sprintf(Messages.strErrorCode, request.status)) + '
'; } - details += '
' + escapeHtml(PMA_sprintf(Messages.strErrorText, request.statusText + ' (' + state + ')')) + '
'; + details += '
' + Functions.escapeHtml(Functions.sprintf(Messages.strErrorText, request.statusText + ' (' + state + ')')) + '
'; if (state === 'rejected' || state === 'timeout') { - details += '
' + escapeHtml(Messages.strErrorConnection) + '
'; + details += '
' + Functions.escapeHtml(Messages.strErrorConnection) + '
'; } - PMA_ajaxShowMessage( + Functions.ajaxShowMessage( '
' + Messages.strErrorProcessingRequest + details + diff --git a/js/common.js b/js/common.js index d73c439c34..e500408228 100644 --- a/js/common.js +++ b/js/common.js @@ -1,7 +1,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ $(function () { - checkNumberOfFields(); + Functions.checkNumberOfFields(); }); /** @@ -90,7 +90,7 @@ var CommonParams = (function () { if (common.length > 0) { separator = argsep; } - return PMA_sprintf( + return Functions.sprintf( '%s%sserver=%s' + argsep + 'db=%s' + argsep + 'table=%s', this.get('common_query'), separator, diff --git a/js/config.js b/js/config.js index f0ed7a071e..0a4f385a7e 100644 --- a/js/config.js +++ b/js/config.js @@ -22,7 +22,7 @@ function isStorageSupported (type, warn) { } catch (error) { // Not supported if (warn) { - PMA_ajaxShowMessage(Messages.strNoLocalStorage, false); + Functions.ajaxShowMessage(Messages.strNoLocalStorage, false); } } return false; @@ -303,7 +303,7 @@ var validators = { if (isNaN(val)) { return true; } - return val <= max_value ? true : PMA_sprintf(Messages.error_value_lte, max_value); + return val <= max_value ? true : Functions.sprintf(Messages.error_value_lte, max_value); }, // field validators _field: { @@ -825,7 +825,7 @@ function savePrefsToLocalStorage (form) { $form.hide('fast'); $form.prev('.click-hide-message').show('fast'); } else { - PMA_ajaxShowMessage(data.error); + Functions.ajaxShowMessage(data.error); } }, complete: function () { @@ -841,7 +841,7 @@ function updatePrefsDate () { var d = new Date(window.localStorage.config_mtime_local); var msg = Messages.strSavedOn.replace( '@DATE@', - PMA_formatDateTime(d) + Functions.formatDateTime(d) ); $('#opts_import_local_storage').find('div.localStorage-exists').html(msg); } diff --git a/js/console.js b/js/console.js index cacc600c41..2d52a1269e 100644 --- a/js/console.js +++ b/js/console.js @@ -60,7 +60,7 @@ var PMA_console = { return; } - PMA_console.config = configGet('Console', false); + PMA_console.config = Functions.configGet('Console', false); PMA_console.isEnabled = true; @@ -232,7 +232,7 @@ var PMA_console = { if (options && options.profiling === true) { PMA_console.$requestForm.append(''); } - if (! confirmQuery(PMA_console.$requestForm[0], PMA_console.$requestForm.children('textarea')[0].value)) { + if (! Functions.confirmQuery(PMA_console.$requestForm[0], PMA_console.$requestForm.children('textarea')[0].value)) { return; } PMA_console.$requestForm.children('[name=console_message_id]') @@ -399,7 +399,7 @@ var PMA_console = { }, setConfig: function (key, value) { PMA_console.config[key] = value; - configSet('Console/' + key, value); + Functions.configSet('Console/' + key, value); }, isSelect: function (queryString) { var reg_exp = /^SELECT\s+/i; @@ -534,7 +534,7 @@ var PMA_consoleInput = { 'async': true, } }); - PMA_consoleInput._inputs.console.on('inputRead', codemirrorAutocompleteOnInputRead); + PMA_consoleInput._inputs.console.on('inputRead', Functions.codeMirrorAutoCompleteOnInputRead); PMA_consoleInput._inputs.console.on('keydown', function (instance, event) { PMA_consoleInput._historyNavigate(event); }); @@ -551,7 +551,7 @@ var PMA_consoleInput = { 'async': true, } }); - PMA_consoleInput._inputs.bookmark.on('inputRead', codemirrorAutocompleteOnInputRead); + PMA_consoleInput._inputs.bookmark.on('inputRead', Functions.codeMirrorAutoCompleteOnInputRead); } } else { PMA_consoleInput._inputs.console = @@ -1205,7 +1205,7 @@ PMA_consoleDebug = { .append( $('
') .text( - PMA_sprintf( + Functions.sprintf( Messages.strConsoleDebugArgsSummary, dbgStep.args.length ) @@ -1216,7 +1216,7 @@ PMA_consoleDebug = { $('
') .html( '
' +
-                        escapeHtml(JSON.stringify(dbgStep.args[i], null, '  ')) +
+                        Functions.escapeHtml(JSON.stringify(dbgStep.args[i], null, '  ')) +
                         '
' ) ); @@ -1418,7 +1418,7 @@ PMA_consoleDebug = { // Show summary $('#debug_console').find('.debug>.welcome').append( $('').text( - PMA_sprintf( + Functions.sprintf( Messages.strConsoleDebugSummary, totalUnique, totalExec, diff --git a/js/db_central_columns.js b/js/db_central_columns.js index 6ba3ad0dcb..3653ee86ff 100644 --- a/js/db_central_columns.js +++ b/js/db_central_columns.js @@ -50,10 +50,10 @@ AJAX.registerOnload('db_central_columns.js', function () { event.preventDefault(); var multi_delete_columns = $('.checkall:checkbox:checked').serialize(); if (multi_delete_columns === '') { - PMA_ajaxShowMessage(Messages.strRadioUnchecked); + Functions.ajaxShowMessage(Messages.strRadioUnchecked); return false; } - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); $('#del_col_name').val(multi_delete_columns); $('#del_form').submit(); }); @@ -61,12 +61,12 @@ AJAX.registerOnload('db_central_columns.js', function () { event.preventDefault(); var editColumnList = $('.checkall:checkbox:checked').serialize(); if (editColumnList === '') { - PMA_ajaxShowMessage(Messages.strRadioUnchecked); + Functions.ajaxShowMessage(Messages.strRadioUnchecked); return false; } var argsep = CommonParams.get('arg_separator'); var editColumnData = editColumnList + '' + argsep + 'edit_central_columns_page=true' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'db=' + encodeURIComponent(CommonParams.get('db')); - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $(this); $.post('db_central_columns.php', editColumnData, AJAX.responseHandler); }); @@ -75,7 +75,7 @@ AJAX.registerOnload('db_central_columns.js', function () { event.stopPropagation(); var argsep = CommonParams.get('arg_separator'); var multi_column_edit_data = $('#multi_edit_central_columns').serialize() + argsep + 'multi_edit_central_column_save=true' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'db=' + encodeURIComponent(CommonParams.get('db')); - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $(this); $.post('db_central_columns.php', multi_column_edit_data, AJAX.responseHandler); }); @@ -158,7 +158,7 @@ AJAX.registerOnload('db_central_columns.js', function () { dataType: 'json', success: function (data) { if (data.message !== '1') { - PMA_ajaxShowMessage( + Functions.ajaxShowMessage( '
' + data.message + '
', @@ -182,7 +182,7 @@ AJAX.registerOnload('db_central_columns.js', function () { $('#tableslistcontainer').find('.checkall').show(); }, error: function () { - PMA_ajaxShowMessage( + Functions.ajaxShowMessage( '
' + Messages.strErrorProcessingRequest + '
', diff --git a/js/db_multi_table_query.js b/js/db_multi_table_query.js index d20cec5a33..4bc605a3c3 100644 --- a/js/db_multi_table_query.js +++ b/js/db_multi_table_query.js @@ -26,12 +26,12 @@ AJAX.registerTeardown('db_multi_table_query.js', function () { }); AJAX.registerOnload('db_multi_table_query.js', function () { - var editor = PMA_getSQLEditor($('#MultiSqlquery'), {}, 'both'); + var editor = Functions.getSqlEditor($('#MultiSqlquery'), {}, 'both'); $('.CodeMirror-line').css('text-align', 'left'); editor.setSize(-1, 50); var column_count = 3; - PMA_init_slider(); + Functions.initSlider(); addNewColumnCallbacks(); $('#update_query_button').on('click', function () { @@ -61,7 +61,7 @@ AJAX.registerOnload('db_multi_table_query.js', function () { } }); if (Object.keys(tableAliases).length === 0) { - PMA_ajaxShowMessage('Nothing selected', false, 'error'); + Functions.ajaxShowMessage('Nothing selected', false, 'error'); return; } @@ -82,24 +82,24 @@ AJAX.registerOnload('db_multi_table_query.js', function () { } }); - query = 'SELECT ' + '`' + escapeBacktick(columns[0][0]) + '`.'; + query = 'SELECT ' + '`' + Functions.escapeBacktick(columns[0][0]) + '`.'; if (columns[0][1] === '*') { query += '*'; } else { - query += '`' + escapeBacktick(columns[0][1]) + '`'; + query += '`' + Functions.escapeBacktick(columns[0][1]) + '`'; } if (columns[0][2] !== '') { query += ' AS ' + columns[0][2]; } for (var i = 1; i < columns.length; i++) { - query += ', `' + escapeBacktick(columns[i][0]) + '`.'; + query += ', `' + Functions.escapeBacktick(columns[i][0]) + '`.'; if (columns[i][1] === '*') { query += '*'; } else { - query += '`' + escapeBacktick(columns[i][1]) + '`'; + query += '`' + Functions.escapeBacktick(columns[i][1]) + '`'; } if (columns[i][2] !== '') { - query += ' AS `' + escapeBacktick(columns[0][2]) + '`'; + query += ' AS `' + Functions.escapeBacktick(columns[0][2]) + '`'; } } query += '\nFROM '; @@ -120,7 +120,7 @@ AJAX.registerOnload('db_multi_table_query.js', function () { var query = editor.getDoc().getValue(); // Verifying that the query is not empty if (query === '') { - PMA_ajaxShowMessage(Messages.strEmptyQuery, false, 'error'); + Functions.ajaxShowMessage(Messages.strEmptyQuery, false, 'error'); return; } var data = { @@ -159,7 +159,7 @@ AJAX.registerOnload('db_multi_table_query.js', function () { $new_column_dom.find('.pma_auto_slider').first().unwrap(); $new_column_dom.find('.pma_auto_slider').first().attr('title', 'criteria'); $('#add_column_button').parent().before($new_column_dom); - PMA_init_slider(); + Functions.initSlider(); addNewColumnCallbacks(); }); diff --git a/js/db_operations.js b/js/db_operations.js index e6690be070..2b952d0f4b 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -40,21 +40,21 @@ AJAX.registerOnload('db_operations.js', function () { var new_db_name = $('#new_db_name').val(); if (new_db_name === old_db_name) { - PMA_ajaxShowMessage(Messages.strDatabaseRenameToSameName, false, 'error'); + Functions.ajaxShowMessage(Messages.strDatabaseRenameToSameName, false, 'error'); return false; } var $form = $(this); - var question = escapeHtml('CREATE DATABASE ' + new_db_name + ' / DROP DATABASE ' + old_db_name); + var question = Functions.escapeHtml('CREATE DATABASE ' + new_db_name + ' / DROP DATABASE ' + old_db_name); - PMA_prepareForAjaxRequest($form); + Functions.prepareForAjaxRequest($form); $form.PMA_confirm(question, $form.attr('action'), function (url) { - PMA_ajaxShowMessage(Messages.strRenamingDatabases, false); + Functions.ajaxShowMessage(Messages.strRenamingDatabases, false); $.post(url, $('#rename_db_form').serialize() + CommonParams.get('arg_separator') + 'is_js_confirmed=1', function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); CommonParams.set('db', data.newname); PMA_reloadNavigation(function () { @@ -70,7 +70,7 @@ AJAX.registerOnload('db_operations.js', function () { }); }); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() }); @@ -81,9 +81,9 @@ AJAX.registerOnload('db_operations.js', function () { */ $(document).on('submit', '#copy_db_form.ajax', function (event) { event.preventDefault(); - PMA_ajaxShowMessage(Messages.strCopyingDatabase, false); + Functions.ajaxShowMessage(Messages.strCopyingDatabase, false); var $form = $(this); - PMA_prepareForAjaxRequest($form); + Functions.prepareForAjaxRequest($form); $.post($form.attr('action'), $form.serialize(), function (data) { // use messages that stay on screen $('div.success, div.error').fadeOut(); @@ -91,15 +91,15 @@ AJAX.registerOnload('db_operations.js', function () { if ($('#checkbox_switch').is(':checked')) { CommonParams.set('db', data.newname); CommonActions.refreshMain(false, function () { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); }); } else { CommonParams.set('db', data.db); - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); } PMA_reloadNavigation(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() }); // end copy database @@ -118,13 +118,13 @@ AJAX.registerOnload('db_operations.js', function () { $(document).on('submit', '#change_db_charset_form.ajax', function (event) { event.preventDefault(); var $form = $(this); - PMA_prepareForAjaxRequest($form); - PMA_ajaxShowMessage(Messages.strChangingCharset); + Functions.prepareForAjaxRequest($form); + Functions.ajaxShowMessage(Messages.strChangingCharset); $.post($form.attr('action'), $form.serialize() + CommonParams.get('arg_separator') + 'submitcollation=1', function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() }); // end change charset @@ -139,14 +139,14 @@ AJAX.registerOnload('db_operations.js', function () { * @var question String containing the question to be asked for confirmation */ var question = Messages.strDropDatabaseStrongWarning + ' '; - question += PMA_sprintf( + question += Functions.sprintf( Messages.strDoYouReally, - 'DROP DATABASE `' + escapeHtml(CommonParams.get('db') + '`') + 'DROP DATABASE `' + Functions.escapeHtml(CommonParams.get('db') + '`') ); - var params = getJSConfirmCommonParam(this, $link.getPostData()); + var params = Functions.getJsConfirmCommonParam(this, $link.getPostData()); $(this).PMA_confirm(question, $(this).attr('href'), function (url) { - PMA_ajaxShowMessage(Messages.strProcessingRequest); + Functions.ajaxShowMessage(Messages.strProcessingRequest); $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success) { // Database deleted successfully, refresh both the frames @@ -155,11 +155,11 @@ AJAX.registerOnload('db_operations.js', function () { CommonActions.refreshMain( 'server_databases.php', function () { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); } ); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); }); diff --git a/js/db_qbe.js b/js/db_qbe.js index 1371a46d0d..680ceb78f8 100644 --- a/js/db_qbe.js +++ b/js/db_qbe.js @@ -28,7 +28,7 @@ AJAX.registerTeardown('db_qbe.js', function () { }); AJAX.registerOnload('db_qbe.js', function () { - PMA_getSQLEditor($('#textSqlquery'), {}, 'both'); + Functions.getSqlEditor($('#textSqlquery'), {}, 'both'); /** * Ajax handler to check the corresponding 'show' checkbox when column is selected @@ -66,7 +66,7 @@ AJAX.registerOnload('db_qbe.js', function () { * Ajax event handlers for 'Delete bookmark' */ $(document).on('click', '#deleteSearch', function (event) { - var question = PMA_sprintf(Messages.strConfirmDeleteQBESearch, $('#searchId').find('option:selected').text()); + var question = Functions.sprintf(Messages.strConfirmDeleteQBESearch, $('#searchId').find('option:selected').text()); if (!confirm(question)) { return false; } diff --git a/js/db_query_generator.js b/js/db_query_generator.js index 565ca39556..fbc1889060 100644 --- a/js/db_query_generator.js +++ b/js/db_query_generator.js @@ -31,15 +31,15 @@ function getFormatsText () { } function generateCondition (criteriaDiv, table) { - query = '`' + escapeBacktick(table.val()) + '`.'; - query += '`' + escapeBacktick(table.siblings('.columnNameSelect').first().val()) + '`'; + query = '`' + Functions.escapeBacktick(table.val()) + '`.'; + query += '`' + Functions.escapeBacktick(table.siblings('.columnNameSelect').first().val()) + '`'; if (criteriaDiv.find('.criteria_rhs').first().val() === 'text') { formatsText = getFormatsText(); - query += sprintf(formatsText[criteriaDiv.find('.criteria_op').first().val()], escapeSingleQuote(criteriaDiv.find('.rhs_text_val').first().val())); + query += sprintf(formatsText[criteriaDiv.find('.criteria_op').first().val()], Functions.escapeSingleQuote(criteriaDiv.find('.rhs_text_val').first().val())); } else { query += ' ' + criteriaDiv.find('.criteria_op').first().val(); - query += ' `' + escapeBacktick(criteriaDiv.find('.tableNameSelect').first().val()) + '`.'; - query += '`' + escapeBacktick(criteriaDiv.find('.columnNameSelect').first().val()) + '`'; + query += ' `' + Functions.escapeBacktick(criteriaDiv.find('.tableNameSelect').first().val()) + '`.'; + query += '`' + Functions.escapeBacktick(criteriaDiv.find('.columnNameSelect').first().val()) + '`'; } return query; } @@ -67,18 +67,18 @@ function generateWhereBlock () { function generateJoin (newTable, tableAliases, fk) { query = ''; - query += ' \n\tLEFT JOIN ' + '`' + escapeBacktick(newTable) + '`'; + query += ' \n\tLEFT JOIN ' + '`' + Functions.escapeBacktick(newTable) + '`'; if (tableAliases[fk.TABLE_NAME][0] !== '') { - query += ' AS `' + escapeBacktick(tableAliases[newTable][0]) + '`'; - query += ' ON `' + escapeBacktick(tableAliases[fk.TABLE_NAME][0]) + '`'; + query += ' AS `' + Functions.escapeBacktick(tableAliases[newTable][0]) + '`'; + query += ' ON `' + Functions.escapeBacktick(tableAliases[fk.TABLE_NAME][0]) + '`'; } else { - query += ' ON `' + escapeBacktick(fk.TABLE_NAME) + '`'; + query += ' ON `' + Functions.escapeBacktick(fk.TABLE_NAME) + '`'; } query += '.`' + fk.COLUMN_NAME + '`'; if (tableAliases[fk.REFERENCED_TABLE_NAME][0] !== '') { - query += ' = `' + escapeBacktick(tableAliases[fk.REFERENCED_TABLE_NAME][0]) + '`'; + query += ' = `' + Functions.escapeBacktick(tableAliases[fk.REFERENCED_TABLE_NAME][0]) + '`'; } else { - query += ' = `' + escapeBacktick(fk.REFERENCED_TABLE_NAME) + '`'; + query += ' = `' + Functions.escapeBacktick(fk.REFERENCED_TABLE_NAME) + '`'; } query += '.`' + fk.REFERENCED_COLUMN_NAME + '`'; return query; @@ -106,9 +106,9 @@ function appendTable (table, tableAliases, usedTables, foreignKeys) { if (usedTables.length > 0) { query += '\n\t, '; } - query += '`' + escapeBacktick(table) + '`'; + query += '`' + Functions.escapeBacktick(table) + '`'; if (tableAliases[table][0] !== '') { - query += ' AS `' + escapeBacktick(tableAliases[table][0]) + '`'; + query += ' AS `' + Functions.escapeBacktick(tableAliases[table][0]) + '`'; } } usedTables.push(table); diff --git a/js/db_search.js b/js/db_search.js index 5fc8873021..c914c4c62e 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -30,7 +30,7 @@ AJAX.registerTeardown('db_search.js', function () { AJAX.registerOnload('db_search.js', function () { /** Hide the table link in the initial search result */ - var icon = PMA_getImage('s_tbl', '', { 'id': 'table-image' }).toString(); + var icon = Functions.getImage('s_tbl', '', { 'id': 'table-image' }).toString(); $('#table-info').prepend(icon).hide(); /** Hide the browse and deleted results in the new search criteria */ @@ -116,7 +116,7 @@ AJAX.registerOnload('db_search.js', function () { $(document).on('click', 'a.browse_results', function (e) { e.preventDefault(); /** Hides the results shown by the delete criteria */ - var $msg = PMA_ajaxShowMessage(Messages.strBrowsing, false); + var $msg = Functions.ajaxShowMessage(Messages.strBrowsing, false); $('#sqlqueryform').hide(); $('#togglequerybox').hide(); /** Load the browse results to the page */ @@ -134,18 +134,18 @@ AJAX.registerOnload('db_search.js', function () { $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success) { $('#browse-results').html(data.message); - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); $('.table_results').each(function () { PMA_makegrid(this, true, true, true, true); }); $('#browse-results').show(); - PMA_highlightSQL($('#browse-results')); + Functions.highlightSql($('#browse-results')); $('html, body') .animate({ scrollTop: $('#browse-results').offset().top }, 1000); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); }); @@ -160,12 +160,12 @@ AJAX.registerOnload('db_search.js', function () { $('#sqlqueryform').hide(); $('#togglequerybox').hide(); /** Conformation message for deletion */ - var msg = PMA_sprintf( + var msg = Functions.sprintf( Messages.strConfirmDeleteResults, $(this).data('table-name') ); if (confirm(msg)) { - var $msg = PMA_ajaxShowMessage(Messages.strDeleting, false); + var $msg = Functions.ajaxShowMessage(Messages.strDeleting, false); /** Load the deleted option to the page*/ $('#sqlqueryform').html(''); var params = { @@ -177,7 +177,7 @@ AJAX.registerOnload('db_search.js', function () { $.post(url, params, function (data) { if (typeof data === 'undefined' || !data.success) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); return; } @@ -193,7 +193,7 @@ AJAX.registerOnload('db_search.js', function () { .animate({ scrollTop: $('#browse-results').offset().top }, 1000); - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); }); } }); @@ -204,11 +204,11 @@ AJAX.registerOnload('db_search.js', function () { $(document).on('submit', '#db_search_form.ajax', function (event) { event.preventDefault(); - var $msgbox = PMA_ajaxShowMessage(Messages.strSearching, false); + var $msgbox = Functions.ajaxShowMessage(Messages.strSearching, false); // jQuery object to reuse var $form = $(this); - PMA_prepareForAjaxRequest($form); + Functions.prepareForAjaxRequest($form); var url = $form.serialize() + CommonParams.get('arg_separator') + 'submit_search=' + $('#buttonGo').val(); $.post($form.attr('action'), url, function (data) { @@ -240,7 +240,7 @@ AJAX.registerOnload('db_search.js', function () { $('#searchresults').html(data.error).show(); } - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); }); }); }); // end $() diff --git a/js/db_structure.js b/js/db_structure.js index 664dc6ad69..cd9d5c21a2 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -128,7 +128,7 @@ function PMA_adjustTotals () { // Update summary with new data var $summary = $('#tbl_summary_row'); - $summary.find('.tbl_num').text(PMA_sprintf(Messages.strNTables, tableSum)); + $summary.find('.tbl_num').text(Functions.sprintf(Messages.strNTables, tableSum)); if (rowSumApproximated) { $summary.find('.row_count_sum').text(strRowSum); } else { @@ -174,11 +174,11 @@ function PMA_fetchRealRowCount ($target) { // Adjust the 'Sum' displayed at the bottom. PMA_adjustTotals(); } else { - PMA_ajaxShowMessage(Messages.strErrorRealRowCount); + Functions.ajaxShowMessage(Messages.strErrorRealRowCount); } }, error: function () { - PMA_ajaxShowMessage(Messages.strErrorRealRowCount); + Functions.ajaxShowMessage(Messages.strErrorRealRowCount); } }); } @@ -292,17 +292,17 @@ AJAX.registerOnload('db_structure.js', function () { * @var question String containing the question to be asked for confirmation */ var question = Messages.strTruncateTableStrongWarning + ' ' + - PMA_sprintf(Messages.strDoYouReally, 'TRUNCATE `' + escapeHtml(curr_table_name) + '`') + - getForeignKeyCheckboxLoader(); + Functions.sprintf(Messages.strDoYouReally, 'TRUNCATE `' + Functions.escapeHtml(curr_table_name) + '`') + + Functions.getForeignKeyCheckboxLoader(); $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function (url) { - PMA_ajaxShowMessage(Messages.strProcessingRequest); + Functions.ajaxShowMessage(Messages.strProcessingRequest); - var params = getJSConfirmCommonParam(this, $this_anchor.getPostData()); + var params = Functions.getJsConfirmCommonParam(this, $this_anchor.getPostData()); $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); // Adjust table statistics var $tr = $this_anchor.closest('tr'); $tr.find('.tbl_rows').text('0'); @@ -317,10 +317,10 @@ AJAX.registerOnload('db_structure.js', function () { .removeClass('truncate_table_anchor'); PMA_adjustTotals(); } else { - PMA_ajaxShowMessage(Messages.strErrorProcessingRequest + ' : ' + data.error, false); + Functions.ajaxShowMessage(Messages.strErrorProcessingRequest + ' : ' + data.error, false); } }); // end $.post() - }, loadForeignKeyCheckbox); // end $.PMA_confirm() + }, Functions.loadForeignKeyCheckbox); // end $.PMA_confirm() }); // end of Truncate Table Ajax action /** @@ -350,30 +350,30 @@ AJAX.registerOnload('db_structure.js', function () { var question; if (! is_view) { question = Messages.strDropTableStrongWarning + ' ' + - PMA_sprintf(Messages.strDoYouReally, 'DROP TABLE `' + escapeHtml(curr_table_name) + '`'); + Functions.sprintf(Messages.strDoYouReally, 'DROP TABLE `' + Functions.escapeHtml(curr_table_name) + '`'); } else { question = - PMA_sprintf(Messages.strDoYouReally, 'DROP VIEW `' + escapeHtml(curr_table_name) + '`'); + Functions.sprintf(Messages.strDoYouReally, 'DROP VIEW `' + Functions.escapeHtml(curr_table_name) + '`'); } - question += getForeignKeyCheckboxLoader(); + question += Functions.getForeignKeyCheckboxLoader(); $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function (url) { - var $msg = PMA_ajaxShowMessage(Messages.strProcessingRequest); + var $msg = Functions.ajaxShowMessage(Messages.strProcessingRequest); - var params = getJSConfirmCommonParam(this, $this_anchor.getPostData()); + var params = Functions.getJsConfirmCommonParam(this, $this_anchor.getPostData()); $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); $curr_row.hide('medium').remove(); PMA_adjustTotals(); PMA_reloadNavigation(); - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); } else { - PMA_ajaxShowMessage(Messages.strErrorProcessingRequest + ' : ' + data.error, false); + Functions.ajaxShowMessage(Messages.strErrorProcessingRequest + ' : ' + data.error, false); } }); // end $.post() - }, loadForeignKeyCheckbox); // end $.PMA_confirm() + }, Functions.loadForeignKeyCheckbox); // end $.PMA_confirm() }); // end of Drop Table Ajax action /** @@ -383,7 +383,7 @@ AJAX.registerOnload('db_structure.js', function () { event.preventDefault(); // Take to preview mode - printPreview(); + Functions.printPreview(); }); // end of Print View action // Calculate Real End for InnoDB @@ -407,7 +407,7 @@ AJAX.registerOnload('db_structure.js', function () { // Add tooltip to favorite icons. $('.favorite_table_anchor').each(function () { - PMA_tooltip( + Functions.tooltip( $(this), 'a', $(this).attr('title') diff --git a/js/db_tracking.js b/js/db_tracking.js index c6537d1376..d9ab32385c 100644 --- a/js/db_tracking.js +++ b/js/db_tracking.js @@ -49,12 +49,12 @@ AJAX.registerOnload('db_tracking.js', function () { if ($button.val() === 'delete_tracking') { var question = Messages.strDeleteTrackingDataMultiple; $button.PMA_confirm(question, $form.attr('action'), function (url) { - PMA_ajaxShowMessage(Messages.strDeletingTrackingData); + Functions.ajaxShowMessage(Messages.strDeletingTrackingData); AJAX.source = $form; $.post(url, submitData, AJAX.responseHandler); }); } else { - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); } @@ -69,7 +69,7 @@ AJAX.registerOnload('db_tracking.js', function () { var $form = $button.parent('form'); var argsep = CommonParams.get('arg_separator'); var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + $button.val(); - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); }); @@ -82,10 +82,10 @@ AJAX.registerOnload('db_tracking.js', function () { var $anchor = $(this); var question = Messages.strDeleteTrackingData; $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) { - PMA_ajaxShowMessage(Messages.strDeletingTrackingData); + Functions.ajaxShowMessage(Messages.strDeletingTrackingData); AJAX.source = $anchor; var argSep = CommonParams.get('arg_separator'); - var params = getJSConfirmCommonParam(this, $anchor.getPostData()); + var params = Functions.getJsConfirmCommonParam(this, $anchor.getPostData()); params += argSep + 'ajax_page_request=1'; $.post(url, params, AJAX.responseHandler); }); diff --git a/js/designer/history.js b/js/designer/history.js index 5751ff010b..44df4dd787 100644 --- a/js/designer/history.js +++ b/js/designer/history.js @@ -95,17 +95,17 @@ function display (init, finit) { } else { str += ''; } - str += '' + PMA_getImage('b_sbrowse', 'column name') + '' + + str += '' + Functions.getImage('b_sbrowse', 'column name') + '' + '' + history_array[i].get_column_name() + ''; if (history_array[i].get_type() === 'GroupBy' || history_array[i].get_type() === 'OrderBy') { - str += '' + PMA_getImage('s_info', detail(i)) + '' + + str += '' + Functions.getImage('s_info', detail(i)) + '' + '' + history_array[i].get_type() + '' + - '' + PMA_getImage('b_drop', Messages.strDelete) + ''; + '' + Functions.getImage('b_drop', Messages.strDelete) + ''; } else { - str += '' + PMA_getImage('s_info', detail(i)) + '' + + str += '' + Functions.getImage('s_info', detail(i)) + '' + '' + history_array[i].get_type() + '' + - '' + PMA_getImage('b_edit', Messages.strEdit) + '' + - '' + PMA_getImage('b_drop', Messages.strDelete) + ''; + '' + Functions.getImage('b_edit', Messages.strEdit) + '' + + '' + Functions.getImage('b_drop', Messages.strDelete) + ''; } str += ''; i++; @@ -817,7 +817,7 @@ function build_query (formtitle, fadin) { */ var $elm = $ajaxDialog.find('textarea'); if (! vqb_editor) { - vqb_editor = PMA_getSQLEditor($elm); + vqb_editor = Functions.getSqlEditor($elm); } if (vqb_editor) { vqb_editor.setValue(q_select); diff --git a/js/designer/move.js b/js/designer/move.js index 5b026a9a31..51ab5d7768 100644 --- a/js/designer/move.js +++ b/js/designer/move.js @@ -694,13 +694,13 @@ function Save2 (callback) { poststr += argsep + 'server=' + server + argsep + 'db=' + db + argsep + 'selected_page=' + selected_page; poststr += Get_url_pos(); - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); $.post('db_designer.php', poststr, function (data) { if (data.success === false) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxRemoveMessage($msgbox); - PMA_ajaxShowMessage(Messages.strModificationSaved); + Functions.ajaxRemoveMessage($msgbox); + Functions.ajaxShowMessage(Messages.strModificationSaved); MarkSaved(); if (typeof callback !== 'undefined') { callback(); @@ -723,19 +723,19 @@ function submitSaveDialogAndClose (callback) { var $form = $('#save_page'); var name = $form.find('input[name="selected_value"]').val().trim(); if (name === '') { - PMA_ajaxShowMessage(Messages.strEnterValidPageName, false); + Functions.ajaxShowMessage(Messages.strEnterValidPageName, false); return; } $('#page_save_dialog').dialog('close'); if (designer_tables_enabled) { - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); - PMA_prepareForAjaxRequest($form); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); + Functions.prepareForAjaxRequest($form); $.post($form.attr('action'), $form.serialize() + Get_url_pos(), function (data) { if (data.success === false) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); MarkSaved(); if (data.id) { selected_page = data.id; @@ -807,7 +807,7 @@ function Edit_pages () { var $form = $('#edit_delete_pages'); var selected = $form.find('select[name="selected_page"]').val(); if (selected === '0') { - PMA_ajaxShowMessage(Messages.strSelectPage, 2000); + Functions.ajaxShowMessage(Messages.strSelectPage, 2000); return; } $(this).dialog('close'); @@ -817,7 +817,7 @@ function Edit_pages () { $(this).dialog('close'); }; - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); $.post('db_designer.php', { 'ajax_request': true, 'server': server, @@ -825,9 +825,9 @@ function Edit_pages () { 'dialog': 'edit' }, function (data) { if (data.success === false) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); if (! designer_tables_enabled) { Create_page_list(db, function (options) { @@ -858,37 +858,37 @@ function Delete_pages () { var $form = $('#edit_delete_pages'); var selected = $form.find('select[name="selected_page"]').val(); if (selected === '0') { - PMA_ajaxShowMessage(Messages.strSelectPage, 2000); + Functions.ajaxShowMessage(Messages.strSelectPage, 2000); return; } - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); var deleting_current_page = selected === selected_page; - PMA_prepareForAjaxRequest($form); + Functions.prepareForAjaxRequest($form); if (designer_tables_enabled) { $.post($form.attr('action'), $form.serialize(), function (data) { if (data.success === false) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); if (deleting_current_page) { Load_page(null); } else { - PMA_ajaxShowMessage(Messages.strSuccessfulPageDelete); + Functions.ajaxShowMessage(Messages.strSuccessfulPageDelete); } } }); // end $.post() } else { Delete_page(selected, function (success) { if (! success) { - PMA_ajaxShowMessage('Error', false); + Functions.ajaxShowMessage('Error', false); } else { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); if (deleting_current_page) { Load_page(null); } else { - PMA_ajaxShowMessage(Messages.strSuccessfulPageDelete); + Functions.ajaxShowMessage(Messages.strSuccessfulPageDelete); } } }); @@ -900,7 +900,7 @@ function Delete_pages () { $(this).dialog('close'); }; - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); $.post('db_designer.php', { 'ajax_request': true, 'server': server, @@ -908,9 +908,9 @@ function Delete_pages () { 'dialog': 'delete' }, function (data) { if (data.success === false) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); if (! designer_tables_enabled) { Create_page_list(db, function (options) { @@ -946,26 +946,26 @@ function Save_as () { if (choice === 'same') { if ($selected_page.val() === '0') { - PMA_ajaxShowMessage(Messages.strSelectPage, 2000); + Functions.ajaxShowMessage(Messages.strSelectPage, 2000); return; } name = $selected_page.find('option:selected').text(); } else if (choice === 'new') { if (selected_value === '') { - PMA_ajaxShowMessage(Messages.strEnterValidPageName, 2000); + Functions.ajaxShowMessage(Messages.strEnterValidPageName, 2000); return; } name = selected_value; } - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); if (designer_tables_enabled) { - PMA_prepareForAjaxRequest($form); + Functions.prepareForAjaxRequest($form); $.post($form.attr('action'), $form.serialize() + Get_url_pos(), function (data) { if (data.success === false) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); MarkSaved(); if (data.id) { selected_page = data.id; @@ -977,7 +977,7 @@ function Save_as () { if (choice === 'same') { var selected_page_id = $selected_page.find('option:selected').val(); Save_to_selected_page(db, selected_page_id, name, Get_url_pos(), function (page) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); MarkSaved(); if (page.pg_nr) { selected_page = page.pg_nr; @@ -986,7 +986,7 @@ function Save_as () { }); } else if (choice === 'new') { Save_to_new_page(db, name, Get_url_pos(), function (page) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); MarkSaved(); if (page.pg_nr) { selected_page = page.pg_nr; @@ -1002,7 +1002,7 @@ function Save_as () { $(this).dialog('close'); }; - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); $.post('db_designer.php', { 'ajax_request': true, 'server': server, @@ -1010,9 +1010,9 @@ function Save_as () { 'dialog': 'save_as' }, function (data) { if (data.success === false) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); if (! designer_tables_enabled) { Create_page_list(db, function (options) { @@ -1081,7 +1081,7 @@ function Export_pages () { button_options[Messages.strCancel] = function () { $(this).dialog('close'); }; - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); var argsep = CommonParams.get('arg_separator'); $.post('db_designer.php', { @@ -1092,9 +1092,9 @@ function Export_pages () { 'selected_page': selected_page }, function (data) { if (data.success === false) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); var $form = $(data.message); if (!designer_tables_enabled) { @@ -1186,7 +1186,7 @@ function saveValueInConfig (index_sent, value_sent) { { operation: 'save_setting_value', index: index_sent, ajax_request: true, server: server, value: value_sent }, function (data) { if (data.success === false) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); } @@ -1261,15 +1261,15 @@ function Click_field (db, T, f, PK) { document.getElementById('designer_hint').style.display = 'none'; document.getElementById('display_field_button').className = 'M_butt'; - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); $.post('db_designer.php', { operation: 'setDisplayField', ajax_request: true, server: server, db: db, table: T, field: f }, function (data) { if (data.success === false) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxRemoveMessage($msgbox); - PMA_ajaxShowMessage(Messages.strModificationSaved); + Functions.ajaxRemoveMessage($msgbox); + Functions.ajaxShowMessage(Messages.strModificationSaved); } }); } @@ -1282,12 +1282,12 @@ function New_relation () { link_relation += argsep + 'on_delete=' + document.getElementById('on_delete').value + argsep + 'on_update=' + document.getElementById('on_update').value; link_relation += argsep + 'operation=addNewRelation' + argsep + 'ajax_request=true'; - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); $.post('db_designer.php', link_relation, function (data) { if (data.success === false) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); Load_page(selected_page); } }); // end $.post() @@ -1515,12 +1515,12 @@ function Upd_relation () { link_relation += argsep + 'server=' + server + argsep + 'db=' + db; link_relation += argsep + 'operation=removeRelation' + argsep + 'ajax_request=true'; - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); $.post('db_designer.php', link_relation, function (data) { if (data.success === false) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); Load_page(selected_page); } }); // end $.post() @@ -1754,7 +1754,7 @@ function Click_option (id_this, column_name, table_name) { // var top = Glob_Y - document.getElementById(id_this).offsetHeight - 10; document.getElementById(id_this).style.top = (screen.height / 4) + 'px'; document.getElementById(id_this).style.display = 'block'; - document.getElementById('option_col_name').innerHTML = '' + PMA_sprintf(Messages.strAddOption, decodeURI(column_name)) + ''; + document.getElementById('option_col_name').innerHTML = '' + Functions.sprintf(Messages.strAddOption, decodeURI(column_name)) + ''; col_name = column_name; tab_name = table_name; } @@ -1866,7 +1866,7 @@ function add_object () { var init = history_array.length; if (rel.value !== '--') { if (document.getElementById('Query').value === '') { - PMA_ajaxShowMessage(PMA_sprintf(Messages.strQueryEmpty)); + Functions.ajaxShowMessage(Functions.sprintf(Messages.strQueryEmpty)); return; } p = document.getElementById('Query'); @@ -1909,7 +1909,7 @@ function add_object () { sum = sum + 1; // make orderby } - PMA_ajaxShowMessage(PMA_sprintf(Messages.strObjectsCreated, sum)); + Functions.ajaxShowMessage(Functions.sprintf(Messages.strObjectsCreated, sum)); // output sum new objects created var existingDiv = document.getElementById('ab'); existingDiv.innerHTML = display(init, history_array.length); diff --git a/js/designer/page.js b/js/designer/page.js index 6f48e2c8a3..e6e5585492 100644 --- a/js/designer/page.js +++ b/js/designer/page.js @@ -61,7 +61,7 @@ function Create_page_list (db, callback) { var page = pages[p]; if (page.db_name === db) { html += ''; + html += Functions.escapeHtml(page.page_descr) + ''; } } if (typeof callback !== 'undefined') { diff --git a/js/drag_drop_import.js b/js/drag_drop_import.js index d133ce6d03..f3f8b5dc6d 100644 --- a/js/drag_drop_import.js +++ b/js/drag_drop_import.js @@ -302,8 +302,8 @@ PMA_DROP_IMPORT = { var $pma_sql_import_status_div = $('.pma_sql_import_status div'); $pma_sql_import_status_div.append('
  • ' + ((ext !== '') ? '' : ' ') + - escapeHtml(files[i].name) + '' + (files[i].size / 1024).toFixed(2) + + Functions.escapeHtml(files[i].name) + '' + (files[i].size / 1024).toFixed(2) + ' kb
    • '); // scroll the UI to bottom diff --git a/js/error_report.js b/js/error_report.js index 2a75056401..72796a6671 100644 --- a/js/error_report.js +++ b/js/error_report.js @@ -30,7 +30,7 @@ var ErrorReport = { exception_type: 'js' }, function (data) { if (data.success !== true) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); return; } if (data.report_setting === 'ask') { @@ -44,9 +44,9 @@ var ErrorReport = { $.post('error_report.php', post_data, function (data) { if (data.success === false) { // in the case of an error, show the error message returned. - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxShowMessage(data.message, false); + Functions.ajaxShowMessage(data.message, false); } }); } @@ -82,9 +82,9 @@ var ErrorReport = { $dialog.dialog('close'); if (data.success === false) { // in the case of an error, show the error message returned. - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxShowMessage(data.message, 3000); + Functions.ajaxShowMessage(data.message, 3000); } }); }; @@ -96,7 +96,7 @@ var ErrorReport = { $.post('error_report.php', report_data, function (data) { if (data.success === false) { // in the case of an error, show the error message returned. - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { // Show dialog if the request was successful $div @@ -125,7 +125,7 @@ var ErrorReport = { '
    ' ).append( - PMA_getImage('s_error') + Messages.strErrorOccurred + Functions.getImage('s_error') + Messages.strErrorOccurred ); var $buttons = $('
    '); @@ -135,11 +135,11 @@ var ErrorReport = { button_html += ''; button_html += ''; - button_html += PMA_getImage('s_cog', Messages.strChangeReportSettings); + button_html += Functions.getImage('s_cog', Messages.strChangeReportSettings); button_html += ''; button_html += ''; - button_html += PMA_getImage('b_close', Messages.strIgnore); + button_html += Functions.getImage('b_close', Messages.strIgnore); button_html += ''; $buttons.html(button_html); diff --git a/js/export.js b/js/export.js index 5a312f2580..363d9debf2 100644 --- a/js/export.js +++ b/js/export.js @@ -82,7 +82,7 @@ function createTemplate (name) { templateData : JSON.stringify(templateData) }; - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); $.post('tbl_export.php', params, function (response) { if (response.success === true) { $('#templateName').val(''); @@ -92,9 +92,9 @@ function createTemplate (name) { $(this).prop('selected', true); } }); - PMA_ajaxShowMessage(Messages.strTemplateCreated); + Functions.ajaxShowMessage(Messages.strTemplateCreated); } else { - PMA_ajaxShowMessage(response.error, false); + Functions.ajaxShowMessage(response.error, false); } }); } @@ -115,7 +115,7 @@ function loadTemplate (id) { templateId : id, }; - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); $.post('tbl_export.php', params, function (response) { if (response.success === true) { var $form = $('form[name="dump"]'); @@ -139,9 +139,9 @@ function loadTemplate (id) { } }); $('input[name="template_id"]').val(id); - PMA_ajaxShowMessage(Messages.strTemplateLoaded); + Functions.ajaxShowMessage(Messages.strTemplateLoaded); } else { - PMA_ajaxShowMessage(response.error, false); + Functions.ajaxShowMessage(response.error, false); } }); } @@ -165,12 +165,12 @@ function updateTemplate (id) { templateData : JSON.stringify(templateData) }; - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); $.post('tbl_export.php', params, function (response) { if (response.success === true) { - PMA_ajaxShowMessage(Messages.strTemplateUpdated); + Functions.ajaxShowMessage(Messages.strTemplateUpdated); } else { - PMA_ajaxShowMessage(response.error, false); + Functions.ajaxShowMessage(response.error, false); } }); } @@ -191,13 +191,13 @@ function deleteTemplate (id) { templateId : id, }; - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); $.post('tbl_export.php', params, function (response) { if (response.success === true) { $('#template').find('option[value="' + id + '"]').remove(); - PMA_ajaxShowMessage(Messages.strTemplateDeleted); + Functions.ajaxShowMessage(Messages.strTemplateDeleted); } else { - PMA_ajaxShowMessage(response.error, false); + Functions.ajaxShowMessage(response.error, false); } }); } @@ -731,7 +731,7 @@ function check_time_out (time_limit) { time_out = setTimeout(function () { $.get(href, params, function (data) { if (data.message === 'timeout') { - PMA_ajaxShowMessage( + Functions.ajaxShowMessage( '
    ' + Messages.strTimeOutError + '
    ', @@ -822,7 +822,7 @@ function createAliasModal (event) { $('#db_alias_select').append(option); }); } else { - PMA_ajaxShowMessage(response.error, false); + Functions.ajaxShowMessage(response.error, false); } }); } @@ -940,7 +940,7 @@ AJAX.registerOnload('export.js', function () { $('#table_alias_select').append(option); }); } else { - PMA_ajaxShowMessage(response.error, false); + Functions.ajaxShowMessage(response.error, false); } }); } @@ -963,7 +963,7 @@ AJAX.registerOnload('export.js', function () { $('#column_alias_select').append(option); }); } else { - PMA_ajaxShowMessage(response.error, false); + Functions.ajaxShowMessage(response.error, false); } }); }); diff --git a/js/functions.js b/js/functions.js index 5a7560ceec..1129510583 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3,6 +3,7 @@ * general function, usually for data manipulation pages * */ +var Functions = {}; /** * @var sql_box_locked lock for the sqlbox textarea in the querybox @@ -92,7 +93,7 @@ $.ajaxPrefilter(function (options, originalOptions, jqXHR) { * * @param object $this_element a jQuery object pointing to the element */ -function PMA_addDatepicker ($this_element, type, options) { +Functions.addDatepicker = function ($this_element, type, options) { var showTimepicker = true; if (type === 'date') { showTimepicker = false; @@ -158,17 +159,17 @@ function PMA_addDatepicker ($this_element, type, options) { if (type === 'time') { $this_element.timepicker($.extend(defaultOptions, options)); // Add a tip regarding entering MySQL allowed-values for TIME data-type - PMA_tooltip($this_element, 'input', Messages.strMysqlAllowedValuesTipTime); + Functions.tooltip($this_element, 'input', Messages.strMysqlAllowedValuesTipTime); } else { $this_element.datetimepicker($.extend(defaultOptions, options)); } -} +}; /** * Add a date/time picker to each element that needs it * (only when jquery-ui-timepicker-addon.js is loaded) */ -function addDateTimePicker () { +Functions.addDateTimePicker = function () { if ($.timepicker !== undefined) { $('input.timefield, input.datefield, input.datetimefield').each(function () { var decimals = $(this).parent().attr('data-decimals'); @@ -192,7 +193,7 @@ function addDateTimePicker () { if (type === 'time') { hourMax = 99; } - PMA_addDatepicker($(this), type, { + Functions.addDatepicker($(this), type, { showMillisec: showMillisec, showMicrosec: showMicrosec, timeFormat: timeFormat, @@ -201,20 +202,20 @@ function addDateTimePicker () { // Add a tip regarding entering MySQL allowed-values // for TIME and DATE data-type if ($(this).hasClass('timefield')) { - PMA_tooltip($(this), 'input', Messages.strMysqlAllowedValuesTipTime); + Functions.tooltip($(this), 'input', Messages.strMysqlAllowedValuesTipTime); } else if ($(this).hasClass('datefield')) { - PMA_tooltip($(this), 'input', Messages.strMysqlAllowedValuesTipDate); + Functions.tooltip($(this), 'input', Messages.strMysqlAllowedValuesTipDate); } }); } -} +}; /** * Handle redirect and reload flags sent as part of AJAX requests * * @param data ajax response data */ -function PMA_handleRedirectAndReload (data) { +Functions.handleRedirectAndReload = function (data) { if (parseInt(data.redirect_flag) === 1) { // add one more GET param to display session expiry msg if (window.location.href.indexOf('?') === -1) { @@ -226,7 +227,7 @@ function PMA_handleRedirectAndReload (data) { } else if (parseInt(data.reload_flag) === 1) { window.location.reload(); } -} +}; /** * Creates an SQL editor which supports auto completing etc. @@ -236,7 +237,7 @@ function PMA_handleRedirectAndReload (data) { * @param resize optional resizing ('vertical', 'horizontal', 'both') * @param lintOptions additional options for lint */ -function PMA_getSQLEditor ($textarea, options, resize, lintOptions) { +Functions.getSqlEditor = function ($textarea, options, resize, lintOptions) { if ($textarea.length > 0 && typeof CodeMirror !== 'undefined') { // merge options for CodeMirror var defaults = { @@ -287,7 +288,7 @@ function PMA_getSQLEditor ($textarea, options, resize, lintOptions) { } }); // enable autocomplete - codemirrorEditor.on('inputRead', codemirrorAutocompleteOnInputRead); + codemirrorEditor.on('inputRead', Functions.codeMirrorAutoCompleteOnInputRead); // page locking codemirrorEditor.on('change', function (e) { @@ -301,12 +302,12 @@ function PMA_getSQLEditor ($textarea, options, resize, lintOptions) { return codemirrorEditor; } return null; -} +}; /** * Clear text selection */ -function PMA_clearSelection () { +Functions.clearSelection = function () { if (document.selection && document.selection.empty) { document.selection.empty(); } else if (window.getSelection) { @@ -318,7 +319,7 @@ function PMA_clearSelection () { sel.removeAllRanges(); } } -} +}; /** * Create a jQuery UI tooltip @@ -330,7 +331,7 @@ function PMA_clearSelection () { * @param additionalOptions to override the default options * */ -function PMA_tooltip ($elements, item, myContent, additionalOptions) { +Functions.tooltip = function ($elements, item, myContent, additionalOptions) { if ($('#no_hint').length > 0) { return; } @@ -345,13 +346,12 @@ function PMA_tooltip ($elements, item, myContent, additionalOptions) { }; $elements.tooltip($.extend(true, defaultOptions, additionalOptions)); -} +}; /** * HTML escaping */ - -function escapeHtml (unsafe) { +Functions.escapeHtml = function (unsafe) { if (typeof(unsafe) !== 'undefined') { return unsafe .toString() @@ -363,9 +363,9 @@ function escapeHtml (unsafe) { } else { return false; } -} +}; -function escapeJsString (unsafe) { +Functions.escapeJsString = function (unsafe) { if (typeof(unsafe) !== 'undefined') { return unsafe .toString() @@ -381,26 +381,25 @@ function escapeJsString (unsafe) { } else { return false; } -} +}; - -function escapeBacktick (s) { +Functions.escapeBacktick = function (s) { return s.replace('`', '``'); -} +}; -function escapeSingleQuote (s) { +Functions.escapeSingleQuote = function (s) { return s.replace('\\', '\\\\').replace('\'', '\\\''); -} +}; -function PMA_sprintf () { +Functions.sprintf = function () { return sprintf.apply(this, arguments); -} +}; /** * Hides/shows the default value input field, depending on the default type * Ticks the NULL checkbox if NULL is chosen as default value. */ -function PMA_hideShowDefaultValue ($default_type) { +Functions.hideShowDefaultValue = function ($default_type) { if ($default_type.val() === 'USER_DEFINED') { $default_type.siblings('.default_value').show().focus(); } else { @@ -410,7 +409,7 @@ function PMA_hideShowDefaultValue ($default_type) { $null_checkbox.prop('checked', true); } } -} +}; /** * Hides/shows the input field for column expression based on whether @@ -418,29 +417,29 @@ function PMA_hideShowDefaultValue ($default_type) { * * @param $virtuality virtuality dropdown */ -function PMA_hideShowExpression ($virtuality) { +Functions.hideShowExpression = function ($virtuality) { if ($virtuality.val() === '') { $virtuality.siblings('.expression').hide(); } else { $virtuality.siblings('.expression').show(); } -} +}; /** * Show notices for ENUM columns; add/hide the default value * */ -function PMA_verifyColumnsProperties () { +Functions.verifyColumnsProperties = function () { $('select.column_type').each(function () { - PMA_showNoticeForEnum($(this)); + Functions.showNoticeForEnum($(this)); }); $('select.default_type').each(function () { - PMA_hideShowDefaultValue($(this)); + Functions.hideShowDefaultValue($(this)); }); $('select.virtuality').each(function () { - PMA_hideShowExpression($(this)); + Functions.hideShowExpression($(this)); }); -} +}; /** * Add a hidden field to the form to indicate that this will be an @@ -448,11 +447,11 @@ function PMA_verifyColumnsProperties () { * * @param $form object the form */ -function PMA_prepareForAjaxRequest ($form) { +Functions.prepareForAjaxRequest = function ($form) { if (! $form.find('input:hidden').is('#ajax_request_hidden')) { $form.append(''); } -} +}; /** * Generate a new password and copy it to the password input areas @@ -461,7 +460,7 @@ function PMA_prepareForAjaxRequest ($form) { * * @return boolean always true */ -function suggestPassword (passwd_form) { +Functions.suggestPassword = function (passwd_form) { // restrict the password to just letters and numbers to avoid problems: // "editors and viewers regard the password as multiple words and // things like double click no longer work" @@ -497,12 +496,12 @@ function suggestPassword (passwd_form) { meter_obj_label = $jquery_passwd_form.find('span[name="pw_strength"]').first(); checkPasswordStrength(passwd.value, meter_obj, meter_obj_label); return true; -} +}; /** * Version string to integer conversion. */ -function parseVersionString (str) { +Functions.parseVersionString = function (str) { if (typeof(str) !== 'string') { return false; } @@ -529,16 +528,16 @@ function parseVersionString (str) { var pat = parseInt(x[2], 10) || 0; var hotfix = parseInt(x[3], 10) || 0; return maj * 100000000 + min * 1000000 + pat * 10000 + hotfix * 100 + add; -} +}; /** * Indicates current available version on main page. */ -function PMA_current_version (data) { +Functions.currentVersion = function (data) { if (data && data.version && data.date) { - var current = parseVersionString($('span.version').text()); - var latest = parseVersionString(data.version); - var url = 'https://www.phpmyadmin.net/files/' + escapeHtml(encodeURIComponent(data.version)) + '/'; + var current = Functions.parseVersionString($('span.version').text()); + var latest = Functions.parseVersionString(data.version); + var url = 'https://www.phpmyadmin.net/files/' + Functions.escapeHtml(encodeURIComponent(data.version)) + '/'; var version_information_message = document.createElement('span'); version_information_message.className = 'latest'; var version_information_message_link = document.createElement('a'); @@ -550,10 +549,10 @@ function PMA_current_version (data) { version_information_message.appendChild(prefix_message); version_information_message.appendChild(version_information_message_link); if (latest > current) { - var message = PMA_sprintf( + var message = Functions.sprintf( Messages.strNewerVersion, - escapeHtml(data.version), - escapeHtml(data.date) + Functions.escapeHtml(data.version), + Functions.escapeHtml(data.date) ); var htmlClass = 'notice'; if (Math.floor(latest / 10000) === Math.floor(current / 10000)) { @@ -584,12 +583,12 @@ function PMA_current_version (data) { $liPmaVersion.find('span.latest').remove(); $liPmaVersion.append($(version_information_message)); } -} +}; /** * Loads Git revision data from ajax for index.php */ -function PMA_display_git_revision () { +Functions.displayGitRevision = function () { $('#is_git_revision').remove(); $('#li_pma_version_git').remove(); $.get( @@ -606,15 +605,14 @@ function PMA_display_git_revision () { } } ); -} +}; /** * for PhpMyAdmin\Display\ChangePassword * libraries/user_password.php * */ - -function displayPasswordGenerateButton () { +Functions.displayPasswordGenerateButton = function () { var generatePwdRow = $('').addClass('vmiddle'); var titleCell = $('').html(Messages.strGeneratePassword).appendTo(generatePwdRow); var pwdCell = $('').appendTo(generatePwdRow); @@ -622,7 +620,7 @@ function displayPasswordGenerateButton () { .attr({ type: 'button', id: 'button_generate_password', value: Messages.strGenerate }) .addClass('btn btn-secondary button') .on('click', function () { - suggestPassword(this.form); + Functions.suggestPassword(this.form); }); var pwdTextbox = $('') .attr({ type: 'text', name: 'generated_pw', id: 'generated_pw' }); @@ -644,7 +642,7 @@ function displayPasswordGenerateButton () { if (document.getElementById('button_generate_password') === null) { $('#div_element_before_generate_password').parent().append(generatePwdDiv); } -} +}; /** * selects the content of a given object, f.e. a textarea @@ -655,7 +653,7 @@ function displayPasswordGenerateButton () { * @param only_once boolean if true this is only done once * f.e. only on first focus */ -function selectContent (element, lock, only_once) { +Functions.selectContent = function (element, lock, only_once) { if (only_once && only_once_elements[element.name]) { return; } @@ -667,7 +665,7 @@ function selectContent (element, lock, only_once) { } element.select(); -} +}; /** * Displays a confirmation box before submitting a "DROP/DELETE/ALTER" query. @@ -678,14 +676,14 @@ function selectContent (element, lock, only_once) { * * @return boolean whether to run the query or not */ -function confirmLink (theLink, theSqlQuery) { +Functions.confirmLink = function (theLink, theSqlQuery) { // Confirmation is not required in the configuration file // or browser is Opera (crappy js implementation) if (Messages.strDoYouReally === '' || typeof(window.opera) !== 'undefined') { return true; } - var is_confirmed = confirm(PMA_sprintf(Messages.strDoYouReally, theSqlQuery)); + var is_confirmed = confirm(Functions.sprintf(Messages.strDoYouReally, theSqlQuery)); if (is_confirmed) { if (typeof(theLink.href) !== 'undefined') { theLink.href += CommonParams.get('arg_separator') + 'is_js_confirmed=1'; @@ -695,21 +693,21 @@ function confirmLink (theLink, theSqlQuery) { } return is_confirmed; -} // end of the 'confirmLink()' function +}; /** * Confirms a "DROP/DELETE/ALTER" query before * submitting it if required. - * This function is called by the 'checkSqlQuery()' js function. + * This function is called by the 'Functions.checkSqlQuery()' js function. * * @param theForm1 object the form * @param sqlQuery1 string the sql query string * * @return boolean whether to run the query or not * - * @see checkSqlQuery() + * @see Functions.checkSqlQuery() */ -function confirmQuery (theForm1, sqlQuery1) { +Functions.confirmQuery = function (theForm1, sqlQuery1) { // Confirmation is not required in the configuration file if (Messages.strDoYouReally === '') { return true; @@ -739,7 +737,7 @@ function confirmQuery (theForm1, sqlQuery1) { } else { message = sqlQuery1; } - var is_confirmed = confirm(PMA_sprintf(Messages.strDoYouReally, message)); + var is_confirmed = confirm(Functions.sprintf(Messages.strDoYouReally, message)); // statement is confirmed -> update the // "is_js_confirmed" form field so the confirm test won't be // run on the server side and allows to submit the form @@ -754,7 +752,7 @@ function confirmQuery (theForm1, sqlQuery1) { } // end if (display confirm box) return true; -} // end of the 'confirmQuery()' function +}; /** * Displays an error message if the user submitted the sql query form with no @@ -764,9 +762,9 @@ function confirmQuery (theForm1, sqlQuery1) { * * @return boolean always false * - * @see confirmQuery() + * @see Functions.confirmQuery() */ -function checkSqlQuery (theForm) { +Functions.checkSqlQuery = function (theForm) { // get the textarea element containing the query var sqlQuery; if (codemirror_editor) { @@ -788,7 +786,7 @@ function checkSqlQuery (theForm) { var result = false; // Checks for "DROP/DELETE/ALTER" statements if (sqlQuery.replace(space_re, '') !== '') { - result = confirmQuery(theForm, sqlQuery); + result = Functions.confirmQuery(theForm, sqlQuery); } else { alert(Messages.strFormEmpty); } @@ -799,7 +797,7 @@ function checkSqlQuery (theForm) { codemirror_inline_editor.focus(); } return result; -} // end of the 'checkSqlQuery()' function +}; /** * Check if a form's element is empty. @@ -810,11 +808,11 @@ function checkSqlQuery (theForm) { * * @return boolean whether the form field is empty or not */ -function emptyCheckTheField (theForm, theFieldName) { +Functions.emptyCheckTheField = function (theForm, theFieldName) { var theField = theForm.elements[theFieldName]; var space_re = new RegExp('\\s+'); return theField.value.replace(space_re, '') === ''; -} // end of the 'emptyCheckTheField()' function +}; /** * Ensures a value submitted in a form is numeric and is in a range @@ -826,7 +824,7 @@ function emptyCheckTheField (theForm, theFieldName) { * * @return boolean whether a valid number has been submitted or not */ -function checkFormElementInRange (theForm, theFieldName, message, min, max) { +Functions.checkFormElementInRange = function (theForm, theFieldName, message, min, max) { var theField = theForm.elements[theFieldName]; var val = parseInt(theField.value, 10); @@ -844,17 +842,16 @@ function checkFormElementInRange (theForm, theFieldName, message, min, max) { return false; } else if (val < min || val > max) { theField.select(); - alert(PMA_sprintf(message, val)); + alert(Functions.sprintf(message, val)); theField.focus(); return false; } else { theField.value = val; } return true; -} // end of the 'checkFormElementInRange()' function +}; - -function checkTableEditForm (theForm, fieldsCnt) { +Functions.checkTableEditForm = function (theForm, fieldsCnt) { // TODO: avoid sending a message if user just wants to add a line // on the form but has not completed at least one field name @@ -884,7 +881,7 @@ function checkTableEditForm (theForm, fieldsCnt) { if (atLeastOneField === 0) { id = 'field_' + i + '_1'; - if (!emptyCheckTheField(theForm, id)) { + if (!Functions.emptyCheckTheField(theForm, id)) { atLeastOneField = 1; } } @@ -905,7 +902,7 @@ function checkTableEditForm (theForm, fieldsCnt) { } return true; -} // enf of the 'checkTableEditForm()' function +}; /** * True if last click is to check a row. @@ -1066,7 +1063,7 @@ AJAX.registerOnload('functions.js', function () { last_shift_clicked_row = -1; } else { // handle the shift click - PMA_clearSelection(); + Functions.clearSelection(); var start; var end; @@ -1108,7 +1105,7 @@ AJAX.registerOnload('functions.js', function () { } }); - addDateTimePicker(); + Functions.addDateTimePicker(); /** * Add attribute to text boxes for iOS devices (based on bugID: 3508912) @@ -1127,15 +1124,15 @@ AJAX.registerOnload('functions.js', function () { * * @return boolean always true */ -function setSelectOptions (the_form, the_select, do_check) { +Functions.setSelectOptions = function (the_form, the_select, do_check) { $('form[name=\'' + the_form + '\'] select[name=\'' + the_select + '\']').find('option').prop('selected', do_check); return true; -} // end of the 'setSelectOptions()' function +}; /** * Sets current value for query box. */ -function setQuery (query) { +Functions.setQuery = function (query) { if (codemirror_editor) { codemirror_editor.setValue(query); codemirror_editor.focus(); @@ -1143,14 +1140,14 @@ function setQuery (query) { document.sqlform.sql_query.value = query; document.sqlform.sql_query.focus(); } -} +}; /** * Handles 'Simulate query' button on SQL query box. * * @return void */ -function PMA_handleSimulateQueryButton () { +Functions.handleSimulateQueryButton = function () { var update_re = new RegExp('^\\s*UPDATE\\s+((`[^`]+`)|([A-Za-z0-9_$]+))\\s+SET\\s', 'i'); var delete_re = new RegExp('^\\s*DELETE\\s+FROM\\s', 'i'); var query = ''; @@ -1175,15 +1172,15 @@ function PMA_handleSimulateQueryButton () { $simulateDml.remove(); } } -} +}; /** * Create quick sql statements. * */ -function insertQuery (queryType) { +Functions.insertQuery = function (queryType) { if (queryType === 'clear') { - setQuery(''); + Functions.setQuery(''); return; } else if (queryType === 'format') { if (codemirror_editor) { @@ -1211,11 +1208,11 @@ function insertQuery (queryType) { return; } else if (queryType === 'saved') { if (isStorageSupported('localStorage') && typeof window.localStorage.auto_saved_sql !== 'undefined') { - setQuery(window.localStorage.auto_saved_sql); + Functions.setQuery(window.localStorage.auto_saved_sql); } else if (Cookies.get('auto_saved_sql')) { - setQuery(Cookies.get('auto_saved_sql')); + Functions.setQuery(Cookies.get('auto_saved_sql')); } else { - PMA_ajaxShowMessage(Messages.strNoAutoSavedQuery); + Functions.ajaxShowMessage(Messages.strNoAutoSavedQuery); } return; } @@ -1252,17 +1249,16 @@ function insertQuery (queryType) { } else if (queryType === 'delete') { query = 'DELETE FROM `' + table + '` WHERE 0'; } - setQuery(query); + Functions.setQuery(query); sql_box_locked = false; } -} - +}; /** * Inserts multiple fields. * */ -function insertValueQuery () { +Functions.insertValueQuery = function () { var myQuery = document.sqlform.sql_query; var myListBox = document.sqlform.dummy; @@ -1302,12 +1298,12 @@ function insertValueQuery () { } sql_box_locked = false; } -} +}; /** * Updates the input fields for the parameters based on the query */ -function updateQueryParameters () { +Functions.updateQueryParameters = function () { if ($('#parameterized').is(':checked')) { var query = codemirror_editor ? codemirror_editor.getValue() : $('#sqlquery').val(); @@ -1342,12 +1338,12 @@ function updateQueryParameters () { } else { $('#parametersDiv').empty(); } -} +}; /** * Refresh/resize the WYSIWYG scratchboard */ -function refreshLayout () { +Functions.refreshLayout = function () { var $elm = $('#pdflayout'); var orientation = $('#orientation_opt').val(); var paper = 'A4'; @@ -1361,14 +1357,14 @@ function refreshLayout () { posa = 'x'; posb = 'y'; } - $elm.css('width', pdfPaperSize(paper, posa) + 'px'); - $elm.css('height', pdfPaperSize(paper, posb) + 'px'); -} + $elm.css('width', Functions.pdfPaperSize(paper, posa) + 'px'); + $elm.css('height', Functions.pdfPaperSize(paper, posb) + 'px'); +}; /** * Initializes positions of elements. */ -function TableDragInit () { +Functions.tableDragInit = function () { $('.pdflayout_table').each(function () { var $this = $(this); var number = $this.data('number'); @@ -1386,12 +1382,12 @@ function TableDragInit () { } }); }); -} +}; /** * Resets drag and drop positions. */ -function resetDrag () { +Functions.resetDrag = function () { $('.pdflayout_table').each(function () { var $this = $(this); var x = $this.data('x'); @@ -1399,7 +1395,7 @@ function resetDrag () { $this.css('left', x + 'px'); $this.css('top', y + 'px'); }); -} +}; /** * User schema handlers. @@ -1415,16 +1411,16 @@ $(function () { $(document).on('change', '.paper-change', function () { var $elm = $('#pdflayout'); if ($elm.css('visibility') === 'visible') { - refreshLayout(); - TableDragInit(); + Functions.refreshLayout(); + Functions.tableDragInit(); } }); /* Show/hide the WYSIWYG scratchboard */ $(document).on('click', '#toggle-dragdrop', function () { var $elm = $('#pdflayout'); if ($elm.css('visibility') === 'hidden') { - refreshLayout(); - TableDragInit(); + Functions.refreshLayout(); + Functions.tableDragInit(); $elm.css('visibility', 'visible'); $elm.css('display', 'block'); $('#showwysiwyg').val('1'); @@ -1436,14 +1432,14 @@ $(function () { }); /* Reset scratchboard */ $(document).on('click', '#reset-dragdrop', function () { - resetDrag(); + Functions.resetDrag(); }); }); /** * Returns paper sizes for a given format */ -function pdfPaperSize (format, axis) { +Functions.pdfPaperSize = function (format, axis) { switch (format.toUpperCase()) { case '4A0': if (axis === 'x') { @@ -1791,24 +1787,24 @@ function pdfPaperSize (format, axis) { } // end switch return 0; -} +}; /** * Get checkbox for foreign key checks * * @return string */ -function getForeignKeyCheckboxLoader () { +Functions.getForeignKeyCheckboxLoader = function () { var html = ''; html += '
    '; html += '
    '; - html += PMA_getImage('ajax_clock_small'); + html += Functions.getImage('ajax_clock_small'); html += '
    '; html += '
    '; return html; -} +}; -function loadForeignKeyCheckbox () { +Functions.loadForeignKeyCheckbox = function () { // Load default foreign key check value var params = { 'ajax_request': true, @@ -1822,9 +1818,9 @@ function loadForeignKeyCheckbox () { ''; $('.load-default-fk-check-value').replaceWith(html); }); -} +}; -function getJSConfirmCommonParam (elem, params) { +Functions.getJsConfirmCommonParam = function (elem, params) { var $elem = $(elem); var sep = CommonParams.get('arg_separator'); if (params) { @@ -1838,7 +1834,7 @@ function getJSConfirmCommonParam (elem, params) { } params += 'is_js_confirmed=1' + sep + 'ajax_request=true' + sep + 'fk_checks=' + ($elem.find('#fk_checks').is(':checked') ? 1 : 0); return params; -} +}; /** * Unbind all event handlers before tearing down a page @@ -1876,7 +1872,7 @@ AJAX.registerTeardown('functions.js', function () { AJAX.registerOnload('functions.js', function () { // If we are coming back to the page by clicking forward button // of the browser, bind the code mirror to inline query editor. - bindCodeMirrorToInlineEditor(); + Functions.bindCodeMirrorToInlineEditor(); $(document).on('click', 'a.inline_edit_sql', function () { if ($('#sql_query_edit').length) { // An inline query editor is already open, @@ -1889,8 +1885,8 @@ AJAX.registerOnload('functions.js', function () { var $inner_sql = $(this).parent().prev().find('code.sql'); var old_text = $inner_sql.html(); - var new_content = '\n'; - new_content += getForeignKeyCheckboxLoader(); + var new_content = '\n'; + new_content += Functions.getForeignKeyCheckboxLoader(); new_content += '\n'; new_content += '\n'; var $editor_area = $('div#inline_editor'); @@ -1899,10 +1895,10 @@ AJAX.registerOnload('functions.js', function () { $editor_area.insertBefore($inner_sql); } $editor_area.html(new_content); - loadForeignKeyCheckbox(); + Functions.loadForeignKeyCheckbox(); $inner_sql.hide(); - bindCodeMirrorToInlineEditor(); + Functions.bindCodeMirrorToInlineEditor(); return false; }); @@ -1924,7 +1920,7 @@ AJAX.registerOnload('functions.js', function () { .append($('', { type: 'hidden', name: 'is_js_confirmed', value: 0 })) .append($('', { type: 'hidden', name: 'sql_query', value: sql_query })) .append($('', { type: 'hidden', name: 'fk_checks', value: fk_check ? 1 : 0 })); - if (! checkSqlQuery($fake_form[0])) { + if (! Functions.checkSqlQuery($fake_form[0])) { return false; } $('.success').hide(); @@ -1938,12 +1934,12 @@ AJAX.registerOnload('functions.js', function () { }); $(document).on('click', 'input.sqlbutton', function (evt) { - insertQuery(evt.target.id); - PMA_handleSimulateQueryButton(); + Functions.insertQuery(evt.target.id); + Functions.handleSimulateQueryButton(); return false; }); - $(document).on('change', '#parameterized', updateQueryParameters); + $(document).on('change', '#parameterized', Functions.updateQueryParameters); var $inputUsername = $('#input_username'); if ($inputUsername) { @@ -1958,7 +1954,7 @@ AJAX.registerOnload('functions.js', function () { /** * "inputRead" event handler for CodeMirror SQL query editors for autocompletion */ -function codemirrorAutocompleteOnInputRead (instance) { +Functions.codeMirrorAutoCompleteOnInputRead = function (instance) { if (!sql_autocomplete_in_progress && (!instance.options.hintOptions.tables || !sql_autocomplete)) { if (!sql_autocomplete) { @@ -2046,7 +2042,7 @@ function codemirrorAutocompleteOnInputRead (instance) { if (string.length > 0) { CodeMirror.commands.autocomplete(instance); } -} +}; /** * Remove autocomplete information before tearing down a page @@ -2059,41 +2055,41 @@ AJAX.registerTeardown('functions.js', function () { /** * Binds the CodeMirror to the text area used to inline edit a query. */ -function bindCodeMirrorToInlineEditor () { +Functions.bindCodeMirrorToInlineEditor = function () { var $inline_editor = $('#sql_query_edit'); if ($inline_editor.length > 0) { if (typeof CodeMirror !== 'undefined') { var height = $inline_editor.css('height'); - codemirror_inline_editor = PMA_getSQLEditor($inline_editor); + codemirror_inline_editor = Functions.getSqlEditor($inline_editor); codemirror_inline_editor.getWrapperElement().style.height = height; codemirror_inline_editor.refresh(); codemirror_inline_editor.focus(); $(codemirror_inline_editor.getWrapperElement()) - .on('keydown', catchKeypressesFromSqlInlineEdit); + .on('keydown', Functions.catchKeypressesFromSqlInlineEdit); } else { $inline_editor .focus() - .on('keydown', catchKeypressesFromSqlInlineEdit); + .on('keydown', Functions.catchKeypressesFromSqlInlineEdit); } } -} +}; -function catchKeypressesFromSqlInlineEdit (event) { +Functions.catchKeypressesFromSqlInlineEdit = function (event) { // ctrl-enter is 10 in chrome and ie, but 13 in ff if ((event.ctrlKey || event.metaKey) && (event.keyCode === 13 || event.keyCode === 10)) { $('#sql_query_edit_save').trigger('click'); } -} +}; /** * Adds doc link to single highlighted SQL element */ -function PMA_doc_add ($elm, params) { +Functions.documentationAdd = function ($elm, params) { if (typeof mysql_doc_template === 'undefined') { return; } - var url = PMA_sprintf( + var url = Functions.sprintf( decodeURIComponent(mysql_doc_template), params[0] ); @@ -2103,12 +2099,12 @@ function PMA_doc_add ($elm, params) { var content = $elm.text(); $elm.text(''); $elm.append('' + content + ''); -} +}; /** * Generates doc links for keywords inside highlighted SQL */ -function PMA_doc_keyword (idx, elm) { +Functions.documentationKeyword = function (idx, elm) { var $elm = $(elm); /* Skip already processed ones */ if ($elm.find('a').length > 0) { @@ -2125,38 +2121,38 @@ function PMA_doc_keyword (idx, elm) { var next2_keyword = $next2.text().toUpperCase(); var full2 = full + ' ' + next2_keyword; if (full2 in mysql_doc_keyword) { - PMA_doc_add($elm, mysql_doc_keyword[full2]); - PMA_doc_add($next, mysql_doc_keyword[full2]); - PMA_doc_add($next2, mysql_doc_keyword[full2]); + Functions.documentationAdd($elm, mysql_doc_keyword[full2]); + Functions.documentationAdd($next, mysql_doc_keyword[full2]); + Functions.documentationAdd($next2, mysql_doc_keyword[full2]); return; } } if (full in mysql_doc_keyword) { - PMA_doc_add($elm, mysql_doc_keyword[full]); - PMA_doc_add($next, mysql_doc_keyword[full]); + Functions.documentationAdd($elm, mysql_doc_keyword[full]); + Functions.documentationAdd($next, mysql_doc_keyword[full]); return; } } if (keyword in mysql_doc_keyword) { - PMA_doc_add($elm, mysql_doc_keyword[keyword]); + Functions.documentationAdd($elm, mysql_doc_keyword[keyword]); } -} +}; /** * Generates doc links for builtins inside highlighted SQL */ -function PMA_doc_builtin (idx, elm) { +Functions.documentationBuiltin = function (idx, elm) { var $elm = $(elm); var builtin = $elm.text().toUpperCase(); if (builtin in mysql_doc_builtin) { - PMA_doc_add($elm, mysql_doc_builtin[builtin]); + Functions.documentationAdd($elm, mysql_doc_builtin[builtin]); } -} +}; /** * Higlights SQL using CodeMirror. */ -function PMA_highlightSQL ($base) { +Functions.highlightSql = function ($base) { var $elm = $base.find('code.sql'); $elm.each(function () { var $sql = $(this); @@ -2168,12 +2164,12 @@ function PMA_highlightSQL ($base) { if (typeof CodeMirror !== 'undefined') { CodeMirror.runMode($sql.text(), 'text/x-mysql', $highlight[0]); $pre.hide(); - $highlight.find('.cm-keyword').each(PMA_doc_keyword); - $highlight.find('.cm-builtin').each(PMA_doc_builtin); + $highlight.find('.cm-keyword').each(Functions.documentationKeyword); + $highlight.find('.cm-builtin').each(Functions.documentationBuiltin); } } }); -} +}; /** * Updates an element containing code. @@ -2188,7 +2184,7 @@ function PMA_highlightSQL ($base) { * * @return bool whether content was updated or not */ -function PMA_updateCode ($base, htmlValue, rawValue) { +Functions.updateCode = function ($base, htmlValue, rawValue) { var $code = $base.find('code'); if ($code.length === 0) { return false; @@ -2224,28 +2220,28 @@ function PMA_updateCode ($base, htmlValue, rawValue) { } return true; -} +}; /** * Show a message on the top of the page for an Ajax request * * Sample usage: * - * 1) var $msg = PMA_ajaxShowMessage(); + * 1) var $msg = Functions.ajaxShowMessage(); * This will show a message that reads "Loading...". Such a message will not * disappear automatically and cannot be dismissed by the user. To remove this - * message either the PMA_ajaxRemoveMessage($msg) function must be called or - * another message must be show with PMA_ajaxShowMessage() function. + * message either the Functions.ajaxRemoveMessage($msg) function must be called or + * another message must be show with Functions.ajaxShowMessage() function. * - * 2) var $msg = PMA_ajaxShowMessage(Messages.strProcessingRequest); + * 2) var $msg = Functions.ajaxShowMessage(Messages.strProcessingRequest); * This is a special case. The behaviour is same as above, * just with a different message * - * 3) var $msg = PMA_ajaxShowMessage('The operation was successful'); + * 3) var $msg = Functions.ajaxShowMessage('The operation was successful'); * This will show a message that will disappear automatically and it can also * be dismissed by the user. * - * 4) var $msg = PMA_ajaxShowMessage('Some error', false); + * 4) var $msg = Functions.ajaxShowMessage('Some error', false); * This will show a message that will not disappear automatically, but it * can be dismissed by the user after he has finished reading it. * @@ -2261,10 +2257,10 @@ function PMA_updateCode ($base, htmlValue, rawValue) { * If set to 'success', the notification will show with * a green background. * @return jQuery object jQuery Element that holds the message div - * this object can be passed to PMA_ajaxRemoveMessage() + * this object can be passed to Functions.ajaxRemoveMessage() * to remove the notification */ -function PMA_ajaxShowMessage (message, timeout, type) { +Functions.ajaxShowMessage = function (message, timeout, type) { /** * @var self_closing Whether the notification will automatically disappear */ @@ -2342,16 +2338,16 @@ function PMA_ajaxShowMessage (message, timeout, type) { * Add a tooltip to the notification to let the user know that (s)he * can dismiss the ajax notification by clicking on it. */ - PMA_tooltip( + Functions.tooltip( $retval, 'span', Messages.strDismiss ); } - PMA_highlightSQL($retval); + Functions.highlightSql($retval); return $retval; -} +}; /** * Removes the message shown for an Ajax operation when it's completed @@ -2360,7 +2356,7 @@ function PMA_ajaxShowMessage (message, timeout, type) { * * @return nothing */ -function PMA_ajaxRemoveMessage ($this_msgbox) { +Functions.ajaxRemoveMessage = function ($this_msgbox) { if ($this_msgbox !== undefined && $this_msgbox instanceof jQuery) { $this_msgbox .stop(true, true) @@ -2371,7 +2367,7 @@ function PMA_ajaxRemoveMessage ($this_msgbox) { $this_msgbox.remove(); } } -} +}; /** * Requests SQL for previewing before executing. @@ -2380,20 +2376,20 @@ function PMA_ajaxRemoveMessage ($this_msgbox) { * * @return void */ -function PMA_previewSQL ($form) { +Functions.previewSql = function ($form) { var form_url = $form.attr('action'); var sep = CommonParams.get('arg_separator'); var form_data = $form.serialize() + sep + 'do_save_data=1' + sep + 'preview_sql=1' + sep + 'ajax_request=1'; - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); $.ajax({ type: 'POST', url: form_url, data: form_data, success: function (response) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); if (response.success) { var $dialog_content = $('
    ') .append(response.sql_data); @@ -2412,18 +2408,18 @@ function PMA_previewSQL ($form) { }, open: function () { // Pretty SQL printing. - PMA_highlightSQL($(this)); + Functions.highlightSql($(this)); } }); } else { - PMA_ajaxShowMessage(response.message); + Functions.ajaxShowMessage(response.message); } }, error: function () { - PMA_ajaxShowMessage(Messages.strErrorProcessingRequest); + Functions.ajaxShowMessage(Messages.strErrorProcessingRequest); } }); -} +}; /** * Callback called when submit/"OK" is clicked on sql preview/confirm modal @@ -2440,7 +2436,7 @@ function PMA_previewSQL ($form) { * * @return void */ -function PMA_confirmPreviewSQL (sql_data, url, callback) { +Functions.confirmPreviewSql = function (sql_data, url, callback) { var $dialog_content = $('
    '
         + sql_data
         + '
    ' @@ -2472,10 +2468,10 @@ function PMA_confirmPreviewSQL (sql_data, url, callback) { }, open: function () { // Pretty SQL printing. - PMA_highlightSQL($(this)); + Functions.highlightSql($(this)); } }); -} +}; /** * check for reserved keyword column name @@ -2484,8 +2480,7 @@ function PMA_confirmPreviewSQL (sql_data, url, callback) { * * @returns true|false */ - -function PMA_checkReservedWordColumns ($form) { +Functions.checkReservedWordColumns = function ($form) { var is_confirmed = true; $.ajax({ type: 'POST', @@ -2499,16 +2494,16 @@ function PMA_checkReservedWordColumns ($form) { async:false }); return is_confirmed; -} +}; // This event only need to be fired once after the initial page load $(function () { /** * Allows the user to dismiss a notification - * created with PMA_ajaxShowMessage() + * created with Functions.ajaxShowMessage() */ $(document).on('click', 'span.ajax_notification.dismissable', function () { - PMA_ajaxRemoveMessage($(this)); + Functions.ajaxRemoveMessage($(this)); }); /** * The below two functions hide the "Dismiss notification" tooltip when a user @@ -2564,7 +2559,7 @@ $(function () { /** * Hides/shows the "Open in ENUM/SET editor" message, depending on the data type of the column currently selected */ -function PMA_showNoticeForEnum (selectElement) { +Functions.showNoticeForEnum = function (selectElement) { var enum_notice_id = selectElement.attr('id').split('_')[1]; enum_notice_id += '_' + (parseInt(selectElement.attr('id').split('_')[2], 10) + 1); var selectedType = selectElement.val(); @@ -2573,13 +2568,13 @@ function PMA_showNoticeForEnum (selectElement) { } else { $('p#enum_notice_' + enum_notice_id).hide(); } -} +}; /** * Creates a Profiling Chart. Used in sql.js * and in server_status_monitor.js */ -function PMA_createProfilingChart (target, data) { +Functions.createProfilingChart = function (target, data) { // create the chart var factory = new JQPlotChartFactory(); var chart = factory.createChart(ChartType.PIE, target); @@ -2638,7 +2633,7 @@ function PMA_createProfilingChart (target, data) { ] }); return chart; -} +}; /** * Formats a profiling duration nicely (in us and ms time). @@ -2648,7 +2643,7 @@ function PMA_createProfilingChart (target, data) { * @param integer Accuracy, how many numbers right to the comma should be * @return string The formatted number */ -function PMA_prettyProfilingNum (num, acc) { +Functions.prettyProfilingNum = function (num, acc) { if (!acc) { acc = 2; } @@ -2662,8 +2657,7 @@ function PMA_prettyProfilingNum (num, acc) { } return num + 's'; -} - +}; /** * Formats a SQL Query nicely with newlines and indentation. Depends on Codemirror and MySQL Mode! @@ -2671,7 +2665,7 @@ function PMA_prettyProfilingNum (num, acc) { * @param string Query to be formatted * @return string The formatted query */ -function PMA_SQLPrettyPrint (string) { +Functions.sqlPrettyPrint = function (string) { if (typeof CodeMirror === 'undefined') { return string; } @@ -2812,7 +2806,7 @@ function PMA_SQLPrettyPrint (string) { } } return output; -} +}; /** * jQuery function that uses jQueryUI's dialogs to confirm with user. Does not @@ -2824,8 +2818,7 @@ function PMA_SQLPrettyPrint (string) { * @param function callbackFn callback to execute after user clicks on OK * @param function openCallback optional callback to run when dialog is shown */ - -jQuery.fn.PMA_confirm = function (question, url, callbackFn, openCallback) { +Functions.confirm = function (question, url, callbackFn, openCallback) { var confirmState = CommonParams.get('confirm'); if (! confirmState) { // user does not want to confirm @@ -2873,6 +2866,7 @@ jQuery.fn.PMA_confirm = function (question, url, callbackFn, openCallback) { modal: true }); }; +jQuery.fn.PMA_confirm = Functions.confirm; /** * jQuery function to sort a table's body after a new row has been appended to it. @@ -2881,7 +2875,7 @@ jQuery.fn.PMA_confirm = function (question, url, callbackFn, openCallback) { * * @return jQuery Object for chaining purposes */ -jQuery.fn.PMA_sort_table = function (text_selector) { +Functions.sortTable = function (text_selector) { return this.each(function () { /** * @var table_body Object referring to the table's element @@ -2915,6 +2909,7 @@ jQuery.fn.PMA_sort_table = function (text_selector) { }); }); }; +jQuery.fn.PMA_sort_table = Functions.sortTable; /** * Unbind all event handlers before tearing down a page @@ -2949,22 +2944,22 @@ AJAX.registerOnload('functions.js', function () { /* * First validate the form; if there is a problem, avoid submitting it * - * checkTableEditForm() needs a pure element and not a jQuery object, + * Functions.checkTableEditForm() needs a pure element and not a jQuery object, * this is why we pass $form[0] as a parameter (the jQuery object * is actually an array of DOM elements) */ - if (checkTableEditForm($form[0], $form.find('input[name=orig_num_fields]').val())) { - PMA_prepareForAjaxRequest($form); - if (PMA_checkReservedWordColumns($form)) { - PMA_ajaxShowMessage(Messages.strProcessingRequest); + if (Functions.checkTableEditForm($form[0], $form.find('input[name=orig_num_fields]').val())) { + Functions.prepareForAjaxRequest($form); + if (Functions.checkReservedWordColumns($form)) { + Functions.ajaxShowMessage(Messages.strProcessingRequest); // User wants to submit the form $.post($form.attr('action'), $form.serialize() + CommonParams.get('arg_separator') + 'do_save_data=1', function (data) { if (typeof data !== 'undefined' && data.success === true) { $('#properties_message') .removeClass('error') .html(''); - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); // Only if the create table dialog (distinct panel) exists var $createTableDialog = $('#create_table_dialog'); if ($createTableDialog.length > 0) { @@ -3028,14 +3023,14 @@ AJAX.registerOnload('functions.js', function () { argsep + 'goto=db_structure.php' + argsep + 'table=' + data._params.table + ''; $.get(tblStruct_url, params_12, AJAX.responseHandler); } else { - PMA_ajaxShowMessage( + Functions.ajaxShowMessage( '
    ' + data.error + '
    ', false ); } }); // end $.post() } - } // end if (checkTableEditForm() ) + } }); // end create table form (save) /** @@ -3048,20 +3043,20 @@ AJAX.registerOnload('functions.js', function () { */ var $form = $('form.create_table_form.ajax'); - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); - PMA_prepareForAjaxRequest($form); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); + Functions.prepareForAjaxRequest($form); // User wants to add more fields to the table $.post($form.attr('action'), $form.serialize() + '&' + actionParam, function (data) { if (typeof data !== 'undefined' && data.success) { var $pageContent = $('#page_content'); $pageContent.html(data.message); - PMA_highlightSQL($pageContent); - PMA_verifyColumnsProperties(); - PMA_hideShowConnection($('.create_table_form select[name=tbl_storage_engine]')); - PMA_ajaxRemoveMessage($msgbox); + Functions.highlightSql($pageContent); + Functions.verifyColumnsProperties(); + Functions.hideShowConnection($('.create_table_form select[name=tbl_storage_engine]')); + Functions.ajaxRemoveMessage($msgbox); } else { - PMA_ajaxShowMessage(data.error); + Functions.ajaxShowMessage(data.error); } }); // end $.post() } @@ -3112,7 +3107,7 @@ AJAX.registerOnload('functions.js', function () { .off('click', 'input.preview_sql') .on('click', 'input.preview_sql', function () { var $form = $(this).closest('form'); - PMA_previewSQL($form); + Functions.previewSql($form); }); }); @@ -3125,7 +3120,7 @@ AJAX.registerOnload('functions.js', function () { * @param object $the_form The form to be validated * @return bool */ -function PMA_checkPassword ($the_form) { +Functions.checkPassword = function ($the_form) { // Did the user select 'no password'? if ($the_form.find('#nopass_1').is(':checked')) { return true; @@ -3154,7 +3149,7 @@ function PMA_checkPassword ($the_form) { return false; } return true; -} +}; /** * Attach Ajax event handlers for 'Change Password' on index.php @@ -3231,7 +3226,7 @@ AJAX.registerOnload('functions.js', function () { $(document).on('click', '#change_password_anchor.ajax', function (event) { event.preventDefault(); - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); /** * @var button_options Object containing options to be passed to jQueryUI's dialog @@ -3245,7 +3240,7 @@ AJAX.registerOnload('functions.js', function () { */ var $the_form = $('#change_password_form'); - if (! PMA_checkPassword($the_form)) { + if (! Functions.checkPassword($the_form)) { return false; } @@ -3256,21 +3251,21 @@ AJAX.registerOnload('functions.js', function () { */ var this_value = $(this).val(); - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); $the_form.append(''); $.post($the_form.attr('action'), $the_form.serialize() + CommonParams.get('arg_separator') + 'change_pw=' + this_value, function (data) { if (typeof data === 'undefined' || data.success !== true) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); return; } var $pageContent = $('#page_content'); $pageContent.prepend(data.message); - PMA_highlightSQL($pageContent); + Functions.highlightSql($pageContent); $('#change_password_dialog').hide().remove(); $('#edit_user_dialog').dialog('close').remove(); - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); }); // end $.post() }; @@ -3279,7 +3274,7 @@ AJAX.registerOnload('functions.js', function () { }; $.get($(this).attr('href'), { 'ajax_request': true }, function (data) { if (typeof data === 'undefined' || !data.success) { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); return; } @@ -3304,8 +3299,8 @@ AJAX.registerOnload('functions.js', function () { .find('table.noclick').unwrap().addClass('some-margin') .find('input#text_pma_pw').focus(); $('#fieldset_change_password_footer').hide(); - PMA_ajaxRemoveMessage($msgbox); - displayPasswordGenerateButton(); + Functions.ajaxRemoveMessage($msgbox); + Functions.displayPasswordGenerateButton(); $('#change_password_form').on('submit', function (e) { e.preventDefault(); $(this) @@ -3335,23 +3330,23 @@ AJAX.registerTeardown('functions.js', function () { AJAX.registerOnload('functions.js', function () { // is called here for normal page loads and also when opening // the Create table dialog - PMA_verifyColumnsProperties(); + Functions.verifyColumnsProperties(); // // needs on() to work also in the Create Table dialog $(document).on('change', 'select.column_type', function () { - PMA_showNoticeForEnum($(this)); + Functions.showNoticeForEnum($(this)); }); $(document).on('change', 'select.default_type', function () { - PMA_hideShowDefaultValue($(this)); + Functions.hideShowDefaultValue($(this)); }); $(document).on('change', 'select.virtuality', function () { - PMA_hideShowExpression($(this)); + Functions.hideShowExpression($(this)); }); $(document).on('change', 'input.allow_null', function () { - PMA_validateDefaultValue($(this)); + Functions.validateDefaultValue($(this)); }); $(document).on('change', '.create_table_form select[name=tbl_storage_engine]', function () { - PMA_hideShowConnection($(this)); + Functions.hideShowConnection($(this)); }); }); @@ -3360,7 +3355,7 @@ AJAX.registerOnload('functions.js', function () { * * @param $engine_selector storage engine selector */ -function PMA_hideShowConnection ($engine_selector) { +Functions.hideShowConnection = function ($engine_selector) { var $connection = $('.create_table_form input[name=connection]'); var index = $connection.parent('td').index() + 1; var $labelTh = $connection.parents('tr').prev('tr').children('th:nth-child(' + index + ')'); @@ -3375,19 +3370,19 @@ function PMA_hideShowConnection ($engine_selector) { .parent('td').show(); $labelTh.show(); } -} +}; /** * If the column does not allow NULL values, makes sure that default is not NULL */ -function PMA_validateDefaultValue ($null_checkbox) { +Functions.validateDefaultValue = function ($null_checkbox) { if (! $null_checkbox.prop('checked')) { var $default = $null_checkbox.closest('tr').find('.default_type'); if ($default.val() === 'NULL') { $default.val('NONE'); } } -} +}; /** * function to populate the input fields on picking a column from central list @@ -3395,7 +3390,7 @@ function PMA_validateDefaultValue ($null_checkbox) { * @param string input_id input id of the name field for the column to be populated * @param integer offset of the selected column in central list of columns */ -function autoPopulate (input_id, offset) { +Functions.autoPopulate = function (input_id, offset) { var db = CommonParams.get('db'); var table = CommonParams.get('table'); input_id = input_id.substring(0, input_id.length - 1); @@ -3435,7 +3430,7 @@ function autoPopulate (input_id, offset) { } else { $('#' + input_id + '7').prop('checked',false); } -} +}; /** * Unbind all event handlers before tearing down a page @@ -3466,7 +3461,7 @@ AJAX.registerOnload('functions.js', function () { } else { title = Messages.enum_columnVals.replace( /%s/, - '"' + escapeHtml(decodeURIComponent(colname)) + '"' + '"' + Functions.escapeHtml(decodeURIComponent(colname)) + '"' ); } // Get the values as a string @@ -3515,7 +3510,7 @@ AJAX.registerOnload('functions.js', function () { values.push('', '', '', ''); } // Add the parsed values to the editor - var drop_icon = PMA_getImage('b_drop'); + var drop_icon = Functions.getImage('b_drop'); for (i = 0; i < values.length; i++) { fields += '' + '' + @@ -3529,7 +3524,7 @@ AJAX.registerOnload('functions.js', function () { var dialog = '
    ' + '
    ' + '' + title + '' + - '

    ' + PMA_getImage('s_notice') + + '

    ' + Functions.getImage('s_notice') + Messages.enum_hint + '

    ' + '' + fields + '
    ' + '
    ' + @@ -3537,7 +3532,7 @@ AJAX.registerOnload('functions.js', function () { '
    ' + '' + '
    ' + '' + '
    ' + central_column_list[db + '_' + table][i].col_type; if (central_column_list[db + '_' + table][i].col_attribute !== '') { - fields += '(' + escapeHtml(central_column_list[db + '_' + table][i].col_attribute) + ') '; + fields += '(' + Functions.escapeHtml(central_column_list[db + '_' + table][i].col_attribute) + ') '; } if (central_column_list[db + '_' + table][i].col_length !== '') { - fields += '(' + escapeHtml(central_column_list[db + '_' + table][i].col_length) + ') '; + fields += '(' + Functions.escapeHtml(central_column_list[db + '_' + table][i].col_length) + ') '; } - fields += escapeHtml(central_column_list[db + '_' + table][i].col_extra) + '' + + fields += Functions.escapeHtml(central_column_list[db + '_' + table][i].col_extra) + '' + '
    '; if (pick) { fields += ''; + Messages.pickColumn + '" onclick="Functions.autoPopulate(\'' + colid + '\',' + i + ')">'; } fields += ''; } var result_pointer = i; var search_in = ''; if (fields === '') { - fields = PMA_sprintf(Messages.strEmptyCentralList, '\'' + escapeHtml(db) + '\''); + fields = Functions.sprintf(Messages.strEmptyCentralList, '\'' + Functions.escapeHtml(db) + '\''); search_in = ''; } var seeMore = ''; @@ -3717,7 +3712,7 @@ AJAX.registerOnload('functions.js', function () { '
    '; if (pick) { fields += ''; + Messages.pickColumn + '" onclick="Functions.autoPopulate(\'' + colid + '\',' + i + ')">'; } fields += ''; } @@ -3752,7 +3747,7 @@ AJAX.registerOnload('functions.js', function () { '' + '' + '' + - PMA_getImage('b_drop') + + Functions.getImage('b_drop') + '' ) .find('tr:last') @@ -3775,7 +3770,7 @@ AJAX.registerOnload('functions.js', function () { * the input * @return boolean false if there is no index form, true else */ -function checkIndexName (form_id) { +Functions.checkIndexName = function (form_id) { if ($('#' + form_id).length === 0) { return false; } @@ -3796,7 +3791,7 @@ function checkIndexName (form_id) { } return true; -} // end of the 'checkIndexName()' function +}; AJAX.registerTeardown('functions.js', function () { $(document).off('click', '#index_frm input[type=submit]'); @@ -3838,7 +3833,7 @@ AJAX.registerOnload('functions.js', function () { }); }); -function indexEditorDialog (url, title, callback_success, callback_failure) { +Functions.indexEditorDialog = function (url, title, callback_success, callback_failure) { /* Remove the hidden dialogs if there are*/ var $editIndexDialog = $('#edit_index_dialog'); if ($editIndexDialog.length !== 0) { @@ -3856,8 +3851,8 @@ function indexEditorDialog (url, title, callback_success, callback_failure) { * @var the_form object referring to the export form */ var $form = $('#index_frm'); - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); - PMA_prepareForAjaxRequest($form); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); + Functions.prepareForAjaxRequest($form); // User wants to submit the form $.post($form.attr('action'), $form.serialize() + CommonParams.get('arg_separator') + 'do_save_data=1', function (data) { var $sqlqueryresults = $('.sqlqueryresults'); @@ -3865,8 +3860,8 @@ function indexEditorDialog (url, title, callback_success, callback_failure) { $sqlqueryresults.remove(); } if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxShowMessage(data.message); - PMA_highlightSQL($('.result_query')); + Functions.ajaxShowMessage(data.message); + Functions.highlightSql($('.result_query')); $('.result_query .notice').remove(); /* Reload the field form*/ $('#table_index').remove(); @@ -3894,32 +3889,32 @@ function indexEditorDialog (url, title, callback_success, callback_failure) { if (callback_failure) { callback_failure(); } - PMA_ajaxShowMessage($error, false); + Functions.ajaxShowMessage($error, false); } }); // end $.post() }; button_options[Messages.strPreviewSQL] = function () { // Function for Previewing SQL var $form = $('#index_frm'); - PMA_previewSQL($form); + Functions.previewSql($form); }; button_options[Messages.strCancel] = function () { $(this).dialog('close'); }; - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); $.post('tbl_indexes.php', url, function (data) { if (typeof data !== 'undefined' && data.success === false) { // in the case of an error, show the error message returned. - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); // Show dialog if the request was successful $div .append(data.message) .dialog({ title: title, width: 'auto', - open: PMA_verifyColumnsProperties, + open: Functions.verifyColumnsProperties, modal: true, buttons: button_options, close: function () { @@ -3927,14 +3922,14 @@ function indexEditorDialog (url, title, callback_success, callback_failure) { } }); $div.find('.tblFooters').remove(); - showIndexEditDialog($div); + Functions.showIndexEditDialog($div); } }); // end $.get() -} +}; -function showIndexEditDialog ($outer) { +Functions.showIndexEditDialog = function ($outer) { checkIndexType(); - checkIndexName('index_frm'); + Functions.checkIndexName('index_frm'); var $indexColumns = $('#index_columns'); $indexColumns.find('td').each(function () { $(this).css('width', $(this).width() + 'px'); @@ -3944,8 +3939,8 @@ function showIndexEditDialog ($outer) { containment: $indexColumns.find('tbody'), tolerance: 'pointer' }); - PMA_showHints($outer); - PMA_init_slider(); + Functions.showHints($outer); + Functions.initSlider(); // Add a slider for selecting how many columns to add to the index $outer.find('.slider').slider({ animate: true, @@ -3954,7 +3949,7 @@ function showIndexEditDialog ($outer) { max: 16, slide: function (event, ui) { $(this).closest('fieldset').find('input[type=submit]').val( - PMA_sprintf(Messages.strAddToIndex, ui.value) + Functions.sprintf(Messages.strAddToIndex, ui.value) ); } }); @@ -3973,7 +3968,7 @@ function showIndexEditDialog ($outer) { if (! input.val()) { input.focus(); } -} +}; /** * Function to display tooltips that were @@ -3984,48 +3979,42 @@ function showIndexEditDialog ($outer) { * omit this parameter the function searches * in the whole body **/ -function PMA_showHints ($div) { +Functions.showHints = function ($div) { if ($div === undefined || ! $div instanceof jQuery || $div.length === 0) { $div = $('body'); } $div.find('.pma_hint').each(function () { - PMA_tooltip( + Functions.tooltip( $(this).children('img'), 'img', $(this).children('span').html() ); }); -} +}; AJAX.registerOnload('functions.js', function () { - PMA_showHints(); + Functions.showHints(); }); -function PMA_mainMenuResizerCallback () { +Functions.mainMenuResizerCallback = function () { // 5 px margin for jumping menu in Chrome return $(document.body).width() - 5; -} +}; + // This must be fired only once after the initial page load $(function () { // Initialise the menu resize plugin - $('#topmenu').menuResizer(PMA_mainMenuResizerCallback); + $('#topmenu').menuResizer(Functions.mainMenuResizerCallback); // register resize event $(window).on('resize', function () { $('#topmenu').menuResizer('resize'); }); }); -/** - * Get the row number from the classlist (for example, row_1) - */ -function PMA_getRowNumber (classlist) { - return parseInt(classlist.split(/\s+row_/)[1], 10); -} - /** * Changes status of slider */ -function PMA_set_status_label ($element) { +Functions.setStatusLabel = function ($element) { var text; if ($element.css('display') === 'none') { text = '+ '; @@ -4033,14 +4022,14 @@ function PMA_set_status_label ($element) { text = '- '; } $element.closest('.slide-wrapper').prev().find('span').text(text); -} +}; /** * var toggleButton This is a function that creates a toggle * sliding button given a jQuery reference * to the correct DOM element */ -var toggleButton = function ($obj) { +Functions.toggleButton = function ($obj) { // In rtl mode the toggle switch is flipped horizontally // so we need to take that into account var right; @@ -4114,7 +4103,7 @@ var toggleButton = function ($obj) { } else { $(this).addClass('isActive'); } - var $msg = PMA_ajaxShowMessage(); + var $msg = Functions.ajaxShowMessage(); var $container = $(this); var callback = $('span.callback', this).text(); var operator; @@ -4145,7 +4134,7 @@ var toggleButton = function ($obj) { var parts = url.split('?'); $.post(parts[0], parts[1] + '&ajax_request=true', function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); $container .removeClass(removeClass) .addClass(addClass) @@ -4154,7 +4143,7 @@ var toggleButton = function ($obj) { }); eval(callback); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); $container.removeClass('isActive'); } }); @@ -4175,10 +4164,10 @@ AJAX.registerOnload('functions.js', function () { var $button = $(this).show(); $button.find('img').each(function () { if (this.complete) { - toggleButton($button); + Functions.toggleButton($button); } else { $(this).load(function () { - toggleButton($button); + Functions.toggleButton($button); }); } }); @@ -4221,18 +4210,18 @@ AJAX.registerOnload('functions.js', function () { data: { 'server': CommonParams.get('server') }, - success: PMA_current_version + success: Functions.currentVersion }); } if ($('#is_git_revision').length > 0) { - setTimeout(PMA_display_git_revision, 10); + setTimeout(Functions.displayGitRevision, 10); } /** * Slider effect. */ - PMA_init_slider(); + Functions.initSlider(); var $updateRecentTables = $('#update_recent_tables'); if ($updateRecentTables.length) { @@ -4271,24 +4260,10 @@ AJAX.registerOnload('functions.js', function () { } }); // end of $() -/** - * Submits the form placed in place of a link due to the excessive url length - * - * @param $link anchor - * @returns {Boolean} - */ -function submitFormLink ($link) { - if ($link.attr('href').indexOf('=') !== -1) { - var data = $link.attr('href').substr($link.attr('href').indexOf('#') + 1).split('=', 2); - $link.parents('form').append(''); - } - $link.parents('form').submit(); -} - /** * Initializes slider effect. */ -function PMA_init_slider () { +Functions.initSlider = function () { $('div.pma_auto_slider').each(function () { var $this = $(this); if ($this.data('slider_init_done')) { @@ -4309,22 +4284,22 @@ function PMA_init_slider () { $this[visible ? 'hide' : 'show']('blind', function () { $wrapper.toggle(!visible); $wrapper.parent().toggleClass('print_ignore', visible); - PMA_set_status_label($this); + Functions.setStatusLabel($this); }); return false; }); $this.wrap($wrapper); $this.removeAttr('title'); - PMA_set_status_label($this); + Functions.setStatusLabel($this); $this.data('slider_init_done', 1); }); -} +}; /** * Initializes slider effect. */ AJAX.registerOnload('functions.js', function () { - PMA_init_slider(); + Functions.initSlider(); }); /** @@ -4351,7 +4326,7 @@ AJAX.registerTeardown('functions.js', function () { * * @return bool True on success, false on failure */ -function PMA_slidingMessage (msg, $obj) { +Functions.slidingMessage = function (msg, $obj) { if (msg === undefined || msg.length === 0) { // Don't show an empty message return false; @@ -4380,7 +4355,7 @@ function PMA_slidingMessage (msg, $obj) { $obj .append('
    ' + msg + '
    '); // highlight any sql before taking height; - PMA_highlightSQL($obj); + Functions.highlightSql($obj); $obj.find('div') .first() .hide(); @@ -4398,7 +4373,7 @@ function PMA_slidingMessage (msg, $obj) { $obj.width('100%') .html('
    ' + msg + '
    '); // highlight any sql before taking height; - PMA_highlightSQL($obj); + Functions.highlightSql($obj); var h = $obj .find('div') .first() @@ -4424,7 +4399,7 @@ function PMA_slidingMessage (msg, $obj) { }); } return true; -} // end PMA_slidingMessage() +}; /** * Attach CodeMirror2 editor to SQL edit area. @@ -4436,15 +4411,15 @@ AJAX.registerOnload('functions.js', function () { } if ($elm.length > 0) { if (typeof CodeMirror !== 'undefined') { - codemirror_editor = PMA_getSQLEditor($elm); + codemirror_editor = Functions.getSqlEditor($elm); codemirror_editor.focus(); - codemirror_editor.on('blur', updateQueryParameters); + codemirror_editor.on('blur', Functions.updateQueryParameters); } else { // without codemirror - $elm.focus().on('blur', updateQueryParameters); + $elm.focus().on('blur', Functions.updateQueryParameters); } } - PMA_highlightSQL($('body')); + Functions.highlightSql($('body')); }); AJAX.registerTeardown('functions.js', function () { if (codemirror_editor) { @@ -4491,7 +4466,7 @@ AJAX.registerOnload('functions.js', function () { /** * Return value of a cell in a table. */ -function PMA_getCellValue (td) { +Functions.getCellValue = function (td) { var $td = $(td); if ($td.is('.null')) { return ''; @@ -4503,7 +4478,7 @@ function PMA_getCellValue (td) { } else { return $td.text(); } -} +}; $(window).on('popstate', function (event, data) { $('#printcss').attr('media','print'); @@ -4557,48 +4532,48 @@ AJAX.registerOnload('functions.js', function () { /** * Produce print preview */ -function printPreview () { +Functions.printPreview = function () { $('#printcss').attr('media','all'); - createPrintAndBackButtons(); -} + Functions.createPrintAndBackButtons(); +}; /** * Create print and back buttons in preview page */ -function createPrintAndBackButtons () { +Functions.createPrintAndBackButtons = function () { var back_button = $('',{ type: 'button', value: Messages.back, id: 'back_button_print_view' }); - back_button.on('click', removePrintAndBackButton); + back_button.on('click', Functions.removePrintAndBackButton); back_button.appendTo('#page_content'); var print_button = $('',{ type: 'button', value: Messages.print, id: 'print_button_print_view' }); - print_button.on('click', printPage); + print_button.on('click', Functions.printPage); print_button.appendTo('#page_content'); -} +}; /** * Remove print and back buttons and revert to normal view */ -function removePrintAndBackButton () { +Functions.removePrintAndBackButton = function () { $('#printcss').attr('media','print'); $('#back_button_print_view').remove(); $('#print_button_print_view').remove(); -} +}; /** * Print page */ -function printPage () { +Functions.printPage = function () { if (typeof(window.print) !== 'undefined') { window.print(); } -} +}; /** * Unbind all event handlers before tearing down a page @@ -4611,11 +4586,11 @@ AJAX.registerTeardown('functions.js', function () { }); AJAX.registerOnload('functions.js', function () { - $('input#print').on('click', printPage); + $('input#print').on('click', Functions.printPage); $('.logout').on('click', function () { var form = $( '
    ' + - '' + + '' + '
    ' ); $('body').append(form); @@ -4628,7 +4603,7 @@ AJAX.registerOnload('functions.js', function () { */ $(document).on('click', 'a.create_view.ajax', function (e) { e.preventDefault(); - PMA_createViewDialog($(this)); + Functions.createViewDialog($(this)); }); /** * Attach Ajax event handlers for input fields in the editor @@ -4649,32 +4624,32 @@ AJAX.registerOnload('functions.js', function () { } if ($('textarea[name="view[as]"]').length !== 0) { - codemirror_editor = PMA_getSQLEditor($('textarea[name="view[as]"]')); + codemirror_editor = Functions.getSqlEditor($('textarea[name="view[as]"]')); } }); -function PMA_createViewDialog ($this) { - var $msg = PMA_ajaxShowMessage(); +Functions.createViewDialog = function ($this) { + var $msg = Functions.ajaxShowMessage(); var sep = CommonParams.get('arg_separator'); - var params = getJSConfirmCommonParam(this, $this.getPostData()); + var params = Functions.getJsConfirmCommonParam(this, $this.getPostData()); params += sep + 'ajax_dialog=1'; $.post($this.attr('href'), params, function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); var buttonOptions = {}; buttonOptions[Messages.strGo] = function () { if (typeof CodeMirror !== 'undefined') { codemirror_editor.save(); } - $msg = PMA_ajaxShowMessage(); + $msg = Functions.ajaxShowMessage(); $.post('view_create.php', $('#createViewDialog').find('form').serialize(), function (data) { - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); if (typeof data !== 'undefined' && data.success === true) { $('#createViewDialog').dialog('close'); $('.result_query').html(data.message); PMA_reloadNavigation(); } else { - PMA_ajaxShowMessage(data.error); + Functions.ajaxShowMessage(data.error); } }); }; @@ -4692,13 +4667,13 @@ function PMA_createViewDialog ($this) { } }); // Attach syntax highlighted editor - codemirror_editor = PMA_getSQLEditor($dialog.find('textarea')); + codemirror_editor = Functions.getSqlEditor($dialog.find('textarea')); $('input:visible[type=text]', $dialog).first().focus(); } else { - PMA_ajaxShowMessage(data.error); + Functions.ajaxShowMessage(data.error); } }); -} +}; /** * Makes the breadcrumbs and the menu bar float at the top of the viewport @@ -4739,10 +4714,11 @@ $(function () { }); var checkboxes_sel = 'input.checkall:checkbox:enabled'; + /** * Watches checkboxes in a form to set the checkall box accordingly */ -var checkboxes_changed = function () { +Functions.checkboxesChanged = function () { var $form = $(this.form); // total number of checkboxes in current form var total_boxes = $form.find(checkboxes_sel).length; @@ -4757,7 +4733,8 @@ var checkboxes_changed = function () { $checkall.prop({ checked: false, indeterminate: false }); } }; -$(document).on('change', checkboxes_sel, checkboxes_changed); + +$(document).on('change', checkboxes_sel, Functions.checkboxesChanged); $(document).on('change', 'input.checkall_box', function () { var is_checked = $(this).is(':checked'); @@ -4777,7 +4754,7 @@ $(document).on('click', '.checkall-filter', function () { /** * Watches checkboxes in a sub form to set the sub checkall box accordingly */ -var sub_checkboxes_changed = function () { +Functions.subCheckboxesChanged = function () { var $form = $(this).parent().parent(); // total number of checkboxes in current sub form var total_boxes = $form.find(checkboxes_sel).length; @@ -4792,7 +4769,8 @@ var sub_checkboxes_changed = function () { $checkall.prop({ checked: false, indeterminate: false }); } }; -$(document).on('change', checkboxes_sel + ', input.checkall_box:checkbox:enabled', sub_checkboxes_changed); + +$(document).on('change', checkboxes_sel + ', input.checkall_box:checkbox:enabled', Functions.subCheckboxesChanged); $(document).on('change', 'input.sub_checkall_box', function () { var is_checked = $(this).is(':checked'); @@ -4846,7 +4824,7 @@ AJAX.registerOnload('functions.js', function () { * @param optional subdecimals the number of digits after the point * @param optional pointchar the char to use as decimal point */ -function formatBytes (bytes, subdecimals, pointchar) { +Functions.formatBytes = function (bytes, subdecimals, pointchar) { if (!subdecimals) { subdecimals = 0; } @@ -4861,7 +4839,7 @@ function formatBytes (bytes, subdecimals, pointchar) { bytes = Math.round(bytes * factor) / factor; bytes = bytes.toString().split('.').join(pointchar); return bytes + ' ' + units[i]; -} +}; AJAX.registerOnload('functions.js', function () { /** @@ -4888,7 +4866,7 @@ AJAX.registerOnload('functions.js', function () { /** * Formats timestamp for display */ -function PMA_formatDateTime (date, seconds) { +Functions.formatDateTime = function (date, seconds) { var result = $.datepicker.formatDate('yy-mm-dd', date); var timefmt = 'HH:mm'; if (seconds) { @@ -4901,12 +4879,12 @@ function PMA_formatDateTime (date, seconds) { second: date.getSeconds() } ); -} +}; /** * Check than forms have less fields than max allowed by PHP. */ -function checkNumberOfFields () { +Functions.checkNumberOfFields = function () { if (typeof maxInputVars === 'undefined') { return false; } @@ -4916,15 +4894,15 @@ function checkNumberOfFields () { $('form').each(function () { var nbInputs = $(this).find(':input').length; if (nbInputs > maxInputVars) { - var warning = PMA_sprintf(Messages.strTooManyInputs, maxInputVars); - PMA_ajaxShowMessage(warning); + var warning = Functions.sprintf(Messages.strTooManyInputs, maxInputVars); + Functions.ajaxShowMessage(warning); return false; } return true; }); return true; -} +}; /** * Ignore the displayed php errors. @@ -4934,7 +4912,7 @@ function checkNumberOfFields () { * in $_SESSION['prev_errors'] at server * */ -function PMA_ignorePhpErrors (clearPrevErrors) { +Functions.ignorePhpErrors = function (clearPrevErrors) { if (typeof(clearPrevErrors) === 'undefined' || clearPrevErrors === null ) { @@ -4952,14 +4930,14 @@ function PMA_ignorePhpErrors (clearPrevErrors) { var $pmaErrors = $('#pma_errors'); $pmaErrors.fadeOut('slow'); $pmaErrors.remove(); -} +}; /** * Toggle the Datetimepicker UI if the date value entered * by the user in the 'text box' is not going to be accepted * by the Datetimepicker plugin (but is accepted by MySQL) */ -function toggleDatepickerIfInvalid ($td, $input_field) { +Functions.toggleDatepickerIfInvalid = function ($td, $input_field) { // Regex allowed by the Datetimepicker UI var dtexpDate = new RegExp(['^([0-9]{4})', '-(((01|03|05|07|08|10|12)-((0[1-9])|([1-2][0-9])|(3[0-1])))|((02|04|06|09|11)', @@ -4976,14 +4954,14 @@ function toggleDatepickerIfInvalid ($td, $input_field) { } else { $input_field.datepicker('show'); } -} +}; -/* +/** * Function to submit the login form after validation is done. */ -function recaptchaCallback () { +Functions.recaptchaCallback = function () { $('#login_form').submit(); -} +}; /** * Unbind all event handlers before tearing down a page @@ -5060,7 +5038,7 @@ AJAX.registerOnload('functions.js', function () { * .attr(name, value) - Sets a particular attribute of the IMG * tag to the given value */ -function PMA_getImage (image, alternate, attributes) { +Functions.getImage = function (image, alternate, attributes) { // custom image object, it will eventually be returned by this functions var retval = { data: { @@ -5098,15 +5076,15 @@ function PMA_getImage (image, alternate, attributes) { } // set alt if (attributes.alt !== undefined) { - retval.attr('alt', escapeHtml(attributes.alt)); + retval.attr('alt', Functions.escapeHtml(attributes.alt)); } else { - retval.attr('alt', escapeHtml(alternate)); + retval.attr('alt', Functions.escapeHtml(alternate)); } // set title if (attributes.title !== undefined) { - retval.attr('title', escapeHtml(attributes.title)); + retval.attr('title', Functions.escapeHtml(attributes.title)); } else { - retval.attr('title', escapeHtml(alternate)); + retval.attr('title', Functions.escapeHtml(alternate)); } // set css classes retval.attr('class', 'icon ic_' + image); @@ -5121,7 +5099,7 @@ function PMA_getImage (image, alternate, attributes) { } return retval; -} +}; /** * Sets a configuration value. @@ -5140,7 +5118,7 @@ function PMA_getImage (image, alternate, attributes) { * @param {object} value Configuration value. * @param {boolean} only_local Configuration type. */ -function configSet (key, value, only_local) { +Functions.configSet = function (key, value, only_local) { only_local = (typeof only_local !== 'undefined') ? only_local : false; var serialized = JSON.stringify(value); localStorage.setItem(key, serialized); @@ -5158,15 +5136,15 @@ function configSet (key, value, only_local) { // Updating value in local storage. if (! data.success) { if (data.error) { - PMA_ajaxShowMessage(data.error); + Functions.ajaxShowMessage(data.error); } else { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); } } // Eventually, call callback. } }); -} +}; /** * Gets a configuration value. A configuration value will be searched in @@ -5181,7 +5159,7 @@ function configSet (key, value, only_local) { * * @return {object} Configuration value. */ -function configGet (key, cached) { +Functions.configGet = function (key, cached) { cached = (typeof cached !== 'undefined') ? cached : true; var value = localStorage.getItem(key); if (cached && value !== undefined && value !== null) { @@ -5208,18 +5186,18 @@ function configGet (key, cached) { if (data.success) { localStorage.setItem(key, JSON.stringify(data.value)); } else { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); } // Eventually, call callback. } }); return JSON.parse(localStorage.getItem(key)); -} +}; /** * Return POST data as stored by Util::linkOrButton */ -jQuery.fn.getPostData = function () { +Functions.getPostData = function () { var dataPost = this.attr('data-post'); // Strip possible leading ? if (dataPost !== undefined && dataPost.substring(0,1) === '?') { @@ -5227,3 +5205,4 @@ jQuery.fn.getPostData = function () { } return dataPost; }; +jQuery.fn.getPostData = Functions.getPostData; diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js index 29833515a7..7ccc0648e4 100644 --- a/js/gis_data_editor.js +++ b/js/gis_data_editor.js @@ -58,7 +58,7 @@ function prepareJSVersion () { */ function addDataPoint (pointNumber, prefix) { return '
    ' + - PMA_sprintf(Messages.strPointN, (pointNumber + 1)) + ': ' + + Functions.sprintf(Messages.strPointN, (pointNumber + 1)) + ': ' + '' + '' + '' + @@ -153,7 +153,7 @@ function loadGISEditor (value, field, type, input_name) { initGISEditorVisualization(); prepareJSVersion(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }, 'json'); } @@ -201,7 +201,7 @@ function insertDataAndClose () { if (typeof data !== 'undefined' && data.success === true) { $('input[name=\'' + input_name + '\']').val(data.result); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }, 'json'); closeGISEditor(); @@ -254,7 +254,7 @@ AJAX.registerOnload('gis_data_editor.js', function () { eval(data.openLayers); initGISEditorVisualization(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }, 'json'); }); @@ -273,7 +273,7 @@ AJAX.registerOnload('gis_data_editor.js', function () { initGISEditorVisualization(); prepareJSVersion(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }, 'json'); }); diff --git a/js/import.js b/js/import.js index 38fae9c92f..2cec037c74 100644 --- a/js/import.js +++ b/js/import.js @@ -68,19 +68,19 @@ AJAX.registerOnload('import.js', function () { if (radioImport.is(':checked') && $('#input_import_file').val() === '') { $('#input_import_file').trigger('focus'); - PMA_ajaxShowMessage(fileMsg, false); + Functions.ajaxShowMessage(fileMsg, false); return false; } if (radioLocalImport.is(':checked')) { if ($('#select_local_import_file').length === 0) { - PMA_ajaxShowMessage('
    ' + Messages.strNoImportFile + '
    ', false); + Functions.ajaxShowMessage('
    ' + Messages.strNoImportFile + '
    ', false); return false; } if ($('#select_local_import_file').val() === '') { $('#select_local_import_file').trigger('focus'); - PMA_ajaxShowMessage(fileMsg, false); + Functions.ajaxShowMessage(fileMsg, false); return false; } } @@ -88,20 +88,20 @@ AJAX.registerOnload('import.js', function () { // local upload. if ($('#input_import_file').val() === '') { $('#input_import_file').trigger('focus'); - PMA_ajaxShowMessage(fileMsg, false); + Functions.ajaxShowMessage(fileMsg, false); return false; } if ($('#text_csv_new_tbl_name').length > 0) { var newTblName = $('#text_csv_new_tbl_name').val(); if (newTblName.length > 0 && $.trim(newTblName).length === 0) { - PMA_ajaxShowMessage(wrongTblNameMsg, false); + Functions.ajaxShowMessage(wrongTblNameMsg, false); return false; } } if ($('#text_csv_new_db_name').length > 0) { var newDBName = $('#text_csv_new_db_name').val(); if (newDBName.length > 0 && $.trim(newDBName).length === 0) { - PMA_ajaxShowMessage(wrongDBNameMsg, false); + Functions.ajaxShowMessage(wrongDBNameMsg, false); return false; } } diff --git a/js/indexes.js b/js/indexes.js index 69763a464e..2c2b2fc63f 100644 --- a/js/indexes.js +++ b/js/indexes.js @@ -346,7 +346,7 @@ function PMA_showAddIndexDialog (source_array, array_index, target_columns, col_ col_index ); } else { - PMA_ajaxShowMessage( + Functions.ajaxShowMessage( '
    ' + Messages.strMissingColumn + '
    ', false @@ -371,13 +371,13 @@ function PMA_showAddIndexDialog (source_array, array_index, target_columns, col_ } $(this).dialog('close'); }; - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); $.post('tbl_indexes.php', post_data, function (data) { if (data.success === false) { // in the case of an error, show the error message returned. - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } else { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); if (showDialog) { // Show dialog if the request was successful if ($('#addIndex').length > 0) { @@ -391,9 +391,9 @@ function PMA_showAddIndexDialog (source_array, array_index, target_columns, col_ width: 450, minHeight: 250, open: function () { - checkIndexName('index_frm'); - PMA_showHints($div); - PMA_init_slider(); + Functions.checkIndexName('index_frm'); + Functions.showHints($div); + Functions.initSlider(); $('#index_columns').find('td').each(function () { $(this).css('width', $(this).width() + 'px'); }); @@ -433,7 +433,7 @@ function PMA_showAddIndexDialog (source_array, array_index, target_columns, col_ col_index ); } else { - PMA_ajaxShowMessage( + Functions.ajaxShowMessage( '
    ' + Messages.strMissingColumn + '
    ', false @@ -484,7 +484,7 @@ function PMA_indexTypeSelectionDialog (source_array, index_choice, col_index) { if ($('#composite_index').is(':checked')) { if ($('input[name="composite_with"]').length !== 0 && $('input[name="composite_with"]:checked').length === 0 ) { - PMA_ajaxShowMessage( + Functions.ajaxShowMessage( '
    ' + Messages.strFormEmpty + @@ -583,12 +583,12 @@ AJAX.registerOnload('indexes.js', function () { // for table creation form var $engine_selector = $('.create_table_form select[name=tbl_storage_engine]'); if ($engine_selector.length) { - PMA_hideShowConnection($engine_selector); + Functions.hideShowConnection($engine_selector); } var $form = $('#index_frm'); if ($form.length > 0) { - showIndexEditDialog($form); + Functions.showIndexEditDialog($form); } $(document).on('click', '#save_index_frm', function (event) { @@ -596,20 +596,20 @@ AJAX.registerOnload('indexes.js', function () { var $form = $('#index_frm'); var argsep = CommonParams.get('arg_separator'); var submitData = $form.serialize() + argsep + 'do_save_data=1' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true'; - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); }); $(document).on('click', '#preview_index_frm', function (event) { event.preventDefault(); - PMA_previewSQL($('#index_frm')); + Functions.previewSql($('#index_frm')); }); $(document).on('change', '#select_index_choice', function (event) { event.preventDefault(); checkIndexType(); - checkIndexName('index_frm'); + Functions.checkIndexName('index_frm'); }); /** @@ -630,18 +630,18 @@ AJAX.registerOnload('indexes.js', function () { $rows_to_hide = $rows_to_hide.add($last_row); } - var question = escapeHtml( + var question = Functions.escapeHtml( $curr_row.children('td') .children('.drop_primary_key_index_msg') .val() ); - PMA_confirmPreviewSQL(question, $anchor.attr('href'), function (url) { - var $msg = PMA_ajaxShowMessage(Messages.strDroppingPrimaryKeyIndex, false); - var params = getJSConfirmCommonParam(this, $anchor.getPostData()); + Functions.confirmPreviewSql(question, $anchor.attr('href'), function (url) { + var $msg = Functions.ajaxShowMessage(Messages.strDroppingPrimaryKeyIndex, false); + var params = Functions.getJsConfirmCommonParam(this, $anchor.getPostData()); $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); var $table_ref = $rows_to_hide.closest('table'); if ($rows_to_hide.length === $table_ref.find('tbody > tr').length) { // We are about to remove all rows from the table @@ -663,14 +663,14 @@ AJAX.registerOnload('indexes.js', function () { $('
    ') .html(data.sql_query) .prependTo('#structure_content'); - PMA_highlightSQL($('#page_content')); + Functions.highlightSql($('#page_content')); } CommonActions.refreshMain(false, function () { $('a.ajax[href^=#indexes]').trigger('click'); }); PMA_reloadNavigation(); } else { - PMA_ajaxShowMessage(Messages.strErrorProcessingRequest + ' : ' + data.error, false); + Functions.ajaxShowMessage(Messages.strErrorProcessingRequest + ' : ' + data.error, false); } }); // end $.post() }); // end $.PMA_confirm() @@ -685,7 +685,7 @@ AJAX.registerOnload('indexes.js', function () { var title; if ($(this).find('a').length === 0) { // Add index - var valid = checkFormElementInRange( + var valid = Functions.checkFormElementInRange( $(this).closest('form')[0], 'added_fields', 'Column count has to be larger than zero.' @@ -701,7 +701,7 @@ AJAX.registerOnload('indexes.js', function () { title = Messages.strEditIndex; } url += CommonParams.get('arg_separator') + 'ajax_request=true'; - indexEditorDialog(url, title, function () { + Functions.indexEditorDialog(url, title, function () { // refresh the page using ajax CommonActions.refreshMain(false, function () { $('a.ajax[href^=#indexes]').trigger('click'); diff --git a/js/makegrid.js b/js/makegrid.js index 6c256c08df..920836814e 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -390,7 +390,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd var $temp_div = $(document.createElement('div')); $temp_div.html(data.error); $temp_div.addClass('error'); - PMA_ajaxShowMessage($temp_div, false); + Functions.ajaxShowMessage($temp_div, false); } }); } @@ -599,7 +599,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd height: $cell.outerHeight() }); // fill the cell edit with text from - var value = PMA_getCellValue(cell); + var value = Functions.getCellValue(cell); if ($cell.attr('data-type') === 'json' && $cell.is('.truncated') === false) { try { value = JSON.stringify(JSON.parse(value), null, 4); @@ -675,7 +675,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd } // Add
    before carriage return. - new_html = escapeHtml(value); + new_html = Functions.escapeHtml(value); new_html = new_html.replace(/\n/g, '
    \n'); // remove decimal places if column type not supported @@ -695,7 +695,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd // Updates the code keeping highlighting (if any). var $target = $this_field.find(selector); - if (!PMA_updateCode($target, new_html, value)) { + if (!Functions.updateCode($target, new_html, value)) { $target.html(new_html); } } @@ -1017,7 +1017,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd $td.data('original_data', data.value); $(g.cEdit).find('.edit_box').val(data.value); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() } @@ -1059,7 +1059,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd } // add datetime picker - PMA_addDatepicker($input_field, $td.attr('data-type'), { + Functions.addDatepicker($input_field, $td.attr('data-type'), { showMillisec: showMillisec, showMicrosec: showMicrosec, timeFormat: timeFormat @@ -1073,12 +1073,12 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd g.saveOrPostEditedCell(); } else if (e.which === 27) { } else { - toggleDatepickerIfInvalid($td, $input_field); + Functions.toggleDatepickerIfInvalid($td, $input_field); } }); $input_field.datepicker('show'); - toggleDatepickerIfInvalid($td, $input_field); + Functions.toggleDatepickerIfInvalid($td, $input_field); // unbind the mousedown event to prevent the problem of // datepicker getting closed, needs to be checked for any @@ -1323,7 +1323,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd } if (typeof data !== 'undefined' && data.success === true) { if (typeof options === 'undefined' || ! options.move) { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); } // update where_clause related data in each edited row @@ -1343,7 +1343,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd $(this).removeAttr('onclick') .off('click') .on('click', function () { - return confirmLink(this, 'DELETE FROM `' + g.db + '`.`' + g.table + '` WHERE ' + + return Functions.confirmLink(this, 'DELETE FROM `' + g.db + '`.`' + g.table + '` WHERE ' + decoded_new_clause + (is_unique ? '' : ' LIMIT 1')); }); } @@ -1376,7 +1376,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd } else { $existing_query.append(sqlOuter + tools); } - PMA_highlightSQL($existing_query); + Functions.highlightSql($existing_query); } } // hide and/or update the successfully saved cells @@ -1392,7 +1392,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd g.isCellEdited = false; } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); if (!g.saveCellsAtOnce) { $(g.t).find('.to_be_saved') .removeClass('to_be_saved'); @@ -1460,13 +1460,13 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd this_field_params[field_name] = $(g.cEdit).find('.edit_box').val(); } else { var hexError = '
    ' + Messages.strEnterValidHex + '
    '; - PMA_ajaxShowMessage(hexError, false); - this_field_params[field_name] = PMA_getCellValue(g.currentEditCell); + Functions.ajaxShowMessage(hexError, false); + this_field_params[field_name] = Functions.getCellValue(g.currentEditCell); } } else { this_field_params[field_name] = $(g.cEdit).find('.edit_box').val(); } - if (g.wasEditedCellNull || this_field_params[field_name] !== PMA_getCellValue(g.currentEditCell)) { + if (g.wasEditedCellNull || this_field_params[field_name] !== Functions.getCellValue(g.currentEditCell)) { need_to_post = true; } } @@ -1696,7 +1696,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd // make sure we have more than one column if ($firstRowCols.length > 1) { var $colVisibTh = $(g.t).find('th:not(.draggable)'); - PMA_tooltip( + Functions.tooltip( $colVisibTh, 'th', Messages.strColVisibHint @@ -2116,7 +2116,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd // add hint for grid editing feature when hovering "Edit" link in each table row if (Messages.strGridEditFeatureHint !== undefined) { - PMA_tooltip( + Functions.tooltip( $(g.t).find('.edit_row_anchor a'), 'a', Messages.strGridEditFeatureHint @@ -2212,7 +2212,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd } // create tooltip for each with draggable class - PMA_tooltip( + Functions.tooltip( $(t).find('th.draggable'), 'th', g.updateHint() diff --git a/js/menu-resizer.js b/js/menu-resizer.js index 15e1da7e3d..20491605d7 100644 --- a/js/menu-resizer.js +++ b/js/menu-resizer.js @@ -30,8 +30,8 @@ $('#pma_navigation_resizer').css({ 'width': '0px' }); } // Sets the image for the left and right scroll indicator - $('.scrollindicator--left').html($(PMA_getImage('b_left').toString())); - $('.scrollindicator--right').html($(PMA_getImage('b_right').toString())); + $('.scrollindicator--left').html($(Functions.getImage('b_left').toString())); + $('.scrollindicator--right').html($(Functions.getImage('b_right').toString())); // Set the width of the navigation bar without scroll indicator $('.navigationbar').css({ 'width': widthCalculator.call($container) - 60 }); @@ -50,7 +50,7 @@ .on('click', false); // same as event.preventDefault() var img = $container.find('li img'); if (img.length) { - $(PMA_getImage('b_more').toString()).prependTo(link); + $(Functions.getImage('b_more').toString()).prependTo(link); } var $submenu = $('
  • ', { 'class': 'submenu' }) .append(link) diff --git a/js/microhistory.js b/js/microhistory.js index 72141bcb05..ea247d55a9 100644 --- a/js/microhistory.js +++ b/js/microhistory.js @@ -90,7 +90,7 @@ PMA_MicroHistory = { typeof this.pages[index].menu === 'undefined' || ! PMA_MicroHistory.menus.get(this.pages[index].menu) ) { - PMA_ajaxShowMessage( + Functions.ajaxShowMessage( '
    ' + Messages.strInvalidPage + '
    ', false ); @@ -216,7 +216,7 @@ PMA_MicroHistory = { // Remove duplicate wrapper // TODO: don't send it in the response .children().first().remove(); - $('#topmenu').menuResizer(PMA_mainMenuResizerCallback); + $('#topmenu').menuResizer(Functions.mainMenuResizerCallback); } } }; diff --git a/js/multi_column_sort.js b/js/multi_column_sort.js index 725fa5e202..ad9b307d3f 100644 --- a/js/multi_column_sort.js +++ b/js/multi_column_sort.js @@ -64,14 +64,14 @@ AJAX.registerOnload('keyhandler.js', function () { var params = removeColumnFromMultiSort(url, $(this).parent()); if (params) { AJAX.source = $(this); - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); params += argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true'; $.post('sql.php', params, AJAX.responseHandler); } } else if (event.shiftKey) { event.preventDefault(); AJAX.source = $(this); - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); var params = url.substring(url.indexOf('?') + 1); params += argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true'; $.post('sql.php', params, AJAX.responseHandler); diff --git a/js/navigation.js b/js/navigation.js index 26f99dcaca..ee6e26a87d 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -196,7 +196,7 @@ function loadChildNodes (isNode, $expandElem, callback) { $throbber.hide(); var $icon = $expandElem.find('img.ic_b_plus'); $icon.show(); - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); } @@ -498,7 +498,7 @@ $(function () { $(this).attr('href').indexOf('?') + 1 ) + CommonParams.get('arg_separator') + 'ajax_request=true'; var title = Messages.strAddIndex; - indexEditorDialog(url, title); + Functions.indexEditorDialog(url, title); }); /** Edit index */ @@ -508,13 +508,13 @@ $(function () { $(this).attr('href').indexOf('?') + 1 ) + CommonParams.get('arg_separator') + 'ajax_request=true'; var title = Messages.strEditIndex; - indexEditorDialog(url, title); + Functions.indexEditorDialog(url, title); }); /** New view */ $(document).on('click', 'li.new_view a.ajax', function (event) { event.preventDefault(); - PMA_createViewDialog($(this)); + Functions.createViewDialog($(this)); }); /** Hide navigation tree item */ @@ -531,7 +531,7 @@ $(function () { if (typeof data !== 'undefined' && data.success === true) { PMA_reloadNavigation(); } else { - PMA_ajaxShowMessage(data.error); + Functions.ajaxShowMessage(data.error); } } }); @@ -540,13 +540,13 @@ $(function () { /** Display a dialog to choose hidden navigation items to show */ $(document).on('click', 'a.showUnhide.ajax', function (event) { event.preventDefault(); - var $msg = PMA_ajaxShowMessage(); + var $msg = Functions.ajaxShowMessage(); var argSep = CommonParams.get('arg_separator'); var params = $(this).getPostData(); params += argSep + 'ajax_request=true'; $.post($(this).attr('href'), params, function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); var buttonOptions = {}; buttonOptions[Messages.strClose] = function () { $(this).dialog('close'); @@ -565,7 +565,7 @@ $(function () { } }); } else { - PMA_ajaxShowMessage(data.error); + Functions.ajaxShowMessage(data.error); } }); }); @@ -576,7 +576,7 @@ $(function () { var $tr = $(this).parents('tr'); var $hidden_table_count = $tr.parents('tbody').children().length; var $hide_dialog_box = $tr.closest('div.ui-dialog'); - var $msg = PMA_ajaxShowMessage(); + var $msg = Functions.ajaxShowMessage(); var argSep = CommonParams.get('arg_separator'); var params = $(this).getPostData(); params += argSep + 'ajax_request=true' + argSep + 'server=' + CommonParams.get('server'); @@ -585,7 +585,7 @@ $(function () { data: params, url: $(this).attr('href'), success: function (data) { - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); if (typeof data !== 'undefined' && data.success === true) { $tr.remove(); if ($hidden_table_count === 1) { @@ -593,7 +593,7 @@ $(function () { } PMA_reloadNavigation(); } else { - PMA_ajaxShowMessage(data.error); + Functions.ajaxShowMessage(data.error); } } }); @@ -625,7 +625,7 @@ $(function () { if (data.changes) { $('#pma_favorite_list').html(data.list); $('#' + anchor_id).parent().html(data.anchor); - PMA_tooltip( + Functions.tooltip( $('#' + anchor_id), 'a', $('#' + anchor_id).attr('title') @@ -635,7 +635,7 @@ $(function () { window.localStorage.favorite_tables = data.favorite_tables; } } else { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); } } }); @@ -710,7 +710,7 @@ function expandTreeNode ($expandElem, callback) { } PMA_showFullName($destination); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } $icon.show(); $throbber.remove(); @@ -987,7 +987,7 @@ function PMA_ensureNaviSettings (selflink) { setupConfigTabs(); $('#pma_navigation_settings').find('form').attr('action', selflink); } else { - PMA_ajaxShowMessage(data.error); + Functions.ajaxShowMessage(data.error); } }); } else { @@ -1033,7 +1033,7 @@ function PMA_reloadNavigation (callback, paths) { } navTreeStateUpdate(); } else { - PMA_ajaxShowMessage(data.error); + Functions.ajaxShowMessage(data.error); } }); } @@ -1065,7 +1065,7 @@ function PMA_selectCurrentDb () { * @return void */ function PMA_navigationTreePagination ($this) { - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); var isDbSelector = $this.closest('div.pageselector').is('.dbselector'); var url; var params; @@ -1090,7 +1090,7 @@ function PMA_navigationTreePagination ($this) { } $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); if (isDbSelector) { var val = PMA_fastFilter.getSearchClause(); $('#pma_navigation_tree') @@ -1119,8 +1119,8 @@ function PMA_navigationTreePagination ($this) { ); } } else { - PMA_ajaxShowMessage(data.error); - PMA_handleRedirectAndReload(data); + Functions.ajaxShowMessage(data.error); + Functions.handleRedirectAndReload(data); } navTreeStateUpdate(); }); @@ -1258,7 +1258,7 @@ var ResizeHandler = function () { */ this.mouseup = function (event) { $('body').css('cursor', ''); - configSet('NavigationWidth', event.data.resize_handler.getPos(event)); + Functions.configSet('NavigationWidth', event.data.resize_handler.getPos(event)); $('#topmenu').menuResizer('resize'); $(document) .off('mousemove') @@ -1293,7 +1293,7 @@ var ResizeHandler = function () { if (width === 0 && panel_width === 0) { panel_width = 240; } - configSet('NavigationWidth', panel_width); + Functions.configSet('NavigationWidth', panel_width); event.data.resize_handler.setWidth(panel_width); event.data.resize_handler.panel_width = width; }; @@ -1326,7 +1326,7 @@ var ResizeHandler = function () { if ($(window).width() < 768) { this.setWidth(0); } else { - this.setWidth(configGet('NavigationWidth', false)); + this.setWidth(Functions.configGet('NavigationWidth', false)); $('#topmenu').menuResizer('resize'); } // Register the events for the resizer and the collapser diff --git a/js/normalization.js b/js/normalization.js index b57238f17c..da98eed9fc 100644 --- a/js/normalization.js +++ b/js/normalization.js @@ -110,7 +110,7 @@ function goToFinish1NF () { } $('#mainContent legend').html(Messages.strEndStep); $('#mainContent h4').html( - '

    ' + PMA_sprintf(Messages.strFinishMsg, escapeHtml(CommonParams.get('table'))) + '

    ' + '

    ' + Functions.sprintf(Messages.strFinishMsg, Functions.escapeHtml(CommonParams.get('table'))) + '

    ' ); $('#mainContent p').html(''); $('#mainContent #extra').html(''); @@ -135,7 +135,7 @@ function goToStep4 () { $('#mainContent #newCols').html(''); $('.tblFooters').html(''); for (var pk in primary_key) { - $('#extra input[value=\'' + escapeJsString(primary_key[pk]) + '\']').attr('disabled','disabled'); + $('#extra input[value=\'' + Functions.escapeJsString(primary_key[pk]) + '\']').attr('disabled','disabled'); } } ); @@ -159,7 +159,7 @@ function goToStep3 () { $('.tblFooters').html(''); primary_key = JSON.parse(data.primary_key); for (var pk in primary_key) { - $('#extra input[value=\'' + escapeJsString(primary_key[pk]) + '\']').attr('disabled','disabled'); + $('#extra input[value=\'' + Functions.escapeJsString(primary_key[pk]) + '\']').attr('disabled','disabled'); } } ); @@ -232,11 +232,11 @@ function goTo2NFFinish (pd) { $('#mainContent #extra').html(''); $('.tblFooters').html(''); } else { - PMA_ajaxShowMessage(data.extra, false); + Functions.ajaxShowMessage(data.extra, false); } $('#pma_navigation_reload').trigger('click'); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } } }); @@ -272,11 +272,11 @@ function goTo3NFFinish (newTables) { $('#mainContent #extra').html(''); $('.tblFooters').html(''); } else { - PMA_ajaxShowMessage(data.extra, false); + Functions.ajaxShowMessage(data.extra, false); } $('#pma_navigation_reload').trigger('click'); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } } }); @@ -292,7 +292,7 @@ function goTo2NFStep2 (pd, primary_key) { for (var dependson in pd) { if (dependson !== primary_key) { pdFound = true; - extra += '

    ' + escapeHtml(dependson) + ' -> ' + escapeHtml(pd[dependson].toString()) + '

    '; + extra += '

    ' + Functions.escapeHtml(dependson) + ' -> ' + Functions.escapeHtml(pd[dependson].toString()) + '

    '; } } if (!pdFound) { @@ -316,7 +316,7 @@ function goTo2NFStep2 (pd, primary_key) { if (data.success === true) { extra += data.message; } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } } }); @@ -340,7 +340,7 @@ function goTo3NFStep2 (pd, tablesTds) { dependson = tablesTds[table][i]; if (dependson !== '' && dependson !== table) { pdFound = true; - extra += '

    ' + escapeHtml(dependson) + ' -> ' + escapeHtml(pd[dependson].toString()) + '

    '; + extra += '

    ' + Functions.escapeHtml(dependson) + ' -> ' + Functions.escapeHtml(pd[dependson].toString()) + '

    '; } } } @@ -366,7 +366,7 @@ function goTo3NFStep2 (pd, tablesTds) { if (data.success === true) { extra += data_parsed.html; } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } } }); @@ -461,10 +461,10 @@ function moveRepeatingGroup (repeatingCols) { if (data.queryError === false) { goToStep3(); } - PMA_ajaxShowMessage(data.message, false); + Functions.ajaxShowMessage(data.message, false); $('#pma_navigation_reload').trigger('click'); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } } }); @@ -559,13 +559,13 @@ AJAX.registerOnload('normalization.js', function () { $('#newCols').html(''); $('.tblFooters').html(''); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } selectedCol = ''; } ); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); }); @@ -597,7 +597,7 @@ AJAX.registerOnload('normalization.js', function () { }) .appendTo('.tblFooters'); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } } ); @@ -618,7 +618,7 @@ AJAX.registerOnload('normalization.js', function () { goToStep3(); }, 2000); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); }); @@ -642,7 +642,7 @@ AJAX.registerOnload('normalization.js', function () { if (data.success === true) { goToStep2('goToFinish1NF'); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } } ); @@ -656,9 +656,9 @@ AJAX.registerOnload('normalization.js', function () { if (repeatingCols !== '') { var newColName = $('#extra input[type=checkbox]:checked:first').val(); repeatingCols = repeatingCols.slice(0, -2); - var confirmStr = PMA_sprintf(Messages.strMoveRepeatingGroup, escapeHtml(repeatingCols), escapeHtml(CommonParams.get('table'))); + var confirmStr = Functions.sprintf(Messages.strMoveRepeatingGroup, Functions.escapeHtml(repeatingCols), Functions.escapeHtml(CommonParams.get('table'))); confirmStr += '' + - '( ' + escapeHtml(primary_key.toString()) + ', )' + + '( ' + Functions.escapeHtml(primary_key.toString()) + ', )' + ''; $('#newCols').html(confirmStr); @@ -689,7 +689,7 @@ AJAX.registerOnload('normalization.js', function () { ajax_request: true }; var title = Messages.strAddPrimaryKey; - indexEditorDialog(url, title, function () { + Functions.indexEditorDialog(url, title, function () { // on success $('.sqlqueryresults').remove(); $('.result_query').remove(); diff --git a/js/replication.js b/js/replication.js index bbd25d3ffe..1b46950704 100644 --- a/js/replication.js +++ b/js/replication.js @@ -84,9 +84,9 @@ AJAX.registerOnload('replication.js', function () { var $anchor = $(this); var question = Messages.strResetSlaveWarning; $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) { - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $anchor; - var params = getJSConfirmCommonParam({ + var params = Functions.getJsConfirmCommonParam({ 'ajax_page_request': true, 'ajax_request': true }, $anchor.getPostData()); diff --git a/js/rte.js b/js/rte.js index a90ccaa55c..bb519e559a 100644 --- a/js/rte.js +++ b/js/rte.js @@ -114,7 +114,7 @@ RTE.COMMON = { }, // end postDialogShow() exportDialog: function ($this) { - var $msg = PMA_ajaxShowMessage(); + var $msg = Functions.ajaxShowMessage(); if ($this.hasClass('mult_submit')) { var combined = { success: true, @@ -129,7 +129,7 @@ RTE.COMMON = { // No routine is exportable (due to privilege issues) if (count === 0) { - PMA_ajaxShowMessage(Messages.NoExportable); + Functions.ajaxShowMessage(Messages.NoExportable); } export_anchors.each(function () { @@ -153,11 +153,11 @@ RTE.COMMON = { } else { $.get($this.attr('href'), { 'ajax_request': true }, showExport); } - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); function showExport (data) { if (data.success === true) { - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); /** * @var button_options Object containing options * for jQueryUI dialog buttons @@ -181,9 +181,9 @@ RTE.COMMON = { * to the Export textarea. */ var $elm = $ajaxDialog.find('textarea'); - PMA_getSQLEditor($elm); + Functions.getSqlEditor($elm); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } } // end showExport() }, // end exportDialog() @@ -205,11 +205,11 @@ RTE.COMMON = { * @var $msg jQuery object containing the reference to * the AJAX message shown to the user */ - var $msg = PMA_ajaxShowMessage(); + var $msg = Functions.ajaxShowMessage(); $.get($this.attr('href'), { 'ajax_request': true }, function (data) { if (data.success === true) { // We have successfully fetched the editor form - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); // Now define the function that is called when // the user presses the "Go" button that.buttonOptions[Messages.strGo] = function () { @@ -224,15 +224,15 @@ RTE.COMMON = { * @var data Form data to be sent in the AJAX request */ var data = $('form.rte_form').last().serialize(); - $msg = PMA_ajaxShowMessage( + $msg = Functions.ajaxShowMessage( Messages.strProcessingRequest ); var url = $('form.rte_form').last().attr('action'); $.post(url, data, function (data) { if (data.success === true) { // Item created successfully - PMA_ajaxRemoveMessage($msg); - PMA_slidingMessage(data.message); + Functions.ajaxRemoveMessage($msg); + Functions.slidingMessage(data.message); that.$ajaxDialog.dialog('close'); // If we are in 'edit' mode, we must // remove the reference to the old row. @@ -322,7 +322,7 @@ RTE.COMMON = { } PMA_reloadNavigation(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() } // end "if (that.validate())" @@ -346,10 +346,10 @@ RTE.COMMON = { } $(this).find('input[name=item_name]').focus(); $(this).find('input.datefield').each(function () { - PMA_addDatepicker($(this).css('width', '95%'), 'date'); + Functions.addDatepicker($(this).css('width', '95%'), 'date'); }); $(this).find('input.datetimefield').each(function () { - PMA_addDatepicker($(this).css('width', '95%'), 'datetime'); + Functions.addDatepicker($(this).css('width', '95%'), 'datetime'); }); $.datepicker.initialized = false; }, @@ -373,12 +373,12 @@ RTE.COMMON = { var $elm = $('textarea[name=item_definition]').last(); var linterOptions = {}; linterOptions[that.editorType + '_editor'] = true; - that.syntaxHiglighter = PMA_getSQLEditor($elm, {}, null, linterOptions); + that.syntaxHiglighter = Functions.getSqlEditor($elm, {}, null, linterOptions); // Execute item-specific code that.postDialogShow(data); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.get() }, @@ -400,8 +400,8 @@ RTE.COMMON = { * @var msg jQuery object containing the reference to * the AJAX message shown to the user */ - var $msg = PMA_ajaxShowMessage(Messages.strProcessingRequest); - var params = getJSConfirmCommonParam(this, $this.getPostData()); + var $msg = Functions.ajaxShowMessage(Messages.strProcessingRequest); + var params = Functions.getJsConfirmCommonParam(this, $this.getPostData()); $.post(url, params, function (data) { if (data.success === true) { /** @@ -444,12 +444,12 @@ RTE.COMMON = { }); } // Get rid of the "Loading" message - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); // Show the query that we just executed - PMA_slidingMessage(data.sql_query); + Functions.slidingMessage(data.sql_query); PMA_reloadNavigation(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() }); // end $.PMA_confirm() @@ -462,7 +462,7 @@ RTE.COMMON = { * @var msg jQuery object containing the reference to * the AJAX message shown to the user */ - var $msg = PMA_ajaxShowMessage(Messages.strProcessingRequest); + var $msg = Functions.ajaxShowMessage(Messages.strProcessingRequest); // drop anchors of all selected rows var drop_anchors = $('input.checkall:checked').parents('tr').find('.drop_anchor'); @@ -476,7 +476,7 @@ RTE.COMMON = { * @var $curr_row Object containing reference to the current row */ var $curr_row = $anchor.parents('tr'); - var params = getJSConfirmCommonParam(this, $anchor.getPostData()); + var params = Functions.getJsConfirmCommonParam(this, $anchor.getPostData()); $.post($anchor.attr('href'), params, function (data) { returnCount++; if (data.success === true) { @@ -522,13 +522,13 @@ RTE.COMMON = { if (returnCount === count) { if (success) { // Get rid of the "Loading" message - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); $('#rteListForm_checkall').prop({ checked: false, indeterminate: false }); } PMA_reloadNavigation(); } } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); success = false; if (returnCount === count) { PMA_reloadNavigation(); @@ -822,11 +822,11 @@ RTE.ROUTINE = { * @var msg jQuery object containing the reference to * the AJAX message shown to the user */ - var $msg = PMA_ajaxShowMessage(); - var params = getJSConfirmCommonParam($this[0], $this.getPostData()); + var $msg = Functions.ajaxShowMessage(); + var params = Functions.getJsConfirmCommonParam($this[0], $this.getPostData()); $.post($this.attr('href'), params, function (data) { if (data.success === true) { - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); // If 'data.dialog' is true we show a dialog with a form // to get the input parameters for routine, otherwise // we just show the results of the query @@ -838,17 +838,17 @@ RTE.ROUTINE = { * @var data Form data to be sent in the AJAX request */ var data = $('form.rte_form').last().serialize(); - $msg = PMA_ajaxShowMessage( + $msg = Functions.ajaxShowMessage( Messages.strProcessingRequest ); $.post('db_routines.php', data, function (data) { if (data.success === true) { // Routine executed successfully - PMA_ajaxRemoveMessage($msg); - PMA_slidingMessage(data.message); + Functions.ajaxRemoveMessage($msg); + Functions.slidingMessage(data.message); $ajaxDialog.dialog('close'); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); }; @@ -872,7 +872,7 @@ RTE.ROUTINE = { * Attach the datepickers to the relevant form fields */ $ajaxDialog.find('input.datefield, input.datetimefield').each(function () { - PMA_addDatepicker($(this).css('width', '95%')); + Functions.addDatepicker($(this).css('width', '95%')); }); /* * Define the function if the user presses enter @@ -884,29 +884,29 @@ RTE.ROUTINE = { * @var data Form data to be sent in the AJAX request */ var data = $(this).serialize(); - $msg = PMA_ajaxShowMessage( + $msg = Functions.ajaxShowMessage( Messages.strProcessingRequest ); var url = $(this).attr('action'); $.post(url, data, function (data) { if (data.success === true) { // Routine executed successfully - PMA_ajaxRemoveMessage($msg); - PMA_slidingMessage(data.message); + Functions.ajaxRemoveMessage($msg); + Functions.slidingMessage(data.message); $('form.rte_form').off('keyup'); $ajaxDialog.remove(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); } }); } else { // Routine executed successfully - PMA_slidingMessage(data.message); + Functions.slidingMessage(data.message); } } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() } diff --git a/js/server_databases.js b/js/server_databases.js index fe1aef9950..f13115cf46 100644 --- a/js/server_databases.js +++ b/js/server_databases.js @@ -39,10 +39,10 @@ AJAX.registerOnload('server_databases.js', function () { // loop over all checked checkboxes, except the .checkall_box checkbox $form.find('input:checkbox:checked:not(.checkall_box)').each(function () { $(this).closest('tr').addClass('removeMe'); - selected_dbs[selected_dbs.length] = 'DROP DATABASE `' + escapeHtml($(this).val()) + '`;'; + selected_dbs[selected_dbs.length] = 'DROP DATABASE `' + Functions.escapeHtml($(this).val()) + '`;'; }); if (! selected_dbs.length) { - PMA_ajaxShowMessage( + Functions.ajaxShowMessage( $('
    ').text( Messages.strNoDatabasesSelected ), @@ -54,7 +54,7 @@ AJAX.registerOnload('server_databases.js', function () { * @var question String containing the question to be asked for confirmation */ var question = Messages.strDropDatabaseStrongWarning + ' ' + - PMA_sprintf(Messages.strDoYouReally, selected_dbs.join('
    ')); + Functions.sprintf(Messages.strDoYouReally, selected_dbs.join('
    ')); var argsep = CommonParams.get('arg_separator'); $(this).PMA_confirm( @@ -62,14 +62,14 @@ AJAX.registerOnload('server_databases.js', function () { $form.prop('action') + '?' + $(this).serialize() + argsep + 'drop_selected_dbs=1', function (url) { - PMA_ajaxShowMessage(Messages.strProcessingRequest, false); + Functions.ajaxShowMessage(Messages.strProcessingRequest, false); var parts = url.split('?'); - var params = getJSConfirmCommonParam(this, parts[1]); + var params = Functions.getJsConfirmCommonParam(this, parts[1]); $.post(parts[0], params, function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); var $rowsToRemove = $form.find('tr.removeMe'); var $databasesCount = $('#filter-rows-count'); @@ -85,7 +85,7 @@ AJAX.registerOnload('server_databases.js', function () { PMA_reloadNavigation(); } else { $form.find('tr.removeMe').removeClass('removeMe'); - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() } @@ -109,12 +109,12 @@ AJAX.registerOnload('server_databases.js', function () { } // end remove - PMA_ajaxShowMessage(Messages.strProcessingRequest); - PMA_prepareForAjaxRequest($form); + Functions.ajaxShowMessage(Messages.strProcessingRequest); + Functions.prepareForAjaxRequest($form); $.post($form.attr('action'), $form.serialize(), function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); var $databases_count_object = $('#filter-rows-count'); var databases_count = parseInt($databases_count_object.text(), 10) + 1; @@ -130,7 +130,7 @@ AJAX.registerOnload('server_databases.js', function () { } $.get(dbStruct_url, params, AJAX.responseHandler); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() }); // end $(document).on() diff --git a/js/server_privileges.js b/js/server_privileges.js index 4a8591460b..2b0e2d6409 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -27,7 +27,7 @@ function checkAddUser (the_form) { return false; } - return PMA_checkPassword($(the_form)); + return Functions.checkPassword($(the_form)); } // end of the 'checkAddUser()' function function checkPasswordStrength (value, meter_obj, meter_object_label, username) { @@ -161,7 +161,7 @@ AJAX.registerOnload('server_privileges.js', function () { /** * AJAX handler for 'Revoke User' * - * @see PMA_ajaxShowMessage() + * @see Functions.ajaxShowMessage() * @memberOf jQuery * @name revoke_user_click */ @@ -174,19 +174,19 @@ AJAX.registerOnload('server_privileges.js', function () { $thisButton.PMA_confirm(Messages.strDropUserWarning, $form.attr('action'), function (url) { var $drop_users_db_checkbox = $('#checkbox_drop_users_db'); if ($drop_users_db_checkbox.is(':checked')) { - var is_confirmed = confirm(Messages.strDropDatabaseStrongWarning + '\n' + PMA_sprintf(Messages.strDoYouReally, 'DROP DATABASE')); + var is_confirmed = confirm(Messages.strDropDatabaseStrongWarning + '\n' + Functions.sprintf(Messages.strDoYouReally, 'DROP DATABASE')); if (! is_confirmed) { // Uncheck the drop users database checkbox $drop_users_db_checkbox.prop('checked', false); } } - PMA_ajaxShowMessage(Messages.strRemovingSelectedUsers); + Functions.ajaxShowMessage(Messages.strRemovingSelectedUsers); var argsep = CommonParams.get('arg_separator'); $.post(url, $form.serialize() + argsep + 'delete=' + $thisButton.val() + argsep + 'ajax_request=true', function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); // Refresh navigation, if we droppped some databases with the name // that is the same as the username of the deleted user if ($('#checkbox_drop_users_db:checked').length) { @@ -214,7 +214,7 @@ AJAX.registerOnload('server_privileges.js', function () { $(checkboxes_sel).trigger('change'); }); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() }); @@ -223,7 +223,7 @@ AJAX.registerOnload('server_privileges.js', function () { $(document).on('click', 'a.edit_user_group_anchor.ajax', function (event) { event.preventDefault(); $(this).parents('tr').addClass('current_row'); - var $msg = PMA_ajaxShowMessage(); + var $msg = Functions.ajaxShowMessage(); $.get( $(this).attr('href'), { @@ -232,19 +232,19 @@ AJAX.registerOnload('server_privileges.js', function () { }, function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); var buttonOptions = {}; buttonOptions[Messages.strGo] = function () { var usrGroup = $('#changeUserGroupDialog') .find('select[name="userGroup"]') .val(); - var $message = PMA_ajaxShowMessage(); + var $message = Functions.ajaxShowMessage(); var argsep = CommonParams.get('arg_separator'); $.post( 'server_privileges.php', $('#changeUserGroupDialog').find('form').serialize() + argsep + 'ajax_request=1', function (data) { - PMA_ajaxRemoveMessage($message); + Functions.ajaxRemoveMessage($message); if (typeof data !== 'undefined' && data.success === true) { $('#usersForm') .find('.current_row') @@ -252,7 +252,7 @@ AJAX.registerOnload('server_privileges.js', function () { .find('.usrGroup') .text(usrGroup); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); $('#usersForm') .find('.current_row') .removeClass('current_row'); @@ -279,7 +279,7 @@ AJAX.registerOnload('server_privileges.js', function () { }); $dialog.find('legend').remove(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); $('#usersForm') .find('.current_row') .removeClass('current_row'); @@ -291,7 +291,7 @@ AJAX.registerOnload('server_privileges.js', function () { /** * AJAX handler for 'Export Privileges' * - * @see PMA_ajaxShowMessage() + * @see Functions.ajaxShowMessage() * @memberOf jQuery * @name export_user_click */ @@ -299,10 +299,10 @@ AJAX.registerOnload('server_privileges.js', function () { event.preventDefault(); // can't export if no users checked if ($(this.form).find('input:checked').length === 0) { - PMA_ajaxShowMessage(Messages.strNoAccountSelected, 2000, 'success'); + Functions.ajaxShowMessage(Messages.strNoAccountSelected, 2000, 'success'); return; } - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); var button_options = {}; button_options[Messages.strClose] = function () { $(this).dialog('close'); @@ -323,21 +323,21 @@ AJAX.registerOnload('server_privileges.js', function () { $(this).remove(); } }); - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); // Attach syntax highlighted editor to export dialog - PMA_getSQLEditor($ajaxDialog.find('textarea')); + Functions.getSqlEditor($ajaxDialog.find('textarea')); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } } ); // end $.post }); // if exporting non-ajax, highlight anyways - PMA_getSQLEditor($('textarea.export')); + Functions.getSqlEditor($('textarea.export')); $(document).on('click', 'a.export_user_anchor.ajax', function (event) { event.preventDefault(); - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); /** * @var button_options Object containing options for jQueryUI dialog buttons */ @@ -357,11 +357,11 @@ AJAX.registerOnload('server_privileges.js', function () { $(this).remove(); } }); - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); // Attach syntax highlighted editor to export dialog - PMA_getSQLEditor($ajaxDialog.find('textarea')); + Functions.getSqlEditor($ajaxDialog.find('textarea')); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.get }); // end export privileges @@ -369,16 +369,16 @@ AJAX.registerOnload('server_privileges.js', function () { /** * AJAX handler to Paginate the Users Table * - * @see PMA_ajaxShowMessage() + * @see Functions.ajaxShowMessage() * @name paginate_users_table_click * @memberOf jQuery */ $(document).on('click', '#initials_table a.ajax', function (event) { event.preventDefault(); - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); $.get($(this).attr('href'), { 'ajax_request' : true }, function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); // This form is not on screen when first entering Privileges // if there are more than 50 users $('div.notice').remove(); @@ -391,7 +391,7 @@ AJAX.registerOnload('server_privileges.js', function () { // prevent double initials table $('#initials_table_old').remove(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.get }); // end of the paginate users table @@ -477,7 +477,7 @@ AJAX.registerOnload('server_privileges.js', function () { $('input.autofocus').focus(); $(checkboxes_sel).trigger('change'); - displayPasswordGenerateButton(); + Functions.displayPasswordGenerateButton(); if ($('#edit_user_dialog').length > 0) { addOrUpdateSubmenu(); } diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index a66241b1a1..9b1ae2dede 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -112,7 +112,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { // Timepicker is loaded on demand so we need to initialize // datetime fields from the 'load log' dialog $('#logAnalyseDialog').find('.datetimefield').each(function () { - PMA_addDatepicker($(this)); + Functions.addDatepicker($(this)); }); /** ** Monitor charting implementation ****/ @@ -683,9 +683,9 @@ AJAX.registerOnload('server_status_monitor.js', function () { event.preventDefault(); runtime.redrawCharts = ! runtime.redrawCharts; if (! runtime.redrawCharts) { - $(this).html(PMA_getImage('play') + Messages.strResumeMonitor); + $(this).html(Functions.getImage('play') + Messages.strResumeMonitor); } else { - $(this).html(PMA_getImage('pause') + Messages.strPauseMonitor); + $(this).html(Functions.getImage('pause') + Messages.strPauseMonitor); if (! runtime.charts) { initGrid(); $('a[href="#settingsPopup"]').show(); @@ -722,7 +722,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { } else { return serverResponseError(); } - var icon = PMA_getImage('s_success'); + var icon = Functions.getImage('s_success'); var msg = ''; var str = ''; @@ -739,7 +739,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { } if (msg.length === 0) { - icon = PMA_getImage('s_error'); + icon = Functions.getImage('s_error'); msg = Messages.strBothLogOff; } @@ -747,21 +747,21 @@ AJAX.registerOnload('server_status_monitor.js', function () { str += icon + msg + '
    '; if (logVars.log_output !== 'TABLE') { - str += PMA_getImage('s_error') + ' ' + Messages.strLogOutNotTable + '
    '; + str += Functions.getImage('s_error') + ' ' + Messages.strLogOutNotTable + '
    '; } else { - str += PMA_getImage('s_success') + ' ' + Messages.strLogOutIsTable + '
    '; + str += Functions.getImage('s_success') + ' ' + Messages.strLogOutIsTable + '
    '; } if (logVars.slow_query_log === 'ON') { if (logVars.long_query_time > 2) { - str += PMA_getImage('s_attention') + ' '; - str += PMA_sprintf(Messages.strSmallerLongQueryTimeAdvice, logVars.long_query_time); + str += Functions.getImage('s_attention') + ' '; + str += Functions.sprintf(Messages.strSmallerLongQueryTimeAdvice, logVars.long_query_time); str += '
    '; } if (logVars.long_query_time < 2) { - str += PMA_getImage('s_success') + ' '; - str += PMA_sprintf(Messages.strLongQueryTimeSet, logVars.long_query_time); + str += Functions.getImage('s_success') + ' '; + str += Functions.sprintf(Messages.strLongQueryTimeSet, logVars.long_query_time); str += '
    '; } } @@ -779,26 +779,26 @@ AJAX.registerOnload('server_status_monitor.js', function () { } str += '- '; - str += PMA_sprintf(Messages.strSetLogOutput, varValue); + str += Functions.sprintf(Messages.strSetLogOutput, varValue); str += '
    '; if (logVars.general_log !== 'ON') { str += '- '; - str += PMA_sprintf(Messages.strEnableVar, 'general_log'); + str += Functions.sprintf(Messages.strEnableVar, 'general_log'); str += '
    '; } else { str += '- '; - str += PMA_sprintf(Messages.strDisableVar, 'general_log'); + str += Functions.sprintf(Messages.strDisableVar, 'general_log'); str += '
    '; } if (logVars.slow_query_log !== 'ON') { str += '- '; - str += PMA_sprintf(Messages.strEnableVar, 'slow_query_log'); + str += Functions.sprintf(Messages.strEnableVar, 'slow_query_log'); str += '
    '; } else { str += '- '; - str += PMA_sprintf(Messages.strDisableVar, 'slow_query_log'); + str += Functions.sprintf(Messages.strDisableVar, 'slow_query_log'); str += '
    '; } @@ -808,7 +808,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { } str += '- '; - str += PMA_sprintf(Messages.setSetLongQueryTime, varValue); + str += Functions.sprintf(Messages.setSetLongQueryTime, varValue); str += '
    '; } else { str += Messages.strNoSuperUser + '
    '; @@ -923,14 +923,14 @@ AJAX.registerOnload('server_status_monitor.js', function () { } var str = serie.display === 'differential' ? ', ' + Messages.strDifferential : ''; - str += serie.valueDivisor ? (', ' + PMA_sprintf(Messages.strDividedBy, serie.valueDivisor)) : ''; + str += serie.valueDivisor ? (', ' + Functions.sprintf(Messages.strDividedBy, serie.valueDivisor)) : ''; str += serie.unit ? (', ' + Messages.strUnit + ': ' + serie.unit) : ''; var newSeries = { label: $('#variableInput').val().replace(/_/g, ' ') }; newChart.series.push(newSeries); - $('#seriesPreview').append('- ' + escapeHtml(newSeries.label + str) + '
    '); + $('#seriesPreview').append('- ' + Functions.escapeHtml(newSeries.label + str) + '
    '); newChart.nodes.push(serie); $('#variableInput').val(''); $('input[name="differentialValue"]').prop('checked', true); @@ -1083,7 +1083,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { function addChart (chartObj, initialize) { var i; var settings = { - title: escapeHtml(chartObj.title), + title: Functions.escapeHtml(chartObj.title), grid: { drawBorder: false, shadow: false, @@ -1206,7 +1206,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { seriesValue = plot.series[0]._yaxis.tickOptions.formatter('%s', seriesValue); } else if (plot.series[0]._yaxis.tickOptions.formatString) { // using format string - seriesValue = PMA_sprintf(plot.series[0]._yaxis.tickOptions.formatString, seriesValue); + seriesValue = Functions.sprintf(plot.series[0]._yaxis.tickOptions.formatString, seriesValue); } tooltipHtml += '
    ' + seriesLabel + ': ' + seriesValue + ''; @@ -1349,12 +1349,12 @@ AJAX.registerOnload('server_status_monitor.js', function () { buttons: dlgBtns }); - PMA_addDatepicker($dateStart, 'datetime', { + Functions.addDatepicker($dateStart, 'datetime', { showMillisec: false, showMicrosec: false, timeFormat: 'HH:mm:ss' }); - PMA_addDatepicker($dateEnd, 'datetime', { + Functions.addDatepicker($dateEnd, 'datetime', { showMillisec: false, showMicrosec: false, timeFormat: 'HH:mm:ss' @@ -1904,7 +1904,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { if (name === 'user_host') { return value.replace(/(\[.*?\])+/g, ''); } - return escapeHtml(value); + return Functions.escapeHtml(value); }; for (var i = 0, l = rows.length; i < l; i++) { @@ -1940,14 +1940,14 @@ AJAX.registerOnload('server_status_monitor.js', function () { // Append a tooltip to the count column, if there exist one if ($('#logTable').find('tr:first th:last').text().indexOf('#') > -1) { - $('#logTable').find('tr:first th:last').append(' ' + PMA_getImage('b_help', '', { 'class': 'qroupedQueryInfoIcon' })); + $('#logTable').find('tr:first th:last').append(' ' + Functions.getImage('b_help', '', { 'class': 'qroupedQueryInfoIcon' })); var tooltipContent = Messages.strCountColumnExplanation; if (groupInserts) { tooltipContent += '

    ' + Messages.strMoreCountColumnExplanation + '

    '; } - PMA_tooltip( + Functions.tooltip( $('img.qroupedQueryInfoIcon'), 'img', tooltipContent @@ -1971,8 +1971,8 @@ AJAX.registerOnload('server_status_monitor.js', function () { var query = rowData.argument || rowData.sql_text; if (codemirror_editor) { - // TODO: somehow PMA_SQLPrettyPrint messes up the query, needs be fixed - // query = PMA_SQLPrettyPrint(query); + // TODO: somehow Functions.sqlPrettyPrint messes up the query, needs be fixed + // query = Functions.sqlPrettyPrint(query); codemirror_editor.setValue(query); // Codemirror is bugged, it doesn't refresh properly sometimes. // Following lines seem to fix that @@ -2058,7 +2058,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { explain += '

    '; var tempExplain = function (key, value) { - value = (value === null) ? 'null' : escapeHtml(value); + value = (value === null) ? 'null' : Functions.escapeHtml(value); if (key === 'type' && value.toLowerCase() === 'all') { value = '' + value + ''; @@ -2096,7 +2096,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { totalTime += duration; - numberTable += '' + data.profiling[i].state + ' ' + PMA_prettyProfilingNum(duration, 2) + ''; + numberTable += '' + data.profiling[i].state + ' ' + Functions.prettyProfilingNum(duration, 2) + ''; } // Only put those values in the pie which are > 2% @@ -2104,17 +2104,17 @@ AJAX.registerOnload('server_status_monitor.js', function () { duration = parseFloat(data.profiling[i].duration); if (duration / totalTime > 0.02) { - chartData.push([PMA_prettyProfilingNum(duration, 2) + ' ' + data.profiling[i].state, duration]); + chartData.push([Functions.prettyProfilingNum(duration, 2) + ' ' + data.profiling[i].state, duration]); } else { otherTime += duration; } } if (otherTime > 0) { - chartData.push([PMA_prettyProfilingNum(otherTime, 2) + ' ' + Messages.strOther, otherTime]); + chartData.push([Functions.prettyProfilingNum(otherTime, 2) + ' ' + Messages.strOther, otherTime]); } - numberTable += '' + Messages.strTotalTime + '' + PMA_prettyProfilingNum(totalTime, 2) + ''; + numberTable += '' + Messages.strTotalTime + '' + Functions.prettyProfilingNum(totalTime, 2) + ''; numberTable += ''; $('#queryAnalyzerDialog').find('div.placeHolder td.chart').append( @@ -2134,7 +2134,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { return false; }); - profilingChart = PMA_createProfilingChart( + profilingChart = Functions.createProfilingChart( 'queryProfiling', chartData ); @@ -2179,7 +2179,7 @@ function serverResponseError () { }; $('#emptyDialog').dialog({ title: Messages.strRefreshFailed }); $('#emptyDialog').html( - PMA_getImage('s_attention') + + Functions.getImage('s_attention') + Messages.strInvalidResponseExplanation ); $('#emptyDialog').dialog({ buttons: btns }); diff --git a/js/server_status_processes.js b/js/server_status_processes.js index d184ea1b1a..6be3188467 100644 --- a/js/server_status_processes.js +++ b/js/server_status_processes.js @@ -63,10 +63,10 @@ var processList = { $tableProcessListTr.filter(':even').removeClass('odd').addClass('even'); $tableProcessListTr.filter(':odd').removeClass('even').addClass('odd'); // Show process killed message - PMA_ajaxShowMessage(data.message, false); + Functions.ajaxShowMessage(data.message, false); } else { // Show process error message - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }, 'json'); }, @@ -94,7 +94,7 @@ var processList = { if (data.hasOwnProperty('success') && data.success) { $newTable = $(data.message); $('#tableprocesslist').html($newTable.html()); - PMA_highlightSQL($('#tableprocesslist')); + Functions.highlightSql($('#tableprocesslist')); } processList.refreshTimeout = setTimeout( processList.refresh, @@ -131,7 +131,7 @@ var processList = { label = Messages.strStopRefresh; processList.refresh(); } - $('a#toggleRefresh').html(PMA_getImage(img) + escapeHtml(label)); + $('a#toggleRefresh').html(Functions.getImage(img) + Functions.escapeHtml(label)); }, /** diff --git a/js/server_status_queries.js b/js/server_status_queries.js index 80ba7e7c5b..a7aabb4be4 100644 --- a/js/server_status_queries.js +++ b/js/server_status_queries.js @@ -26,7 +26,7 @@ AJAX.registerOnload('server_status_queries.js', function () { }); $('#serverstatusquerieschart').data( 'queryPieChart', - PMA_createProfilingChart( + Functions.createProfilingChart( 'serverstatusquerieschart', cdata ) diff --git a/js/server_user_groups.js b/js/server_user_groups.js index dc1e2392ed..a186787aed 100644 --- a/js/server_user_groups.js +++ b/js/server_user_groups.js @@ -35,7 +35,7 @@ AJAX.registerOnload('server_user_groups.js', function () { }; $('
    ') .attr('id', 'confirmUserGroupDeleteDialog') - .append(PMA_sprintf(Messages.strDropUserGroupWarning, escapeHtml(groupName))) + .append(Functions.sprintf(Messages.strDropUserGroupWarning, Functions.escapeHtml(groupName))) .dialog({ width: 300, minWidth: 200, diff --git a/js/server_variables.js b/js/server_variables.js index 9ecacebdf2..69d33f9278 100644 --- a/js/server_variables.js +++ b/js/server_variables.js @@ -38,13 +38,13 @@ AJAX.registerOnload('server_variables.js', function () { var $mySaveLink = $saveLink.clone().css('display', 'inline-block'); var $myCancelLink = $cancelLink.clone().css('display', 'inline-block'); - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); var $myEditLink = $cell.find('a.editLink'); $cell.addClass('edit'); // variable is being edited $myEditLink.remove(); // remove edit link $mySaveLink.on('click', function () { - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); $.post($(this).attr('href'), { ajax_request: true, type: 'setval', @@ -55,12 +55,12 @@ AJAX.registerOnload('server_variables.js', function () { $valueCell .html(data.variable) .data('content', data.variable); - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); } else { if (data.error === '') { - PMA_ajaxShowMessage(Messages.strRequestFailed, false); + Functions.ajaxShowMessage(Messages.strRequestFailed, false); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } $valueCell.html($valueCell.data('content')); } @@ -108,10 +108,10 @@ AJAX.registerOnload('server_variables.js', function () { $myCancelLink.trigger('click'); } }); - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); } else { $cell.removeClass('edit').html($myEditLink); - PMA_ajaxShowMessage(data.error); + Functions.ajaxShowMessage(data.error); } }); } diff --git a/js/sql.js b/js/sql.js index 36533a5fd3..40b9e38888 100644 --- a/js/sql.js +++ b/js/sql.js @@ -244,10 +244,10 @@ AJAX.registerOnload('sql.js', function () { // Delete row from SQL results $(document).on('click', 'a.delete_row.ajax', function (e) { e.preventDefault(); - var question = PMA_sprintf(Messages.strDoYouReally, escapeHtml($(this).closest('td').find('div').text())); + var question = Functions.sprintf(Messages.strDoYouReally, Functions.escapeHtml($(this).closest('td').find('div').text())); var $link = $(this); $link.PMA_confirm(question, $link.attr('href'), function (url) { - $msgbox = PMA_ajaxShowMessage(); + $msgbox = Functions.ajaxShowMessage(); var argsep = CommonParams.get('arg_separator'); var params = 'ajax_request=1' + argsep + 'is_js_confirmed=1'; var postData = $link.getPostData(); @@ -256,10 +256,10 @@ AJAX.registerOnload('sql.js', function () { } $.post(url, params, function (data) { if (data.success) { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); $link.closest('tr').remove(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); }); @@ -268,13 +268,13 @@ AJAX.registerOnload('sql.js', function () { // Ajaxification for 'Bookmark this SQL query' $(document).on('submit', '.bookmarkQueryForm', function (e) { e.preventDefault(); - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); var argsep = CommonParams.get('arg_separator'); $.post($(this).attr('action'), 'ajax_request=1' + argsep + $(this).serialize(), function (data) { if (data.success) { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); }); @@ -378,7 +378,7 @@ AJAX.registerOnload('sql.js', function () { event.preventDefault(); // Take to preview mode - printPreview(); + Functions.printPreview(); }); // end of 'Print' action /** @@ -495,7 +495,7 @@ AJAX.registerOnload('sql.js', function () { var $varDiv = $('#bookmark_variables'); $varDiv.empty(); for (var i = 1; i <= varCount; i++) { - $varDiv.append($('')); + $varDiv.append($('')); $varDiv.append($('')); } @@ -534,7 +534,7 @@ AJAX.registerOnload('sql.js', function () { /** * Ajax Event handler for 'SQL Query Submit' * - * @see PMA_ajaxShowMessage() + * @see Functions.ajaxShowMessage() * @memberOf jQuery * @name sqlqueryform_submit */ @@ -545,17 +545,17 @@ AJAX.registerOnload('sql.js', function () { if (codemirror_editor) { $form[0].elements.sql_query.value = codemirror_editor.getValue(); } - if (! checkSqlQuery($form[0])) { + if (! Functions.checkSqlQuery($form[0])) { return false; } // remove any div containing a previous error message $('div.error').remove(); - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); var $sqlqueryresultsouter = $('#sqlqueryresultsouter'); - PMA_prepareForAjaxRequest($form); + Functions.prepareForAjaxRequest($form); var argsep = CommonParams.get('arg_separator'); $.post($form.attr('action'), $form.serialize() + argsep + 'ajax_page_request=true', function (data) { @@ -568,7 +568,7 @@ AJAX.registerOnload('sql.js', function () { if ('1' === data.action_bookmark) { $('#sqlquery').text(data.sql_query); // send to codemirror if possible - setQuery(data.sql_query); + Functions.setQuery(data.sql_query); } // delete if ('2' === data.action_bookmark) { @@ -584,7 +584,7 @@ AJAX.registerOnload('sql.js', function () { $sqlqueryresultsouter .show() .html(data.message); - PMA_highlightSQL($sqlqueryresultsouter); + Functions.highlightSql($sqlqueryresultsouter); if (data._menu) { if (history && history.pushState) { @@ -634,13 +634,13 @@ AJAX.registerOnload('sql.js', function () { $('#sqlqueryresultsouter') .show() .html(data.message); - PMA_highlightSQL($('#sqlqueryresultsouter')); + Functions.highlightSql($('#sqlqueryresultsouter')); }); } $('.sqlqueryresults').trigger('makegrid').trigger('stickycolumns'); $('#togglequerybox').show(); - PMA_init_slider(); + Functions.initSlider(); if (typeof data.action_bookmark === 'undefined') { if ($('#sqlqueryform input[name="retain_query_box"]').is(':checked') !== true) { @@ -656,7 +656,7 @@ AJAX.registerOnload('sql.js', function () { .html(data.error); $('html, body').animate({ scrollTop: $(document).height() }, 200); } - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); }); // end $.post() }); // end SQL Query submit @@ -670,17 +670,17 @@ AJAX.registerOnload('sql.js', function () { $form = $(this); - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); var argsep = CommonParams.get('arg_separator'); $.post($form.attr('action'), $form.serialize() + argsep + 'ajax_request=true', function (data) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); var $sqlqueryresults = $form.parents('.sqlqueryresults'); $sqlqueryresults .html(data.message) .trigger('makegrid') .trigger('stickycolumns'); - PMA_init_slider(); - PMA_highlightSQL($sqlqueryresults); + Functions.initSlider(); + Functions.highlightSql($sqlqueryresults); }); // end $.post() }); // end displayOptionsForm handler @@ -725,14 +725,14 @@ AJAX.registerOnload('sql.js', function () { function submitShowAllForm () { var argsep = CommonParams.get('arg_separator'); var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true'; - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); } }); $('body').on('keyup', '#sqlqueryform', function () { - PMA_handleSimulateQueryButton(); + Functions.handleSimulateQueryButton(); }); /** @@ -756,7 +756,7 @@ AJAX.registerOnload('sql.js', function () { return false; } - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); $.ajax({ type: 'POST', url: $form.attr('action'), @@ -769,7 +769,7 @@ AJAX.registerOnload('sql.js', function () { sql_delimiter: delimiter }, success: function (response) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); if (response.success) { var dialog_content = '
    '; if (response.sql_data) { @@ -800,18 +800,18 @@ AJAX.registerOnload('sql.js', function () { buttons: button_options, title: Messages.strSimulateDML, open: function () { - PMA_highlightSQL($(this)); + Functions.highlightSql($(this)); }, close: function () { $(this).remove(); } }); } else { - PMA_ajaxShowMessage(response.error); + Functions.ajaxShowMessage(response.error); } }, error: function (response) { - PMA_ajaxShowMessage(Messages.strErrorProcessingRequest); + Functions.ajaxShowMessage(Messages.strErrorProcessingRequest); } }); }); @@ -825,7 +825,7 @@ AJAX.registerOnload('sql.js', function () { var $form = $button.closest('form'); var argsep = CommonParams.get('arg_separator'); var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + $button.val(); - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); }); @@ -931,7 +931,7 @@ function browseForeignDialog ($this_a) { function checkSavedQuery () { if (isStorageSupported('localStorage') && window.localStorage.auto_saved_sql !== undefined) { - PMA_ajaxShowMessage(Messages.strPreviousSaveQuery); + Functions.ajaxShowMessage(Messages.strPreviousSaveQuery); } } @@ -991,7 +991,7 @@ function makeProfilingChart () { $('#profilingchart').html('').show(); $('#profilingChartData').html(''); - PMA_createProfilingChart('profilingchart', data); + Functions.createProfilingChart('profilingchart', data); } /* diff --git a/js/tbl_change.js b/js/tbl_change.js index f94cdf2559..e375ec7e04 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -698,7 +698,7 @@ function addNewContinueInsertionFiels (event) { } } // Add all the required datepickers back - addDateTimePicker(); + Functions.addDateTimePicker(); } function changeValueFieldType (elem, searchIndex) { diff --git a/js/tbl_chart.js b/js/tbl_chart.js index a140ef1800..fb4a4f7e35 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -54,7 +54,7 @@ function PMA_queryChart (data, columnNames, settings) { }, axes : { xaxis : { - label : escapeHtml(settings.xaxisLabel) + label : Functions.escapeHtml(settings.xaxisLabel) }, yaxis : { label : settings.yaxisLabel @@ -166,7 +166,7 @@ function drawChart () { var columnNames = []; $('select[name="chartXAxis"] option').each(function () { - columnNames.push(escapeHtml($(this).text())); + columnNames.push(Functions.escapeHtml($(this).text())); }); try { currentChart = PMA_queryChart(chart_data, columnNames, currentSettings); @@ -174,7 +174,7 @@ function drawChart () { $('#saveChart').attr('href', currentChart.toImageString()); } } catch (err) { - PMA_ajaxShowMessage(err.message, false); + Functions.ajaxShowMessage(err.message, false); } } @@ -364,21 +364,21 @@ AJAX.registerOnload('tbl_chart.js', function () { if (codemirror_editor) { $form[0].elements.sql_query.value = codemirror_editor.getValue(); } - if (!checkSqlQuery($form[0])) { + if (!Functions.checkSqlQuery($form[0])) { return false; } - var $msgbox = PMA_ajaxShowMessage(); - PMA_prepareForAjaxRequest($form); + var $msgbox = Functions.ajaxShowMessage(); + Functions.prepareForAjaxRequest($form); $.post($form.attr('action'), $form.serialize(), function (data) { if (typeof data !== 'undefined' && data.success === true && typeof data.chartData !== 'undefined') { chart_data = JSON.parse(data.chartData); drawChart(); - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }, 'json'); // end $.post() diff --git a/js/tbl_find_replace.js b/js/tbl_find_replace.js index 5169a0449d..7d12165f8b 100644 --- a/js/tbl_find_replace.js +++ b/js/tbl_find_replace.js @@ -30,10 +30,10 @@ AJAX.registerOnload('tbl_find_replace.js', function () { $('#find_replace_form').submit(function (e) { e.preventDefault(); var findReplaceForm = $('#find_replace_form'); - PMA_prepareForAjaxRequest(findReplaceForm); - var $msgbox = PMA_ajaxShowMessage(); + Functions.prepareForAjaxRequest(findReplaceForm); + var $msgbox = Functions.ajaxShowMessage(); $.post(findReplaceForm.attr('action'), findReplaceForm.serialize(), function (data) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); if (data.success === true) { $('#toggle_find_div').show(); $('#toggle_find').trigger('click'); diff --git a/js/tbl_gis_visualization.js b/js/tbl_gis_visualization.js index 218ef6ce1f..d77c053e16 100644 --- a/js/tbl_gis_visualization.js +++ b/js/tbl_gis_visualization.js @@ -341,7 +341,7 @@ AJAX.registerOnload('tbl_gis_visualization.js', function () { * Detect the mousemove event and show tooltips. */ $('.vector').on('mousemove', function (event) { - var contents = $.trim(escapeHtml($(this).attr('name'))); + var contents = $.trim(Functions.escapeHtml($(this).attr('name'))); $('#tooltip').remove(); if (contents !== '') { $('
    ' + contents + '
    ').css({ diff --git a/js/tbl_operations.js b/js/tbl_operations.js index 514dd889cd..a9b9e8a782 100644 --- a/js/tbl_operations.js +++ b/js/tbl_operations.js @@ -23,7 +23,7 @@ AJAX.registerOnload('tbl_operations.js', function () { $(document).on('submit', '#copyTable.ajax', function (event) { event.preventDefault(); var $form = $(this); - PMA_prepareForAjaxRequest($form); + Functions.prepareForAjaxRequest($form); var argsep = CommonParams.get('arg_separator'); $.post($form.attr('action'), $form.serialize() + argsep + 'submit_copy=Go', function (data) { if (typeof data !== 'undefined' && data.success === true) { @@ -37,15 +37,15 @@ AJAX.registerOnload('tbl_operations.js', function () { $form.find('input[name=\'new_name\']').val() ); CommonActions.refreshMain(false, function () { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); }); } else { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); } // Refresh navigation when the table is copied PMA_reloadNavigation(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() });// end of copyTable ajax submit @@ -56,19 +56,19 @@ AJAX.registerOnload('tbl_operations.js', function () { $(document).on('submit', '#moveTableForm', function (event) { event.preventDefault(); var $form = $(this); - PMA_prepareForAjaxRequest($form); + Functions.prepareForAjaxRequest($form); var argsep = CommonParams.get('arg_separator'); $.post($form.attr('action'), $form.serialize() + argsep + 'submit_move=1', function (data) { if (typeof data !== 'undefined' && data.success === true) { CommonParams.set('db', data._params.db); CommonParams.set('table', data._params.table); CommonActions.refreshMain('tbl_sql.php', function () { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); }); // Refresh navigation when the table is copied PMA_reloadNavigation(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() }); @@ -88,7 +88,7 @@ AJAX.registerOnload('tbl_operations.js', function () { if ($tblNameField.val() !== $tblNameField[0].defaultValue) { // reload page and navigation if the table has been renamed - PMA_prepareForAjaxRequest($form); + Functions.prepareForAjaxRequest($form); if ($tblCollationField.val() !== collationOrigValue && $changeAllColumnCollationsCheckBox.is(':checked')) { $form.PMA_confirm(question, $form.attr('action'), function (url) { @@ -113,12 +113,12 @@ AJAX.registerOnload('tbl_operations.js', function () { CommonParams.set('table', data._params.table); CommonActions.refreshMain(false, function () { $('#page_content').html(data.message); - PMA_highlightSQL($('#page_content')); + Functions.highlightSql($('#page_content')); }); // Refresh navigation when the table is renamed PMA_reloadNavigation(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() } @@ -153,20 +153,20 @@ AJAX.registerOnload('tbl_operations.js', function () { } var $temp_div; if (typeof data !== 'undefined' && data.success === true && data.sql_query !== undefined) { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); $('
    ').prependTo('#page_content'); $('.sqlqueryresults').html(data.sql_query); - PMA_highlightSQL($('#page_content')); + Functions.highlightSql($('#page_content')); scrollToTop(); } else if (typeof data !== 'undefined' && data.success === true) { $temp_div = $('
    '); $temp_div.html(data.message); var $success = $temp_div.find('.result_query .success'); - PMA_ajaxShowMessage($success); + Functions.ajaxShowMessage($success); $('
    ').prependTo('#page_content'); $('.sqlqueryresults').html(data.message); - PMA_highlightSQL($('#page_content')); - PMA_init_slider(); + Functions.highlightSql($('#page_content')); + Functions.initSlider(); $('.sqlqueryresults').children('fieldset,br').remove(); scrollToTop(); } else { @@ -180,7 +180,7 @@ AJAX.registerOnload('tbl_operations.js', function () { $error = $temp_div; } - PMA_ajaxShowMessage($error, false); + Functions.ajaxShowMessage($error, false); } }); // end $.post() });// end of table maintenance ajax click @@ -196,7 +196,7 @@ AJAX.registerOnload('tbl_operations.js', function () { function submitPartitionMaintenance () { var argsep = CommonParams.get('arg_separator'); var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true'; - PMA_ajaxShowMessage(Messages.strProcessingRequest); + Functions.ajaxShowMessage(Messages.strProcessingRequest); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); } @@ -223,33 +223,33 @@ AJAX.registerOnload('tbl_operations.js', function () { * @var question String containing the question to be asked for confirmation */ var question = Messages.strDropTableStrongWarning + ' '; - question += PMA_sprintf( + question += Functions.sprintf( Messages.strDoYouReally, - 'DROP TABLE `' + escapeHtml(CommonParams.get('db')) + '`.`' + escapeHtml(CommonParams.get('table') + '`') - ) + getForeignKeyCheckboxLoader(); + 'DROP TABLE `' + Functions.escapeHtml(CommonParams.get('db')) + '`.`' + Functions.escapeHtml(CommonParams.get('table') + '`') + ) + Functions.getForeignKeyCheckboxLoader(); $(this).PMA_confirm(question, $(this).attr('href'), function (url) { - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); - var params = getJSConfirmCommonParam(this, $link.getPostData()); + var params = Functions.getJsConfirmCommonParam(this, $link.getPostData()); $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); // Table deleted successfully, refresh both the frames PMA_reloadNavigation(); CommonParams.set('table', ''); CommonActions.refreshMain( CommonParams.get('opendb_url'), function () { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); } ); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() - }, loadForeignKeyCheckbox); // end $.PMA_confirm() + }, Functions.loadForeignKeyCheckbox); // end $.PMA_confirm() }); // end of Drop Table Ajax action $(document).on('click', '#drop_view_anchor.ajax', function (event) { @@ -259,28 +259,28 @@ AJAX.registerOnload('tbl_operations.js', function () { * @var question String containing the question to be asked for confirmation */ var question = Messages.strDropTableStrongWarning + ' '; - question += PMA_sprintf( + question += Functions.sprintf( Messages.strDoYouReally, - 'DROP VIEW `' + escapeHtml(CommonParams.get('table') + '`') + 'DROP VIEW `' + Functions.escapeHtml(CommonParams.get('table') + '`') ); $(this).PMA_confirm(question, $(this).attr('href'), function (url) { - var $msgbox = PMA_ajaxShowMessage(Messages.strProcessingRequest); - var params = getJSConfirmCommonParam(this, $link.getPostData()); + var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); + var params = Functions.getJsConfirmCommonParam(this, $link.getPostData()); $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); // Table deleted successfully, refresh both the frames PMA_reloadNavigation(); CommonParams.set('table', ''); CommonActions.refreshMain( CommonParams.get('opendb_url'), function () { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); } ); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() }); // end $.PMA_confirm() @@ -293,14 +293,14 @@ AJAX.registerOnload('tbl_operations.js', function () { * @var question String containing the question to be asked for confirmation */ var question = Messages.strTruncateTableStrongWarning + ' '; - question += PMA_sprintf( + question += Functions.sprintf( Messages.strDoYouReally, - 'TRUNCATE `' + escapeHtml(CommonParams.get('db')) + '`.`' + escapeHtml(CommonParams.get('table') + '`') - ) + getForeignKeyCheckboxLoader(); + 'TRUNCATE `' + Functions.escapeHtml(CommonParams.get('db')) + '`.`' + Functions.escapeHtml(CommonParams.get('table') + '`') + ) + Functions.getForeignKeyCheckboxLoader(); $(this).PMA_confirm(question, $(this).attr('href'), function (url) { - PMA_ajaxShowMessage(Messages.strProcessingRequest); + Functions.ajaxShowMessage(Messages.strProcessingRequest); - var params = getJSConfirmCommonParam(this, $link.getPostData()); + var params = Functions.getJsConfirmCommonParam(this, $link.getPostData()); $.post(url, params, function (data) { if ($('.sqlqueryresults').length !== 0) { @@ -310,14 +310,14 @@ AJAX.registerOnload('tbl_operations.js', function () { $('.result_query').remove(); } if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); $('
    ').prependTo('#page_content'); $('.sqlqueryresults').html(data.sql_query); - PMA_highlightSQL($('#page_content')); + Functions.highlightSql($('#page_content')); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() - }, loadForeignKeyCheckbox); // end $.PMA_confirm() + }, Functions.loadForeignKeyCheckbox); // end $.PMA_confirm() }); // end of Truncate Table Ajax action }); // end $(document).ready for 'Table operations' diff --git a/js/tbl_relation.js b/js/tbl_relation.js index 650ec20cca..5a8918630d 100644 --- a/js/tbl_relation.js +++ b/js/tbl_relation.js @@ -22,7 +22,7 @@ function setDropdownValues ($dropdown, values, selectedValue) { // add an empty string to the beginning for empty selection values.unshift(''); $.each(values, function () { - optionsAsString += ''; + optionsAsString += ''; }); $dropdown.append($(optionsAsString)); } @@ -69,7 +69,7 @@ function getDropdownValues ($dropdown) { return; } } - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); var $form = $dropdown.parents('form'); var argsep = CommonParams.get('arg_separator'); var params = 'getDropdownValues=true' + argsep + 'ajax_request=true' + @@ -90,7 +90,7 @@ function getDropdownValues ($dropdown) { data: params, dataType: 'json', success: function (data) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); if (typeof data !== 'undefined' && data.success) { // if the changed dropdown is a database selector if (foreignTable === null) { @@ -109,7 +109,7 @@ function getDropdownValues ($dropdown) { setDropdownValues($columnDd.slice(1), data.columns); } } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } } }); @@ -214,25 +214,25 @@ AJAX.registerOnload('tbl_relation.js', function () { // Object containing reference to the current field's row var $curr_row = $anchor.parents('tr'); - var drop_query = escapeHtml( + var drop_query = Functions.escapeHtml( $curr_row.children('td') .children('.drop_foreign_key_msg') .val() ); - var question = PMA_sprintf(Messages.strDoYouReally, drop_query); + var question = Functions.sprintf(Messages.strDoYouReally, drop_query); $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) { - var $msg = PMA_ajaxShowMessage(Messages.strDroppingForeignKey, false); - var params = getJSConfirmCommonParam(this, $anchor.getPostData()); + var $msg = Functions.ajaxShowMessage(Messages.strDroppingForeignKey, false); + var params = Functions.getJsConfirmCommonParam(this, $anchor.getPostData()); $.post(url, params, function (data) { if (data.success === true) { - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); CommonActions.refreshMain(false, function () { // Do nothing }); } else { - PMA_ajaxShowMessage(Messages.strErrorProcessingRequest + ' : ' + data.error, false); + Functions.ajaxShowMessage(Messages.strErrorProcessingRequest + ' : ' + data.error, false); } }); // end $.post() }); // end $.PMA_confirm() diff --git a/js/tbl_select.js b/js/tbl_select.js index 9f07ddd884..ec9cd61d9b 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -111,9 +111,9 @@ AJAX.registerOnload('tbl_select.js', function () { // empty previous search results while we are waiting for new results $('#sqlqueryresultsouter').empty(); - var $msgbox = PMA_ajaxShowMessage(Messages.strSearching, false); + var $msgbox = Functions.ajaxShowMessage(Messages.strSearching, false); - PMA_prepareForAjaxRequest($search_form); + Functions.prepareForAjaxRequest($search_form); var values = {}; $search_form.find(':input').each(function () { @@ -157,7 +157,7 @@ AJAX.registerOnload('tbl_select.js', function () { } $.post($search_form.attr('action'), values, function (data) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); if (typeof data !== 'undefined' && data.success === true) { if (typeof data.sql_query !== 'undefined') { // zero rows $('#sqlqueryresultsouter').html(data.sql_query); @@ -176,12 +176,12 @@ AJAX.registerOnload('tbl_select.js', function () { // now it's time to show the div containing the link .show(); // needed for the display options slider in the results - PMA_init_slider(); + Functions.initSlider(); $('html, body').animate({ scrollTop: 0 }, 'fast'); } else { $('#sqlqueryresultsouter').html(data.error); } - PMA_highlightSQL($('#sqlqueryresultsouter')); + Functions.highlightSql($('#sqlqueryresultsouter')); }); // end $.post() }); @@ -299,7 +299,7 @@ AJAX.registerOnload('tbl_select.js', function () { if ((operator === 'BETWEEN' || operator === 'NOT BETWEEN') && data_type ) { - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); $.ajax({ url: 'tbl_select.php', type: 'POST', @@ -312,7 +312,7 @@ AJAX.registerOnload('tbl_select.js', function () { range_search: 1 }, success: function (response) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); if (response.success) { // Get the column min value. var min = response.column_data.min @@ -391,19 +391,19 @@ AJAX.registerOnload('tbl_select.js', function () { title: Messages.strRangeSearch, open: function () { // Add datepicker wherever required. - PMA_addDatepicker($('#min_value'), data_type); - PMA_addDatepicker($('#max_value'), data_type); + Functions.addDatepicker($('#min_value'), data_type); + Functions.addDatepicker($('#max_value'), data_type); }, close: function () { $(this).remove(); } }); } else { - PMA_ajaxShowMessage(response.error); + Functions.ajaxShowMessage(response.error); } }, error: function (response) { - PMA_ajaxShowMessage(Messages.strErrorProcessingRequest); + Functions.ajaxShowMessage(Messages.strErrorProcessingRequest); } }); } diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 4f74982978..474ea2d384 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -74,7 +74,7 @@ AJAX.registerOnload('tbl_structure.js', function () { function submitForm () { - $msg = PMA_ajaxShowMessage(Messages.strProcessingRequest); + $msg = Functions.ajaxShowMessage(Messages.strProcessingRequest); $.post($form.attr('action'), $form.serialize() + CommonParams.get('arg_separator') + 'do_save_data=1', function (data) { if ($('.sqlqueryresults').length !== 0) { $('.sqlqueryresults').remove(); @@ -86,15 +86,15 @@ AJAX.registerOnload('tbl_structure.js', function () { .empty() .append(data.message) .show(); - PMA_highlightSQL($('#page_content')); + Functions.highlightSql($('#page_content')); $('.result_query .notice').remove(); reloadFieldForm(); $form.remove(); - PMA_ajaxRemoveMessage($msg); - PMA_init_slider(); + Functions.ajaxRemoveMessage($msg); + Functions.initSlider(); PMA_reloadNavigation(); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // end $.post() } @@ -128,15 +128,15 @@ AJAX.registerOnload('tbl_structure.js', function () { /* * First validate the form; if there is a problem, avoid submitting it * - * checkTableEditForm() needs a pure element and not a jQuery object, + * Functions.checkTableEditForm() needs a pure element and not a jQuery object, * this is why we pass $form[0] as a parameter (the jQuery object * is actually an array of DOM elements) */ - if (checkTableEditForm($form[0], field_cnt)) { + if (Functions.checkTableEditForm($form[0], field_cnt)) { // OK, form passed validation step - PMA_prepareForAjaxRequest($form); - if (PMA_checkReservedWordColumns($form)) { + Functions.prepareForAjaxRequest($form); + if (Functions.checkReservedWordColumns($form)) { // User wants to submit the form // If Collation is changed, Warn and Confirm @@ -171,7 +171,7 @@ AJAX.registerOnload('tbl_structure.js', function () { * @var curr_column_name String containing name of the field referred to by {@link curr_row} */ var curr_column_name = $curr_row.children('th').children('label').text().trim(); - curr_column_name = escapeHtml(curr_column_name); + curr_column_name = Functions.escapeHtml(curr_column_name); /** * @var $after_field_item Corresponding entry in the 'After' field. */ @@ -179,15 +179,15 @@ AJAX.registerOnload('tbl_structure.js', function () { /** * @var question String containing the question to be asked for confirmation */ - var question = PMA_sprintf(Messages.strDoYouReally, 'ALTER TABLE `' + escapeHtml(curr_table_name) + '` DROP `' + escapeHtml(curr_column_name) + '`;'); + var question = Functions.sprintf(Messages.strDoYouReally, 'ALTER TABLE `' + Functions.escapeHtml(curr_table_name) + '` DROP `' + Functions.escapeHtml(curr_column_name) + '`;'); var $this_anchor = $(this); $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function (url) { - var $msg = PMA_ajaxShowMessage(Messages.strDroppingColumn, false); - var params = getJSConfirmCommonParam(this, $this_anchor.getPostData()); + var $msg = Functions.ajaxShowMessage(Messages.strDroppingColumn, false); + var params = Functions.getJsConfirmCommonParam(this, $this_anchor.getPostData()); params += CommonParams.get('arg_separator') + 'ajax_page_request=1'; $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) { - PMA_ajaxRemoveMessage($msg); + Functions.ajaxRemoveMessage($msg); if ($('.result_query').length) { $('.result_query').remove(); } @@ -195,7 +195,7 @@ AJAX.registerOnload('tbl_structure.js', function () { $('
    ') .html(data.sql_query) .prependTo('#structure_content'); - PMA_highlightSQL($('#page_content')); + Functions.highlightSql($('#page_content')); } // Adjust the row numbers for (var $row = $curr_row.next(); $row.length > 0; $row = $row.next()) { @@ -222,7 +222,7 @@ AJAX.registerOnload('tbl_structure.js', function () { $('.index_info').replaceWith(data.indexes_list); PMA_reloadNavigation(); } else { - PMA_ajaxShowMessage(Messages.strErrorProcessingRequest + ' : ' + data.error, false); + Functions.ajaxShowMessage(Messages.strErrorProcessingRequest + ' : ' + data.error, false); } }); // end $.post() }); // end $.PMA_confirm() @@ -235,7 +235,7 @@ AJAX.registerOnload('tbl_structure.js', function () { event.preventDefault(); // Take to preview mode - printPreview(); + Functions.printPreview(); }); // end of Print View action /** @@ -260,16 +260,16 @@ AJAX.registerOnload('tbl_structure.js', function () { } else if ($this.is('.add_fulltext_anchor')) { add_clause = 'ADD FULLTEXT'; } - var question = PMA_sprintf(Messages.strDoYouReally, 'ALTER TABLE `' + - escapeHtml(curr_table_name) + '` ' + add_clause + '(`' + escapeHtml(curr_column_name) + '`);'); + var question = Functions.sprintf(Messages.strDoYouReally, 'ALTER TABLE `' + + Functions.escapeHtml(curr_table_name) + '` ' + add_clause + '(`' + Functions.escapeHtml(curr_column_name) + '`);'); var $this_anchor = $(this); $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function (url) { - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $this; - var params = getJSConfirmCommonParam(this, $this_anchor.getPostData()); + var params = Functions.getJsConfirmCommonParam(this, $this_anchor.getPostData()); params += CommonParams.get('arg_separator') + 'ajax_page_request=1'; $.post(url, params, AJAX.responseHandler); }); // end $.PMA_confirm() @@ -293,19 +293,19 @@ AJAX.registerOnload('tbl_structure.js', function () { button_options[Messages.strGo] = function (event) { event.preventDefault(); - var $msgbox = PMA_ajaxShowMessage(); + var $msgbox = Functions.ajaxShowMessage(); var $this = $(this); var $form = $this.find('form'); var serialized = $form.serialize(); // check if any columns were moved at all if (serialized === $form.data('serialized-unmoved')) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); $this.dialog('close'); return; } $.post($form.prop('action'), serialized + CommonParams.get('arg_separator') + 'ajax_request=true', function (data) { if (data.success === false) { - PMA_ajaxRemoveMessage($msgbox); + Functions.ajaxRemoveMessage($msgbox); $this .clone() .html(data.error) @@ -340,7 +340,7 @@ AJAX.registerOnload('tbl_structure.js', function () { .removeClass('odd even') .addClass($row.index() % 2 === 0 ? 'odd' : 'even'); } - PMA_ajaxShowMessage(data.message); + Functions.ajaxShowMessage(data.message); $this.dialog('close'); } }); @@ -348,7 +348,7 @@ AJAX.registerOnload('tbl_structure.js', function () { button_options[Messages.strPreviewSQL] = function () { // Function for Previewing SQL var $form = $('#move_column_form'); - PMA_previewSQL($form); + Functions.previewSql($form); }; button_options[Messages.strCancel] = function () { $(this).dialog('close'); @@ -411,7 +411,7 @@ AJAX.registerOnload('tbl_structure.js', function () { var $form = $button.parents('form'); var argsep = CommonParams.get('arg_separator'); var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + $button.val(); - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); }); @@ -425,7 +425,7 @@ AJAX.registerOnload('tbl_structure.js', function () { function submitPartitionAction (url) { var params = 'ajax_request=true&ajax_page_request=true&' + $link.getPostData(); - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $link; $.post(url, params, AJAX.responseHandler); } @@ -453,11 +453,11 @@ AJAX.registerOnload('tbl_structure.js', function () { var $link = $(this); var question = Messages.strRemovePartitioningWarning; $link.PMA_confirm(question, $link.attr('href'), function (url) { - var params = getJSConfirmCommonParam({ + var params = Functions.getJsConfirmCommonParam({ 'ajax_request' : true, 'ajax_page_request' : true }, $link.getPostData()); - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $link; $.post(url, params, AJAX.responseHandler); }); diff --git a/js/tbl_tracking.js b/js/tbl_tracking.js index 0b42608fd8..bf86bcd5da 100644 --- a/js/tbl_tracking.js +++ b/js/tbl_tracking.js @@ -59,12 +59,12 @@ AJAX.registerOnload('tbl_tracking.js', function () { if ($button.val() === 'delete_version') { var question = Messages.strDeleteTrackingVersionMultiple; $button.PMA_confirm(question, $form.attr('action'), function (url) { - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $form; $.post(url, submitData, AJAX.responseHandler); }); } else { - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); } @@ -78,10 +78,10 @@ AJAX.registerOnload('tbl_tracking.js', function () { var $anchor = $(this); var question = Messages.strDeleteTrackingVersion; $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) { - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $anchor; var argSep = CommonParams.get('arg_separator'); - var params = getJSConfirmCommonParam(this, $anchor.getPostData()); + var params = Functions.getJsConfirmCommonParam(this, $anchor.getPostData()); params += argSep + 'ajax_page_request=1'; $.post(url, params, AJAX.responseHandler); }); @@ -95,10 +95,10 @@ AJAX.registerOnload('tbl_tracking.js', function () { var $anchor = $(this); var question = Messages.strDeletingTrackingEntry; $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) { - PMA_ajaxShowMessage(); + Functions.ajaxShowMessage(); AJAX.source = $anchor; var argSep = CommonParams.get('arg_separator'); - var params = getJSConfirmCommonParam(this, $anchor.getPostData()); + var params = Functions.getJsConfirmCommonParam(this, $anchor.getPostData()); params += argSep + 'ajax_page_request=1'; $.post(url, params, AJAX.responseHandler); }); diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js index 8240f75fb9..0ec1204583 100644 --- a/js/tbl_zoom_plot_jqplot.js +++ b/js/tbl_zoom_plot_jqplot.js @@ -166,7 +166,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () { $('#types_0').val(data.field_type); xType = data.field_type; $('#collations_0').val(data.field_collations); - addDateTimePicker(); + Functions.addDateTimePicker(); }); }); @@ -190,7 +190,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () { $('#types_1').val(data.field_type); yType = data.field_type; $('#collations_1').val(data.field_collations); - addDateTimePicker(); + Functions.addDateTimePicker(); }); }); @@ -211,7 +211,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () { $('#tableFieldsId').find('tr:eq(4) td:eq(3)').html(data.field_value); $('#types_2').val(data.field_type); $('#collations_2').val(data.field_collations); - addDateTimePicker(); + Functions.addDateTimePicker(); }); }); @@ -232,7 +232,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () { $('#tableFieldsId').find('tr:eq(5) td:eq(3)').html(data.field_value); $('#types_3').val(data.field_type); $('#collations_3').val(data.field_collations); - addDateTimePicker(); + Functions.addDateTimePicker(); }); }); @@ -241,9 +241,9 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () { **/ $('#inputFormSubmitId').on('click', function () { if ($('#tableid_0').get(0).selectedIndex === 0 || $('#tableid_1').get(0).selectedIndex === 0) { - PMA_ajaxShowMessage(Messages.strInputNull); + Functions.ajaxShowMessage(Messages.strInputNull); } else if (xLabel === yLabel) { - PMA_ajaxShowMessage(Messages.strSameInputs); + Functions.ajaxShowMessage(Messages.strSameInputs); } }); @@ -398,9 +398,9 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () { }, function (data) { if (typeof data !== 'undefined' && data.success === true) { $('#sqlqueryresultsouter').html(data.sql_query); - PMA_highlightSQL($('#sqlqueryresultsouter')); + Functions.highlightSql($('#sqlqueryresultsouter')); } else { - PMA_ajaxShowMessage(data.error, false); + Functions.ajaxShowMessage(data.error, false); } }); // End $.post }// End database update diff --git a/js/transformations/sql_editor.js b/js/transformations/sql_editor.js index 4149b976c0..18139f3419 100644 --- a/js/transformations/sql_editor.js +++ b/js/transformations/sql_editor.js @@ -6,6 +6,6 @@ */ AJAX.registerOnload('transformations/sql_editor.js', function () { $('textarea.transform_sql_editor').each(function () { - PMA_getSQLEditor($(this), {}, 'both'); + Functions.getSqlEditor($(this), {}, 'both'); }); }); diff --git a/js/u2f.js b/js/u2f.js index 44bdac2637..1c7d7d2b21 100644 --- a/js/u2f.js +++ b/js/u2f.js @@ -13,10 +13,10 @@ AJAX.registerOnload('u2f.js', function () { // Handle returning error data if (data.errorCode && data.errorCode !== 0) { if (data.errorCode === 5) { - PMA_ajaxShowMessage(Messages.strU2FTimeout, false); + Functions.ajaxShowMessage(Messages.strU2FTimeout, false); } else { - PMA_ajaxShowMessage( - PMA_sprintf(Messages.strU2FError, data.errorCode), false + Functions.ajaxShowMessage( + Functions.sprintf(Messages.strU2FError, data.errorCode), false ); } return; @@ -41,10 +41,10 @@ AJAX.registerOnload('u2f.js', function () { // Handle returning error data if (data.errorCode && data.errorCode !== 0) { if (data.errorCode === 5) { - PMA_ajaxShowMessage(Messages.strU2FTimeout, false); + Functions.ajaxShowMessage(Messages.strU2FTimeout, false); } else { - PMA_ajaxShowMessage( - PMA_sprintf(Messages.strU2FError, data.errorCode), false + Functions.ajaxShowMessage( + Functions.sprintf(Messages.strU2FError, data.errorCode), false ); } return; diff --git a/libraries/classes/ErrorHandler.php b/libraries/classes/ErrorHandler.php index fe38beaef8..8eb29d103d 100644 --- a/libraries/classes/ErrorHandler.php +++ b/libraries/classes/ErrorHandler.php @@ -554,7 +554,7 @@ class ErrorHandler } else { // send the error reports asynchronously & without asking user $jsCode .= '$("#pma_report_errors_form").submit();' - . 'PMA_ajaxShowMessage( + . 'Functions.ajaxShowMessage( Messages.phpErrorsBeingSubmitted, false );'; // js code to appropriate focusing, @@ -566,22 +566,22 @@ class ErrorHandler //ask user whether to submit errors or not. if (! $response->isAjax()) { // js code to show appropriate msgs, event binding & focusing. - $jsCode = 'PMA_ajaxShowMessage(Messages.phpErrorsFound);' + $jsCode = 'Functions.ajaxShowMessage(Messages.phpErrorsFound);' . '$("#pma_ignore_errors_popup").bind("click", function() { - PMA_ignorePhpErrors() + Functions.ignorePhpErrors() });' . '$("#pma_ignore_all_errors_popup").bind("click", function() { - PMA_ignorePhpErrors(false) + Functions.ignorePhpErrors(false) });' . '$("#pma_ignore_errors_bottom").bind("click", function(e) { e.preventDefault(); - PMA_ignorePhpErrors() + Functions.ignorePhpErrors() });' . '$("#pma_ignore_all_errors_bottom").bind("click", function(e) { e.preventDefault(); - PMA_ignorePhpErrors(false) + Functions.ignorePhpErrors(false) });' . '$("html, body").animate({ scrollTop:$(document).height() diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php index e3242946dd..1541d9d3b2 100644 --- a/libraries/classes/Operations.php +++ b/libraries/classes/Operations.php @@ -87,7 +87,7 @@ class Operations . '
    '; + . 'onsubmit="return Functions.emptyCheckTheField(this, \'newname\')">'; if (! is_null($db_collation)) { $html_output .= ''; + . 'onsubmit="return Functions.emptyCheckTheField(this, \'newname\')">'; if (! is_null($db_collation)) { $html_output .= '' + . ' onsubmit="return Functions.emptyCheckTheField(this, \'new_name\')">' . Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); $html_output .= '' @@ -1317,7 +1317,7 @@ class Operations . 'name="copyTable" ' . 'id="copyTable" ' . ' class="ajax" ' - . 'onsubmit="return emptyCheckTheField(this, \'new_name\')">' + . 'onsubmit="return Functions.emptyCheckTheField(this, \'new_name\')">' . Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']) . ''; diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php index 92d0d33af0..2f1ba6513b 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php +++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php @@ -252,7 +252,7 @@ class AuthenticationCookie extends AuthenticationPlugin , $GLOBALS['lang'] , '" async defer>'; echo ''; + . ' data-callback="Functions.recaptchaCallback" value="' , __('Go') , '" type="submit" id="input_go">'; } $_form_params = []; if (! empty($GLOBALS['target'])) { diff --git a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php index 6f3d3e90f5..616a24e130 100644 --- a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php @@ -44,7 +44,6 @@ abstract class SQLTransformationsPlugin extends TransformationsPlugin */ public function applyTransformation($buffer, array $options = [], ?stdClass $meta = null) { - // see PMA_highlightSQL() return Util::formatSql($buffer); } diff --git a/libraries/classes/Rte/Footer.php b/libraries/classes/Rte/Footer.php index a50dee5842..5181b0057f 100644 --- a/libraries/classes/Rte/Footer.php +++ b/libraries/classes/Rte/Footer.php @@ -147,7 +147,7 @@ class Footer "sql.php$url_query&goto=db_events.php" . urlencode("?db=$db"), 'sql_query', $options, - 'PMA_slidingMessage(data.sql_query);' + 'Functions.slidingMessage(data.sql_query);' ); $retval .= "
    \n"; $retval .= " \n"; diff --git a/libraries/classes/SqlQueryForm.php b/libraries/classes/SqlQueryForm.php index c7cd78955e..79e60081fe 100644 --- a/libraries/classes/SqlQueryForm.php +++ b/libraries/classes/SqlQueryForm.php @@ -215,7 +215,7 @@ class SqlQueryForm ) { // enable auto select text in textarea if ($GLOBALS['cfg']['TextareaAutoSelect']) { - $auto_sel = ' onclick="selectContent(this, sql_box_locked, true);"'; + $auto_sel = ' onclick="Functions.selectContent(this, sql_box_locked, true);"'; } else { $auto_sel = ''; } @@ -282,7 +282,7 @@ class SqlQueryForm . '' . ''; } else { $html .= ''; + . ' onclick="Functions.insertValueQuery()">'; } $html .= '
    ' . "\n" . '
    ' . "\n"; diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 7ba02f9e42..e2dcdc2c8a 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -1792,7 +1792,7 @@ class Util $tmp = $tag_params; $tag_params = []; if (! empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' + $tag_params['onclick'] = 'return Functions.confirmLink(this, \'' . Sanitize::escapeJsString($tmp) . '\')'; } unset($tmp); diff --git a/templates/database/search/main.twig b/templates/database/search/main.twig index 27f9efd6bf..45e5e71b7b 100644 --- a/templates/database/search/main.twig +++ b/templates/database/search/main.twig @@ -28,10 +28,10 @@
    {% trans 'Inside tables:' %}

    - + {% trans 'Select all' %} / - + {% trans 'Unselect all' %}

    diff --git a/templates/display/export/select_options.twig b/templates/display/export/select_options.twig index 7b153a3d4e..4ca00baa3c 100644 --- a/templates/display/export/select_options.twig +++ b/templates/display/export/select_options.twig @@ -1,10 +1,10 @@

    - + {% trans 'Select all' %} / - + {% trans 'Unselect all' %}

    diff --git a/templates/display/import/javascript.twig b/templates/display/import/javascript.twig index 24c33a4fd3..0e9634bb66 100644 --- a/templates/display/import/javascript.twig +++ b/templates/display/import/javascript.twig @@ -65,12 +65,12 @@ $( function() { now.getMinutes(), now.getSeconds()) + now.getMilliseconds() - 1000; - var statustext = PMA_sprintf( + var statustext = Functions.sprintf( "{{ statustext_str|raw }}", - formatBytes( + Functions.formatBytes( complete, 1, Messages.strDecimalSeparator ), - formatBytes( + Functions.formatBytes( total, 1, Messages.strDecimalSeparator ) ); @@ -87,9 +87,9 @@ $( function() { {# Calculate estimated time #} var used_time = now - import_start; var seconds = parseInt(((total - complete) / complete) * used_time / 1000); - var speed = PMA_sprintf( + var speed = Functions.sprintf( "{{ second_str|raw }}", - formatBytes(complete / used_time * 1000, 1, Messages.strDecimalSeparator) + Functions.formatBytes(complete / used_time * 1000, 1, Messages.strDecimalSeparator) ); var minutes = parseInt(seconds / 60); diff --git a/templates/display/results/table_navigation.twig b/templates/display/results/table_navigation.twig index 63bb70cdf6..0746243b06 100644 --- a/templates/display/results/table_navigation.twig +++ b/templates/display/results/table_navigation.twig @@ -36,11 +36,11 @@ {# if displaying a VIEW, $unlim_num_rows could be zero because #} {# of $cfg['MaxExactCountViews']; in this case, avoid passing #} - {# the 5th parameter to checkFormElementInRange() #} + {# the 5th parameter to Functions.checkFormElementInRange() #} {# (this means we can't validate the upper limit) #} - - +
    diff --git a/templates/sql/bookmark.twig b/templates/sql/bookmark.twig index 8a1c999eb7..71abc3d1fb 100644 --- a/templates/sql/bookmark.twig +++ b/templates/sql/bookmark.twig @@ -1,5 +1,5 @@ + onsubmit="return ! Functions.emptyCheckTheField(this, 'bkm_fields[bkm_label]');"> {{ get_hidden_inputs() }} diff --git a/templates/view_create.twig b/templates/view_create.twig index bd9c9e53a6..ab9cd13982 100644 --- a/templates/view_create.twig +++ b/templates/view_create.twig @@ -85,7 +85,7 @@ AS -
    +
    diff --git a/test/classes/Plugins/Auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php index c535d8e153..3f53a21ddf 100644 --- a/test/classes/Plugins/Auth/AuthenticationCookieTest.php +++ b/test/classes/Plugins/Auth/AuthenticationCookieTest.php @@ -345,7 +345,7 @@ class AuthenticationCookieTest extends PmaTestCase $this->assertStringContainsString( '', + . ' data-callback="Functions.recaptchaCallback" value="Go" type="submit" id="input_go">', $result ); } diff --git a/test/classes/SqlQueryFormTest.php b/test/classes/SqlQueryFormTest.php index 2e9755ec05..1fa023d247 100644 --- a/test/classes/SqlQueryFormTest.php +++ b/test/classes/SqlQueryFormTest.php @@ -126,7 +126,7 @@ class SqlQueryFormTest extends TestCase ); //validate 2: enable auto select text in textarea - $auto_sel = ' onclick="selectContent(this, sql_box_locked, true);"'; + $auto_sel = ' onclick="Functions.selectContent(this, sql_box_locked, true);"'; $this->assertStringContainsString( $auto_sel, $html