Visitar URL original
Merge pull request #17950 from MauricioFauth/ajax-messages · phpmyadmin/phpmyadmin@ce5ce76 · GitHub
Skip to content

Commit ce5ce76

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #17950 from MauricioFauth/ajax-messages
Extract Functions.ajaxShowMessage() into ajax-messages.js
2 parents 3816e1b + 3bc3c7d commit ce5ce76

43 files changed

Lines changed: 632 additions & 595 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎js/src/database/central_columns.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import $ from 'jquery';
22
import { AJAX } from '../modules/ajax.js';
3-
import { Functions } from '../modules/functions.js';
43
import { CommonParams } from '../modules/common.js';
4+
import { ajaxShowMessage } from '../modules/ajax-message.js';
55

66
/**
77
* @fileoverview events handling from central columns page
@@ -54,23 +54,23 @@ AJAX.registerOnload('database/central_columns.js', function () {
5454
event.preventDefault();
5555
var multiDeleteColumns = $('.checkall:checkbox:checked').serialize();
5656
if (multiDeleteColumns === '') {
57-
Functions.ajaxShowMessage(window.Messages.strRadioUnchecked);
57+
ajaxShowMessage(window.Messages.strRadioUnchecked);
5858
return false;
5959
}
60-
Functions.ajaxShowMessage();
60+
ajaxShowMessage();
6161
$('#del_col_name').val(multiDeleteColumns);
6262
$('#del_form').trigger('submit');
6363
});
6464
$('#tableslistcontainer').find('button[name="edit_central_columns"]').on('click', function (event) {
6565
event.preventDefault();
6666
var editColumnList = $('.checkall:checkbox:checked').serialize();
6767
if (editColumnList === '') {
68-
Functions.ajaxShowMessage(window.Messages.strRadioUnchecked);
68+
ajaxShowMessage(window.Messages.strRadioUnchecked);
6969
return false;
7070
}
7171
var argsep = CommonParams.get('arg_separator');
7272
var editColumnData = editColumnList + '' + argsep + 'edit_central_columns_page=true' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'db=' + encodeURIComponent(CommonParams.get('db')) + argsep + 'server=' + CommonParams.get('server');
73-
Functions.ajaxShowMessage();
73+
ajaxShowMessage();
7474
AJAX.source = $(this);
7575
$.post('index.php?route=/database/central-columns', editColumnData, AJAX.responseHandler);
7676
});
@@ -79,7 +79,7 @@ AJAX.registerOnload('database/central_columns.js', function () {
7979
event.stopPropagation();
8080
var argsep = CommonParams.get('arg_separator');
8181
var multiColumnEditData = $('#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')) + argsep + 'server=' + CommonParams.get('server');
82-
Functions.ajaxShowMessage();
82+
ajaxShowMessage();
8383
AJAX.source = $(this);
8484
$.post('index.php?route=/database/central-columns', multiColumnEditData, AJAX.responseHandler);
8585
});
@@ -162,7 +162,7 @@ AJAX.registerOnload('database/central_columns.js', function () {
162162
dataType: 'json',
163163
success: function (data) {
164164
if (data.message !== '1') {
165-
Functions.ajaxShowMessage(
165+
ajaxShowMessage(
166166
'<div class="alert alert-danger" role="alert">' +
167167
data.message +
168168
'</div>',
@@ -186,7 +186,7 @@ AJAX.registerOnload('database/central_columns.js', function () {
186186
$('#tableslistcontainer').find('.checkall').show();
187187
},
188188
error: function () {
189-
Functions.ajaxShowMessage(
189+
ajaxShowMessage(
190190
'<div class="alert alert-danger" role="alert">' +
191191
window.Messages.strErrorProcessingRequest +
192192
'</div>',

‎js/src/database/events.js‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import $ from 'jquery';
22
import { AJAX } from '../modules/ajax.js';
33
import { Functions } from '../modules/functions.js';
44
import { Navigation } from '../modules/navigation.js';
5+
import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
56

67
AJAX.registerTeardown('database/events.js', function () {
78
$(document).off('click', 'a.ajax.add_anchor, a.ajax.edit_anchor');
@@ -57,7 +58,7 @@ const DatabaseEvents = {
5758
},
5859

5960
exportDialog: function ($this) {
60-
var $msg = Functions.ajaxShowMessage();
61+
var $msg = ajaxShowMessage();
6162
if ($this.attr('id') === 'bulkActionExportButton') {
6263
var combined = {
6364
success: true,
@@ -94,11 +95,11 @@ const DatabaseEvents = {
9495
} else {
9596
$.get($this.attr('href'), { 'ajax_request': true }, showExport);
9697
}
97-
Functions.ajaxRemoveMessage($msg);
98+
ajaxRemoveMessage($msg);
9899

99100
function showExport (data) {
100101
if (data.success === true) {
101-
Functions.ajaxRemoveMessage($msg);
102+
ajaxRemoveMessage($msg);
102103
/**
103104
* @var buttonOptions Object containing options
104105
* for jQueryUI dialog buttons
@@ -132,7 +133,7 @@ const DatabaseEvents = {
132133
var $elm = $ajaxDialog.find('textarea');
133134
Functions.getSqlEditor($elm);
134135
} else {
135-
Functions.ajaxShowMessage(data.error, false);
136+
ajaxShowMessage(data.error, false);
136137
}
137138
} // end showExport()
138139
}, // end exportDialog()
@@ -154,11 +155,11 @@ const DatabaseEvents = {
154155
* @var $msg jQuery object containing the reference to
155156
* the AJAX message shown to the user
156157
*/
157-
var $msg = Functions.ajaxShowMessage();
158+
var $msg = ajaxShowMessage();
158159
$.get($this.attr('href'), { 'ajax_request': true }, function (data) {
159160
if (data.success === true) {
160161
// We have successfully fetched the editor form
161-
Functions.ajaxRemoveMessage($msg);
162+
ajaxRemoveMessage($msg);
162163
/**
163164
* @var buttonOptions Object containing options
164165
* for jQueryUI dialog buttons
@@ -187,14 +188,14 @@ const DatabaseEvents = {
187188
* @var data Form data to be sent in the AJAX request
188189
*/
189190
var data = $('form.rte_form').last().serialize();
190-
$msg = Functions.ajaxShowMessage(
191+
$msg = ajaxShowMessage(
191192
window.Messages.strProcessingRequest
192193
);
193194
var url = $('form.rte_form').last().attr('action');
194195
$.post(url, data, function (data) {
195196
if (data.success === true) {
196197
// Item created successfully
197-
Functions.ajaxRemoveMessage($msg);
198+
ajaxRemoveMessage($msg);
198199
Functions.slidingMessage(data.message);
199200
that.$ajaxDialog.dialog('close');
200201
// If we are in 'edit' mode, we must
@@ -285,7 +286,7 @@ const DatabaseEvents = {
285286
}
286287
Navigation.reload();
287288
} else {
288-
Functions.ajaxShowMessage(data.error, false);
289+
ajaxShowMessage(data.error, false);
289290
}
290291
}); // end $.post()
291292
} // end "if (that.validate())"
@@ -343,7 +344,7 @@ const DatabaseEvents = {
343344
linterOptions.eventEditor = true;
344345
that.syntaxHiglighter = Functions.getSqlEditor($elm, {}, 'both', linterOptions);
345346
} else {
346-
Functions.ajaxShowMessage(data.error, false);
347+
ajaxShowMessage(data.error, false);
347348
}
348349
}); // end $.get()
349350
},
@@ -365,7 +366,7 @@ const DatabaseEvents = {
365366
* @var msg jQuery object containing the reference to
366367
* the AJAX message shown to the user
367368
*/
368-
var $msg = Functions.ajaxShowMessage(window.Messages.strProcessingRequest);
369+
var $msg = ajaxShowMessage(window.Messages.strProcessingRequest);
369370
var params = Functions.getJsConfirmCommonParam(this, $this.getPostData());
370371
$.post(url, params, function (data) {
371372
if (data.success === true) {
@@ -409,12 +410,12 @@ const DatabaseEvents = {
409410
});
410411
}
411412
// Get rid of the "Loading" message
412-
Functions.ajaxRemoveMessage($msg);
413+
ajaxRemoveMessage($msg);
413414
// Show the query that we just executed
414415
Functions.slidingMessage(data.sql_query);
415416
Navigation.reload();
416417
} else {
417-
Functions.ajaxShowMessage(data.error, false);
418+
ajaxShowMessage(data.error, false);
418419
}
419420
}); // end $.post()
420421
});
@@ -427,7 +428,7 @@ const DatabaseEvents = {
427428
* @var msg jQuery object containing the reference to
428429
* the AJAX message shown to the user
429430
*/
430-
var $msg = Functions.ajaxShowMessage(window.Messages.strProcessingRequest);
431+
var $msg = ajaxShowMessage(window.Messages.strProcessingRequest);
431432

432433
// drop anchors of all selected rows
433434
var dropAnchors = $('input.checkall:checked').parents('tr').find('.drop_anchor');
@@ -486,13 +487,13 @@ const DatabaseEvents = {
486487
if (returnCount === count) {
487488
if (success) {
488489
// Get rid of the "Loading" message
489-
Functions.ajaxRemoveMessage($msg);
490+
ajaxRemoveMessage($msg);
490491
$('#rteListForm_checkall').prop({ checked: false, indeterminate: false });
491492
}
492493
Navigation.reload();
493494
}
494495
} else {
495-
Functions.ajaxShowMessage(data.error, false);
496+
ajaxShowMessage(data.error, false);
496497
success = false;
497498
if (returnCount === count) {
498499
Navigation.reload();

‎js/src/database/multi_table_query.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import $ from 'jquery';
22
import { AJAX } from '../modules/ajax.js';
33
import { Functions } from '../modules/functions.js';
44
import { CommonParams } from '../modules/common.js';
5+
import { ajaxShowMessage } from '../modules/ajax-message.js';
56

67
/**
78
* @fileoverview function used in QBE for DB
@@ -61,7 +62,7 @@ AJAX.registerOnload('database/multi_table_query.js', function () {
6162
}
6263
});
6364
if (Object.keys(tableAliases).length === 0) {
64-
Functions.ajaxShowMessage('Nothing selected', false, 'error');
65+
ajaxShowMessage('Nothing selected', false, 'error');
6566
return;
6667
}
6768

@@ -120,7 +121,7 @@ AJAX.registerOnload('database/multi_table_query.js', function () {
120121
var query = editor.getDoc().getValue();
121122
// Verifying that the query is not empty
122123
if (query === '') {
123-
Functions.ajaxShowMessage(window.Messages.strEmptyQuery, false, 'error');
124+
ajaxShowMessage(window.Messages.strEmptyQuery, false, 'error');
124125
return;
125126
}
126127
var data = {

‎js/src/database/operations.js‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { AJAX } from '../modules/ajax.js';
33
import { Functions } from '../modules/functions.js';
44
import { Navigation } from '../modules/navigation.js';
55
import { CommonActions, CommonParams } from '../modules/common.js';
6+
import { ajaxShowMessage } from '../modules/ajax-message.js';
67

78
/**
89
* @fileoverview function used in server privilege pages
@@ -39,15 +40,15 @@ AJAX.registerOnload('database/operations.js', function () {
3940
event.preventDefault();
4041

4142
if (Functions.emptyCheckTheField(this, 'newname')) {
42-
Functions.ajaxShowMessage(window.Messages.strFormEmpty, false, 'error');
43+
ajaxShowMessage(window.Messages.strFormEmpty, false, 'error');
4344
return false;
4445
}
4546

4647
var oldDbName = CommonParams.get('db');
4748
var newDbName = $('#new_db_name').val();
4849

4950
if (newDbName === oldDbName) {
50-
Functions.ajaxShowMessage(window.Messages.strDatabaseRenameToSameName, false, 'error');
51+
ajaxShowMessage(window.Messages.strDatabaseRenameToSameName, false, 'error');
5152
return false;
5253
}
5354

@@ -58,10 +59,10 @@ AJAX.registerOnload('database/operations.js', function () {
5859
Functions.prepareForAjaxRequest($form);
5960

6061
$form.confirm(question, $form.attr('action'), function (url) {
61-
Functions.ajaxShowMessage(window.Messages.strRenamingDatabases, false);
62+
ajaxShowMessage(window.Messages.strRenamingDatabases, false);
6263
$.post(url, $('#rename_db_form').serialize() + CommonParams.get('arg_separator') + 'is_js_confirmed=1', function (data) {
6364
if (typeof data !== 'undefined' && data.success === true) {
64-
Functions.ajaxShowMessage(data.message);
65+
ajaxShowMessage(data.message);
6566
CommonParams.set('db', data.newname);
6667

6768
Navigation.reload(function () {
@@ -77,7 +78,7 @@ AJAX.registerOnload('database/operations.js', function () {
7778
});
7879
});
7980
} else {
80-
Functions.ajaxShowMessage(data.error, false);
81+
ajaxShowMessage(data.error, false);
8182
}
8283
}); // end $.post()
8384
});
@@ -90,11 +91,11 @@ AJAX.registerOnload('database/operations.js', function () {
9091
event.preventDefault();
9192

9293
if (Functions.emptyCheckTheField(this, 'newname')) {
93-
Functions.ajaxShowMessage(window.Messages.strFormEmpty, false, 'error');
94+
ajaxShowMessage(window.Messages.strFormEmpty, false, 'error');
9495
return false;
9596
}
9697

97-
Functions.ajaxShowMessage(window.Messages.strCopyingDatabase, false);
98+
ajaxShowMessage(window.Messages.strCopyingDatabase, false);
9899
var $form = $(this);
99100
Functions.prepareForAjaxRequest($form);
100101
$.post($form.attr('action'), $form.serialize(), function (data) {
@@ -104,15 +105,15 @@ AJAX.registerOnload('database/operations.js', function () {
104105
if ($('#checkbox_switch').is(':checked')) {
105106
CommonParams.set('db', data.newname);
106107
CommonActions.refreshMain(false, function () {
107-
Functions.ajaxShowMessage(data.message);
108+
ajaxShowMessage(data.message);
108109
});
109110
} else {
110111
CommonParams.set('db', data.db);
111-
Functions.ajaxShowMessage(data.message);
112+
ajaxShowMessage(data.message);
112113
}
113114
Navigation.reload();
114115
} else {
115-
Functions.ajaxShowMessage(data.error, false);
116+
ajaxShowMessage(data.error, false);
116117
}
117118
}); // end $.post()
118119
}); // end copy database
@@ -132,12 +133,12 @@ AJAX.registerOnload('database/operations.js', function () {
132133
event.preventDefault();
133134
var $form = $(this);
134135
Functions.prepareForAjaxRequest($form);
135-
Functions.ajaxShowMessage(window.Messages.strChangingCharset);
136+
ajaxShowMessage(window.Messages.strChangingCharset);
136137
$.post($form.attr('action'), $form.serialize(), function (data) {
137138
if (typeof data !== 'undefined' && data.success === true) {
138-
Functions.ajaxShowMessage(data.message);
139+
ajaxShowMessage(data.message);
139140
} else {
140-
Functions.ajaxShowMessage(data.error, false);
141+
ajaxShowMessage(data.error, false);
141142
}
142143
}); // end $.post()
143144
}); // end change charset
@@ -159,7 +160,7 @@ AJAX.registerOnload('database/operations.js', function () {
159160
var params = Functions.getJsConfirmCommonParam(this, $link.getPostData());
160161

161162
$(this).confirm(question, $(this).attr('href'), function (url) {
162-
Functions.ajaxShowMessage(window.Messages.strProcessingRequest);
163+
ajaxShowMessage(window.Messages.strProcessingRequest);
163164
$.post(url, params, function (data) {
164165
if (typeof data !== 'undefined' && data.success) {
165166
// Database deleted successfully, refresh both the frames
@@ -168,11 +169,11 @@ AJAX.registerOnload('database/operations.js', function () {
168169
CommonActions.refreshMain(
169170
'index.php?route=/server/databases',
170171
function () {
171-
Functions.ajaxShowMessage(data.message);
172+
ajaxShowMessage(data.message);
172173
}
173174
);
174175
} else {
175-
Functions.ajaxShowMessage(data.error, false);
176+
ajaxShowMessage(data.error, false);
176177
}
177178
});
178179
});

0 commit comments

Comments
 (0)