Merge pull request #15288 from mauriciofauth/functions-js
Use a module for js/functions.js functions
This commit is contained in:
Maurício Meneghini Fauth
GitHub
commit
842be3898b
@ -110,7 +110,7 @@ if (isset($_POST['send_error_report'])
|
||||
$response->addJSON('_errSubmitMsg', $msg);
|
||||
}
|
||||
} elseif ($_POST['exception_type'] == 'php') {
|
||||
$jsCode = 'PMA_ajaxShowMessage("<div class=\"error\">'
|
||||
$jsCode = 'Functions.ajaxShowMessage("<div class=\"error\">'
|
||||
. $msg
|
||||
. '</div>", false);';
|
||||
$response->getFooter()->getScripts()->addCode($jsCode);
|
||||
|
||||
72
js/ajax.js
72
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(
|
||||
'<div id=\'page_content\'>' + data.message + '</div>'
|
||||
);
|
||||
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 = $('<div></div>');
|
||||
$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 += '<div>' + escapeHtml(PMA_sprintf(Messages.strErrorCode, request.status)) + '</div>';
|
||||
details += '<div>' + Functions.escapeHtml(Functions.sprintf(Messages.strErrorCode, request.status)) + '</div>';
|
||||
}
|
||||
details += '<div>' + escapeHtml(PMA_sprintf(Messages.strErrorText, request.statusText + ' (' + state + ')')) + '</div>';
|
||||
details += '<div>' + Functions.escapeHtml(Functions.sprintf(Messages.strErrorText, request.statusText + ' (' + state + ')')) + '</div>';
|
||||
if (state === 'rejected' || state === 'timeout') {
|
||||
details += '<div>' + escapeHtml(Messages.strErrorConnection) + '</div>';
|
||||
details += '<div>' + Functions.escapeHtml(Messages.strErrorConnection) + '</div>';
|
||||
}
|
||||
PMA_ajaxShowMessage(
|
||||
Functions.ajaxShowMessage(
|
||||
'<div class="error">' +
|
||||
Messages.strErrorProcessingRequest +
|
||||
details +
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
@ -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('<input name="profiling" value="on">');
|
||||
}
|
||||
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(
|
||||
$('<div class="message welcome">')
|
||||
.text(
|
||||
PMA_sprintf(
|
||||
Functions.sprintf(
|
||||
Messages.strConsoleDebugArgsSummary,
|
||||
dbgStep.args.length
|
||||
)
|
||||
@ -1216,7 +1216,7 @@ PMA_consoleDebug = {
|
||||
$('<div class="message">')
|
||||
.html(
|
||||
'<pre>' +
|
||||
escapeHtml(JSON.stringify(dbgStep.args[i], null, ' ')) +
|
||||
Functions.escapeHtml(JSON.stringify(dbgStep.args[i], null, ' ')) +
|
||||
'</pre>'
|
||||
)
|
||||
);
|
||||
@ -1418,7 +1418,7 @@ PMA_consoleDebug = {
|
||||
// Show summary
|
||||
$('#debug_console').find('.debug>.welcome').append(
|
||||
$('<span class="debug_summary">').text(
|
||||
PMA_sprintf(
|
||||
Functions.sprintf(
|
||||
Messages.strConsoleDebugSummary,
|
||||
totalUnique,
|
||||
totalExec,
|
||||
|
||||
@ -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(
|
||||
'<div class="error">' +
|
||||
data.message +
|
||||
'</div>',
|
||||
@ -182,7 +182,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
|
||||
$('#tableslistcontainer').find('.checkall').show();
|
||||
},
|
||||
error: function () {
|
||||
PMA_ajaxShowMessage(
|
||||
Functions.ajaxShowMessage(
|
||||
'<div class="error">' +
|
||||
Messages.strErrorProcessingRequest +
|
||||
'</div>',
|
||||
|
||||
@ -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();
|
||||
});
|
||||
|
||||
|
||||
@ -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);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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 $()
|
||||
|
||||
@ -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')
|
||||
|
||||
@ -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);
|
||||
});
|
||||
|
||||
@ -95,17 +95,17 @@ function display (init, finit) {
|
||||
} else {
|
||||
str += '<img src="' + pmaThemeImage + 'designer/and_icon.png" onclick="and_or(' + i + ')" title="AND"></td>';
|
||||
}
|
||||
str += '<td style="padding-left: 5px;" class="right">' + PMA_getImage('b_sbrowse', 'column name') + '</td>' +
|
||||
str += '<td style="padding-left: 5px;" class="right">' + Functions.getImage('b_sbrowse', 'column name') + '</td>' +
|
||||
'<td width="175" style="padding-left: 5px">' + history_array[i].get_column_name() + '<td>';
|
||||
if (history_array[i].get_type() === 'GroupBy' || history_array[i].get_type() === 'OrderBy') {
|
||||
str += '<td class="center">' + PMA_getImage('s_info', detail(i)) + '</td>' +
|
||||
str += '<td class="center">' + Functions.getImage('s_info', detail(i)) + '</td>' +
|
||||
'<td title="' + detail(i) + '">' + history_array[i].get_type() + '</td>' +
|
||||
'<td onclick=history_delete(' + i + ')>' + PMA_getImage('b_drop', Messages.strDelete) + '</td>';
|
||||
'<td onclick=history_delete(' + i + ')>' + Functions.getImage('b_drop', Messages.strDelete) + '</td>';
|
||||
} else {
|
||||
str += '<td class="center">' + PMA_getImage('s_info', detail(i)) + '</td>' +
|
||||
str += '<td class="center">' + Functions.getImage('s_info', detail(i)) + '</td>' +
|
||||
'<td title="' + detail(i) + '">' + history_array[i].get_type() + '</td>' +
|
||||
'<td onclick=history_edit(' + i + ')>' + PMA_getImage('b_edit', Messages.strEdit) + '</td>' +
|
||||
'<td onclick=history_delete(' + i + ')>' + PMA_getImage('b_drop', Messages.strDelete) + '</td>';
|
||||
'<td onclick=history_edit(' + i + ')>' + Functions.getImage('b_edit', Messages.strEdit) + '</td>' +
|
||||
'<td onclick=history_delete(' + i + ')>' + Functions.getImage('b_drop', Messages.strDelete) + '</td>';
|
||||
}
|
||||
str += '</tr></thead>';
|
||||
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);
|
||||
|
||||
@ -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 = '<strong>' + PMA_sprintf(Messages.strAddOption, decodeURI(column_name)) + '</strong>';
|
||||
document.getElementById('option_col_name').innerHTML = '<strong>' + Functions.sprintf(Messages.strAddOption, decodeURI(column_name)) + '</strong>';
|
||||
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);
|
||||
|
||||
@ -61,7 +61,7 @@ function Create_page_list (db, callback) {
|
||||
var page = pages[p];
|
||||
if (page.db_name === db) {
|
||||
html += '<option value="' + page.pg_nr + '">';
|
||||
html += escapeHtml(page.page_descr) + '</option>';
|
||||
html += Functions.escapeHtml(page.page_descr) + '</option>';
|
||||
}
|
||||
}
|
||||
if (typeof callback !== 'undefined') {
|
||||
|
||||
@ -302,8 +302,8 @@ PMA_DROP_IMPORT = {
|
||||
var $pma_sql_import_status_div = $('.pma_sql_import_status div');
|
||||
$pma_sql_import_status_div.append('<li data-hash="' + hash + '">' +
|
||||
((ext !== '') ? '' : '<img src="./themes/dot.gif" title="invalid format" class="icon ic_s_notice"> ') +
|
||||
escapeHtml(files[i].name) + '<span class="filesize" data-filename="' +
|
||||
escapeHtml(files[i].name) + '">' + (files[i].size / 1024).toFixed(2) +
|
||||
Functions.escapeHtml(files[i].name) + '<span class="filesize" data-filename="' +
|
||||
Functions.escapeHtml(files[i].name) + '">' + (files[i].size / 1024).toFixed(2) +
|
||||
' kb</span></li>');
|
||||
|
||||
// scroll the UI to bottom
|
||||
|
||||
@ -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 = {
|
||||
'<div style="position:fixed;bottom:0;left:0;right:0;margin:0;' +
|
||||
'z-index:1000" class="error" id="error_notification"></div>'
|
||||
).append(
|
||||
PMA_getImage('s_error') + Messages.strErrorOccurred
|
||||
Functions.getImage('s_error') + Messages.strErrorOccurred
|
||||
);
|
||||
|
||||
var $buttons = $('<div class="floatright"></div>');
|
||||
@ -135,11 +135,11 @@ var ErrorReport = {
|
||||
button_html += '</button>';
|
||||
|
||||
button_html += '<a id="change_error_settings">';
|
||||
button_html += PMA_getImage('s_cog', Messages.strChangeReportSettings);
|
||||
button_html += Functions.getImage('s_cog', Messages.strChangeReportSettings);
|
||||
button_html += '</a>';
|
||||
|
||||
button_html += '<a href="#" id="ignore_error">';
|
||||
button_html += PMA_getImage('b_close', Messages.strIgnore);
|
||||
button_html += Functions.getImage('b_close', Messages.strIgnore);
|
||||
button_html += '</a>';
|
||||
|
||||
$buttons.html(button_html);
|
||||
|
||||
32
js/export.js
32
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(
|
||||
'<div class="error">' +
|
||||
Messages.strTimeOutError +
|
||||
'</div>',
|
||||
@ -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);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
751
js/functions.js
751
js/functions.js
File diff suppressed because it is too large
Load Diff
@ -58,7 +58,7 @@ function prepareJSVersion () {
|
||||
*/
|
||||
function addDataPoint (pointNumber, prefix) {
|
||||
return '<br>' +
|
||||
PMA_sprintf(Messages.strPointN, (pointNumber + 1)) + ': ' +
|
||||
Functions.sprintf(Messages.strPointN, (pointNumber + 1)) + ': ' +
|
||||
'<label for="x">' + Messages.strX + '</label>' +
|
||||
'<input type="text" name="' + prefix + '[' + pointNumber + '][x]" value="">' +
|
||||
'<label for="y">' + Messages.strY + '</label>' +
|
||||
@ -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');
|
||||
});
|
||||
|
||||
12
js/import.js
12
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('<div class="error"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_error"> ' + Messages.strNoImportFile + ' </div>', false);
|
||||
Functions.ajaxShowMessage('<div class="error"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_error"> ' + Messages.strNoImportFile + ' </div>', 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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -346,7 +346,7 @@ function PMA_showAddIndexDialog (source_array, array_index, target_columns, col_
|
||||
col_index
|
||||
);
|
||||
} else {
|
||||
PMA_ajaxShowMessage(
|
||||
Functions.ajaxShowMessage(
|
||||
'<div class="error"><img src="themes/dot.gif" title="" alt=""' +
|
||||
' class="icon ic_s_error"> ' + Messages.strMissingColumn +
|
||||
' </div>', 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(
|
||||
'<div class="error"><img src="themes/dot.gif" title="" alt=""' +
|
||||
' class="icon ic_s_error"> ' + Messages.strMissingColumn +
|
||||
' </div>', 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(
|
||||
'<div class="error"><img src="themes/dot.gif" title=""' +
|
||||
' alt="" class="icon ic_s_error"> ' +
|
||||
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 () {
|
||||
$('<div class="result_query"></div>')
|
||||
.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');
|
||||
|
||||
@ -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 <td>
|
||||
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 <br> before carriage return.
|
||||
new_html = escapeHtml(value);
|
||||
new_html = Functions.escapeHtml(value);
|
||||
new_html = new_html.replace(/\n/g, '<br>\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 = '<div class="error">' + Messages.strEnterValidHex + '</div>';
|
||||
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 <th> with draggable class
|
||||
PMA_tooltip(
|
||||
Functions.tooltip(
|
||||
$(t).find('th.draggable'),
|
||||
'th',
|
||||
g.updateHint()
|
||||
|
||||
@ -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 = $('<li></li>', { 'class': 'submenu' })
|
||||
.append(link)
|
||||
|
||||
@ -90,7 +90,7 @@ PMA_MicroHistory = {
|
||||
typeof this.pages[index].menu === 'undefined' ||
|
||||
! PMA_MicroHistory.menus.get(this.pages[index].menu)
|
||||
) {
|
||||
PMA_ajaxShowMessage(
|
||||
Functions.ajaxShowMessage(
|
||||
'<div class="error">' + Messages.strInvalidPage + '</div>',
|
||||
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);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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
|
||||
|
||||
@ -110,7 +110,7 @@ function goToFinish1NF () {
|
||||
}
|
||||
$('#mainContent legend').html(Messages.strEndStep);
|
||||
$('#mainContent h4').html(
|
||||
'<h3>' + PMA_sprintf(Messages.strFinishMsg, escapeHtml(CommonParams.get('table'))) + '</h3>'
|
||||
'<h3>' + Functions.sprintf(Messages.strFinishMsg, Functions.escapeHtml(CommonParams.get('table'))) + '</h3>'
|
||||
);
|
||||
$('#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 += '<p class="displayblock desc">' + escapeHtml(dependson) + ' -> ' + escapeHtml(pd[dependson].toString()) + '</p>';
|
||||
extra += '<p class="displayblock desc">' + Functions.escapeHtml(dependson) + ' -> ' + Functions.escapeHtml(pd[dependson].toString()) + '</p>';
|
||||
}
|
||||
}
|
||||
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 += '<p class="displayblock desc">' + escapeHtml(dependson) + ' -> ' + escapeHtml(pd[dependson].toString()) + '</p>';
|
||||
extra += '<p class="displayblock desc">' + Functions.escapeHtml(dependson) + ' -> ' + Functions.escapeHtml(pd[dependson].toString()) + '</p>';
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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 += '<input type="text" name="repeatGroupTable" placeholder="' + Messages.strNewTablePlaceholder + '">' +
|
||||
'( ' + escapeHtml(primary_key.toString()) + ', <input type="text" name="repeatGroupColumn" placeholder="' + Messages.strNewColumnPlaceholder + '" value="' + escapeHtml(newColName) + '">)' +
|
||||
'( ' + Functions.escapeHtml(primary_key.toString()) + ', <input type="text" name="repeatGroupColumn" placeholder="' + Messages.strNewColumnPlaceholder + '" value="' + Functions.escapeHtml(newColName) + '">)' +
|
||||
'</ol>';
|
||||
$('#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();
|
||||
|
||||
@ -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());
|
||||
|
||||
78
js/rte.js
78
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()
|
||||
}
|
||||
|
||||
@ -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(
|
||||
$('<div class="notice"></div>').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('<br>'));
|
||||
Functions.sprintf(Messages.strDoYouReally, selected_dbs.join('<br>'));
|
||||
|
||||
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()
|
||||
|
||||
@ -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();
|
||||
}
|
||||
|
||||
@ -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 + '<br>';
|
||||
|
||||
if (logVars.log_output !== 'TABLE') {
|
||||
str += PMA_getImage('s_error') + ' ' + Messages.strLogOutNotTable + '<br>';
|
||||
str += Functions.getImage('s_error') + ' ' + Messages.strLogOutNotTable + '<br>';
|
||||
} else {
|
||||
str += PMA_getImage('s_success') + ' ' + Messages.strLogOutIsTable + '<br>';
|
||||
str += Functions.getImage('s_success') + ' ' + Messages.strLogOutIsTable + '<br>';
|
||||
}
|
||||
|
||||
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 += '<br>';
|
||||
}
|
||||
|
||||
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 += '<br>';
|
||||
}
|
||||
}
|
||||
@ -779,26 +779,26 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
}
|
||||
|
||||
str += '- <a class="set" href="#log_output-' + varValue + '">';
|
||||
str += PMA_sprintf(Messages.strSetLogOutput, varValue);
|
||||
str += Functions.sprintf(Messages.strSetLogOutput, varValue);
|
||||
str += ' </a><br>';
|
||||
|
||||
if (logVars.general_log !== 'ON') {
|
||||
str += '- <a class="set" href="#general_log-ON">';
|
||||
str += PMA_sprintf(Messages.strEnableVar, 'general_log');
|
||||
str += Functions.sprintf(Messages.strEnableVar, 'general_log');
|
||||
str += ' </a><br>';
|
||||
} else {
|
||||
str += '- <a class="set" href="#general_log-OFF">';
|
||||
str += PMA_sprintf(Messages.strDisableVar, 'general_log');
|
||||
str += Functions.sprintf(Messages.strDisableVar, 'general_log');
|
||||
str += ' </a><br>';
|
||||
}
|
||||
|
||||
if (logVars.slow_query_log !== 'ON') {
|
||||
str += '- <a class="set" href="#slow_query_log-ON">';
|
||||
str += PMA_sprintf(Messages.strEnableVar, 'slow_query_log');
|
||||
str += Functions.sprintf(Messages.strEnableVar, 'slow_query_log');
|
||||
str += ' </a><br>';
|
||||
} else {
|
||||
str += '- <a class="set" href="#slow_query_log-OFF">';
|
||||
str += PMA_sprintf(Messages.strDisableVar, 'slow_query_log');
|
||||
str += Functions.sprintf(Messages.strDisableVar, 'slow_query_log');
|
||||
str += ' </a><br>';
|
||||
}
|
||||
|
||||
@ -808,7 +808,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
}
|
||||
|
||||
str += '- <a class="set" href="#long_query_time-' + varValue + '">';
|
||||
str += PMA_sprintf(Messages.setSetLongQueryTime, varValue);
|
||||
str += Functions.sprintf(Messages.setSetLongQueryTime, varValue);
|
||||
str += ' </a><br>';
|
||||
} else {
|
||||
str += Messages.strNoSuperUser + '<br>';
|
||||
@ -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) + '<br>');
|
||||
$('#seriesPreview').append('- ' + Functions.escapeHtml(newSeries.label + str) + '<br>');
|
||||
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 += '<br><span style="color:' + seriesColor + '">' +
|
||||
seriesLabel + ': ' + seriesValue + '</span>';
|
||||
@ -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 += '<p>' + Messages.strMoreCountColumnExplanation + '</p>';
|
||||
}
|
||||
|
||||
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 += '<p></p>';
|
||||
|
||||
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 = '<span class="attention">' + value + '</span>';
|
||||
@ -2096,7 +2096,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
|
||||
totalTime += duration;
|
||||
|
||||
numberTable += '<tr><td>' + data.profiling[i].state + ' </td><td> ' + PMA_prettyProfilingNum(duration, 2) + '</td></tr>';
|
||||
numberTable += '<tr><td>' + data.profiling[i].state + ' </td><td> ' + Functions.prettyProfilingNum(duration, 2) + '</td></tr>';
|
||||
}
|
||||
|
||||
// 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 += '<tr><td><b>' + Messages.strTotalTime + '</b></td><td>' + PMA_prettyProfilingNum(totalTime, 2) + '</td></tr>';
|
||||
numberTable += '<tr><td><b>' + Messages.strTotalTime + '</b></td><td>' + Functions.prettyProfilingNum(totalTime, 2) + '</td></tr>';
|
||||
numberTable += '</tbody></table>';
|
||||
|
||||
$('#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 });
|
||||
|
||||
@ -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));
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
@ -26,7 +26,7 @@ AJAX.registerOnload('server_status_queries.js', function () {
|
||||
});
|
||||
$('#serverstatusquerieschart').data(
|
||||
'queryPieChart',
|
||||
PMA_createProfilingChart(
|
||||
Functions.createProfilingChart(
|
||||
'serverstatusquerieschart',
|
||||
cdata
|
||||
)
|
||||
|
||||
@ -35,7 +35,7 @@ AJAX.registerOnload('server_user_groups.js', function () {
|
||||
};
|
||||
$('<div></div>')
|
||||
.attr('id', 'confirmUserGroupDeleteDialog')
|
||||
.append(PMA_sprintf(Messages.strDropUserGroupWarning, escapeHtml(groupName)))
|
||||
.append(Functions.sprintf(Messages.strDropUserGroupWarning, Functions.escapeHtml(groupName)))
|
||||
.dialog({
|
||||
width: 300,
|
||||
minWidth: 200,
|
||||
|
||||
@ -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);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
64
js/sql.js
64
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($('<label for="bookmark_variable_' + i + '">' + PMA_sprintf(Messages.strBookmarkVariable, i) + '</label>'));
|
||||
$varDiv.append($('<label for="bookmark_variable_' + i + '">' + Functions.sprintf(Messages.strBookmarkVariable, i) + '</label>'));
|
||||
$varDiv.append($('<input type="text" size="10" name="bookmark_variable[' + i + ']" id="bookmark_variable_' + i + '">'));
|
||||
}
|
||||
|
||||
@ -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 = '<div class="preview_sql">';
|
||||
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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -698,7 +698,7 @@ function addNewContinueInsertionFiels (event) {
|
||||
}
|
||||
}
|
||||
// Add all the required datepickers back
|
||||
addDateTimePicker();
|
||||
Functions.addDateTimePicker();
|
||||
}
|
||||
|
||||
function changeValueFieldType (elem, searchIndex) {
|
||||
|
||||
@ -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()
|
||||
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -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 !== '') {
|
||||
$('<div id="tooltip">' + contents + '</div>').css({
|
||||
|
||||
@ -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);
|
||||
$('<div class=\'sqlqueryresults ajax\'></div>').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 = $('<div id=\'temp_div\'></div>');
|
||||
$temp_div.html(data.message);
|
||||
var $success = $temp_div.find('.result_query .success');
|
||||
PMA_ajaxShowMessage($success);
|
||||
Functions.ajaxShowMessage($success);
|
||||
$('<div class=\'sqlqueryresults ajax\'></div>').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);
|
||||
$('<div class=\'sqlqueryresults ajax\'></div>').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'
|
||||
|
||||
@ -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 += '<option value=\'' + escapeHtml(this) + '\'' + (selectedValue === escapeHtml(this) ? ' selected=\'selected\'' : '') + '>' + escapeHtml(this) + '</option>';
|
||||
optionsAsString += '<option value=\'' + Functions.escapeHtml(this) + '\'' + (selectedValue === Functions.escapeHtml(this) ? ' selected=\'selected\'' : '') + '>' + Functions.escapeHtml(this) + '</option>';
|
||||
});
|
||||
$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()
|
||||
|
||||
@ -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);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -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 () {
|
||||
$('<div class="result_query"></div>')
|
||||
.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);
|
||||
});
|
||||
|
||||
@ -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);
|
||||
});
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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');
|
||||
});
|
||||
});
|
||||
|
||||
12
js/u2f.js
12
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;
|
||||
|
||||
@ -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()
|
||||
|
||||
@ -87,7 +87,7 @@ class Operations
|
||||
. '<form id="rename_db_form" '
|
||||
. 'class="ajax" '
|
||||
. 'method="post" action="db_operations.php" '
|
||||
. 'onsubmit="return emptyCheckTheField(this, \'newname\')">';
|
||||
. 'onsubmit="return Functions.emptyCheckTheField(this, \'newname\')">';
|
||||
if (! is_null($db_collation)) {
|
||||
$html_output .= '<input type="hidden" name="db_collation" '
|
||||
. 'value="' . $db_collation
|
||||
@ -206,7 +206,7 @@ class Operations
|
||||
$html_output .= '<form id="copy_db_form" '
|
||||
. 'class="ajax" '
|
||||
. 'method="post" action="db_operations.php" '
|
||||
. 'onsubmit="return emptyCheckTheField(this, \'newname\')">';
|
||||
. 'onsubmit="return Functions.emptyCheckTheField(this, \'newname\')">';
|
||||
|
||||
if (! is_null($db_collation)) {
|
||||
$html_output .= '<input type="hidden" name="db_collation" '
|
||||
@ -866,7 +866,7 @@ class Operations
|
||||
$html_output = '<div>';
|
||||
$html_output .= '<form method="post" action="tbl_operations.php"'
|
||||
. ' id="moveTableForm" class="ajax"'
|
||||
. ' onsubmit="return emptyCheckTheField(this, \'new_name\')">'
|
||||
. ' onsubmit="return Functions.emptyCheckTheField(this, \'new_name\')">'
|
||||
. Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
|
||||
|
||||
$html_output .= '<input type="hidden" name="reload" value="1">'
|
||||
@ -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'])
|
||||
. '<input type="hidden" name="reload" value="1">';
|
||||
|
||||
|
||||
@ -252,7 +252,7 @@ class AuthenticationCookie extends AuthenticationPlugin
|
||||
, $GLOBALS['lang'] , '" async defer></script>';
|
||||
echo '<input class="btn btn-primary g-recaptcha" data-sitekey="'
|
||||
, htmlspecialchars($GLOBALS['cfg']['CaptchaLoginPublicKey']),'"'
|
||||
. ' data-callback="recaptchaCallback" value="' , __('Go') , '" type="submit" id="input_go">';
|
||||
. ' data-callback="Functions.recaptchaCallback" value="' , __('Go') , '" type="submit" id="input_go">';
|
||||
}
|
||||
$_form_params = [];
|
||||
if (! empty($GLOBALS['target'])) {
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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 .= " </div>\n";
|
||||
$retval .= " </fieldset>\n";
|
||||
|
||||
@ -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
|
||||
. '<label>' . __('Columns') . '</label>'
|
||||
. '<select id="tablefields" name="dummy" '
|
||||
. 'size="' . ($GLOBALS['cfg']['TextareaRows'] - 2) . '" '
|
||||
. 'multiple="multiple" ondblclick="insertValueQuery()">';
|
||||
. 'multiple="multiple" ondblclick="Functions.insertValueQuery()">';
|
||||
foreach ($columns_list as $field) {
|
||||
$html .= '<option value="'
|
||||
. Util::backquote(htmlspecialchars($field['Field']))
|
||||
@ -299,12 +299,12 @@ class SqlQueryForm
|
||||
. '<div id="tablefieldinsertbuttoncontainer">';
|
||||
if (Util::showIcons('ActionLinksMode')) {
|
||||
$html .= '<input type="button" class="btn btn-secondary button" name="insert"'
|
||||
. ' value="<<" onclick="insertValueQuery()"'
|
||||
. ' value="<<" onclick="Functions.insertValueQuery()"'
|
||||
. ' title="' . __('Insert') . '">';
|
||||
} else {
|
||||
$html .= '<input type="button" class="btn btn-secondary button" name="insert"'
|
||||
. ' value="' . __('Insert') . '"'
|
||||
. ' onclick="insertValueQuery()">';
|
||||
. ' onclick="Functions.insertValueQuery()">';
|
||||
}
|
||||
$html .= '</div>' . "\n"
|
||||
. '</div>' . "\n";
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -28,10 +28,10 @@
|
||||
<fieldset>
|
||||
<legend>{% trans 'Inside tables:' %}</legend>
|
||||
<p>
|
||||
<a href="#" onclick="setSelectOptions('db_search', 'criteriaTables[]', true); return false;">
|
||||
<a href="#" onclick="Functions.setSelectOptions('db_search', 'criteriaTables[]', true); return false;">
|
||||
{% trans 'Select all' %}
|
||||
</a> /
|
||||
<a href="#" onclick="setSelectOptions('db_search', 'criteriaTables[]', false); return false;">
|
||||
<a href="#" onclick="Functions.setSelectOptions('db_search', 'criteriaTables[]', false); return false;">
|
||||
{% trans 'Unselect all' %}
|
||||
</a>
|
||||
</p>
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<div>
|
||||
<p>
|
||||
<a href="#" onclick="setSelectOptions('dump', 'db_select[]', true); return false;">
|
||||
<a href="#" onclick="Functions.setSelectOptions('dump', 'db_select[]', true); return false;">
|
||||
{% trans 'Select all' %}
|
||||
</a>
|
||||
/
|
||||
<a href="#" onclick="setSelectOptions('dump', 'db_select[]', false); return false;">
|
||||
<a href="#" onclick="Functions.setSelectOptions('dump', 'db_select[]', false); return false;">
|
||||
{% trans 'Unselect all' %}
|
||||
</a>
|
||||
</p>
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -36,11 +36,11 @@
|
||||
<td class="navigation_goto">
|
||||
{# 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) #}
|
||||
<form action="sql.php" method="post" onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '
|
||||
<form action="sql.php" method="post" onsubmit="return (Functions.checkFormElementInRange(this, 'session_max_rows', '
|
||||
{{- '%d is not valid row number.'|trans|replace({'\'': '\\\''}) -}}
|
||||
', 1) && checkFormElementInRange(this, 'pos', '
|
||||
', 1) && Functions.checkFormElementInRange(this, 'pos', '
|
||||
{{- '%d is not valid row number.'|trans|replace({'\'': '\\\''}) -}}
|
||||
', 0
|
||||
{{- unlim_num_rows > 0 ? ', ' ~ (unlim_num_rows - 1) -}}
|
||||
|
||||
@ -70,7 +70,7 @@
|
||||
{% trans 'Generate password:' %}
|
||||
</label>
|
||||
<span class="options">
|
||||
<input type="button" class="btn btn-secondary button" id="button_generate_password" value="{% trans 'Generate' %}" onclick="suggestPassword(this.form)">
|
||||
<input type="button" class="btn btn-secondary button" id="button_generate_password" value="{% trans 'Generate' %}" onclick="Functions.suggestPassword(this.form)">
|
||||
</span>
|
||||
<input type="text" name="generated_pw" id="generated_pw">
|
||||
</div>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<form action="sql.php" method="post" class="bookmarkQueryForm print_ignore"
|
||||
onsubmit="return ! emptyCheckTheField(this, 'bkm_fields[bkm_label]');">
|
||||
onsubmit="return ! Functions.emptyCheckTheField(this, 'bkm_fields[bkm_label]');">
|
||||
{{ get_hidden_inputs() }}
|
||||
<input type="hidden" name="db" value="{{ db }}">
|
||||
<input type="hidden" name="goto" value="{{ goto }}">
|
||||
|
||||
@ -85,7 +85,7 @@
|
||||
<tr>
|
||||
<td class="nowrap">AS</td>
|
||||
<td>
|
||||
<textarea name="view[as]" rows="15" cols="40" dir="{{ text_dir }}" onclick="selectContent(this, sql_box_locked, true)">{{ view['as'] }}</textarea><br>
|
||||
<textarea name="view[as]" rows="15" cols="40" dir="{{ text_dir }}" onclick="Functions.selectContent(this, sql_box_locked, true)">{{ view['as'] }}</textarea><br>
|
||||
<input type="button" value="Format" id="format" class="btn btn-secondary button sqlbutton">
|
||||
<span id="querymessage"></span>
|
||||
</td>
|
||||
|
||||
@ -345,7 +345,7 @@ class AuthenticationCookieTest extends PmaTestCase
|
||||
|
||||
$this->assertStringContainsString(
|
||||
'<input class="btn btn-primary g-recaptcha" data-sitekey="testpubkey"'
|
||||
. ' data-callback="recaptchaCallback" value="Go" type="submit" id="input_go">',
|
||||
. ' data-callback="Functions.recaptchaCallback" value="Go" type="submit" id="input_go">',
|
||||
$result
|
||||
);
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
