Visitar URL original
Assign CommonParams and CommonActions to the window object · phpmyadmin/phpmyadmin@7403cff · GitHub
Skip to content

Commit 7403cff

Browse files
MauricioFauthMauricioFauth
committed
Assign CommonParams and CommonActions to the window object
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent 3b99d77 commit 7403cff

40 files changed

Lines changed: 345 additions & 348 deletions

‎.eslintrc.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
"globals": {
1818
"bootstrap": "readonly",
1919
"CodeMirror": "readonly",
20-
"CommonActions": "readonly",
21-
"CommonParams": "readonly",
2220
"Cookies": "readonly",
2321
"Functions": "readonly",
2422
"Messages": "readonly",

‎js/src/ajax.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ window.AJAX = {
2424
// eslint-disable-next-line valid-jsdoc
2525
/**
2626
* @var {Function} callback Callback to execute after a successful request
27-
* Used by CommonActions from common.js
27+
* Used by window.CommonActions from common.js
2828
*/
2929
callback: function () {},
3030
/**
@@ -296,7 +296,7 @@ window.AJAX = {
296296
$('html, body').animate({ scrollTop: 0 }, 'fast');
297297

298298
var url = isLink ? href : $(this).attr('action');
299-
var argsep = CommonParams.get('arg_separator');
299+
var argsep = window.CommonParams.get('arg_separator');
300300
var params = 'ajax_request=true' + argsep + 'ajax_page_request=true';
301301
var dataPost = window.AJAX.source.getPostData();
302302
if (! isLink) {
@@ -362,7 +362,7 @@ window.AJAX = {
362362
}
363363
Functions.ajaxRemoveMessage(window.AJAX.$msgbox);
364364

365-
CommonParams.set('token', data.new_token);
365+
window.CommonParams.set('token', data.new_token);
366366

367367
window.AJAX.scriptHandler.load([]);
368368

@@ -417,7 +417,7 @@ window.AJAX = {
417417

418418
if (typeof data.success !== 'undefined' && data.success) {
419419
// reload page if user trying to login has changed
420-
if (CommonParams.get('user') !== data.params.user) {
420+
if (window.CommonParams.get('user') !== data.params.user) {
421421
window.location = 'index.php';
422422
Functions.ajaxShowMessage(Messages.strLoading, false);
423423
window.AJAX.active = false;
@@ -544,7 +544,7 @@ window.AJAX = {
544544
$('#selflink').find('> a').attr('href', data.selflink);
545545
}
546546
if (data.params) {
547-
CommonParams.setAll(data.params);
547+
window.CommonParams.setAll(data.params);
548548
}
549549
if (data.scripts) {
550550
window.AJAX.scriptHandler.load(data.scripts);
@@ -677,10 +677,10 @@ window.AJAX = {
677677
// Clear loaded scripts if they are from another version of phpMyAdmin.
678678
// Depends on common params being set before loading scripts in responseHandler
679679
if (self.scriptsVersion === null) {
680-
self.scriptsVersion = CommonParams.get('version');
681-
} else if (self.scriptsVersion !== CommonParams.get('version')) {
680+
self.scriptsVersion = window.CommonParams.get('version');
681+
} else if (self.scriptsVersion !== window.CommonParams.get('version')) {
682682
self.scripts = [];
683-
self.scriptsVersion = CommonParams.get('version');
683+
self.scriptsVersion = window.CommonParams.get('version');
684684
}
685685
self.scriptsCompleted = false;
686686
self.scriptsToBeFired = [];
@@ -747,7 +747,7 @@ window.AJAX = {
747747

748748
script.type = 'text/javascript';
749749
var file = name.indexOf('vendor/') !== -1 ? name : 'dist/' + name;
750-
script.src = 'js/' + file + '?' + 'v=' + encodeURIComponent(CommonParams.get('version'));
750+
script.src = 'js/' + file + '?' + 'v=' + encodeURIComponent(window.CommonParams.get('version'));
751751
script.async = false;
752752
script.onload = function () {
753753
self.done(name, callback);
@@ -870,7 +870,7 @@ $(function () {
870870
var state = event.originalEvent.state;
871871
if (state && state.menu) {
872872
window.AJAX.$msgbox = Functions.ajaxShowMessage();
873-
var params = 'ajax_request=true' + CommonParams.get('arg_separator') + 'ajax_page_request=true';
873+
var params = 'ajax_request=true' + window.CommonParams.get('arg_separator') + 'ajax_page_request=true';
874874
var url = state.url || location.href;
875875
$.get(url, params, window.AJAX.responseHandler);
876876
// TODO: Check if sometimes menu is not retrieved from server,

‎js/src/codemirror/addon/lint/sql-lint.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ CodeMirror.sqlLint = function (text, updateLinting, options, cm) {
3131
dataType: 'json',
3232
data: {
3333
'sql_query': text,
34-
'server': CommonParams.get('server'),
34+
'server': window.CommonParams.get('server'),
3535
'options': options.lintOptions,
3636
'no_history': true,
3737
},

‎js/src/common.js‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $(function () {
1111
*
1212
* @test-module CommonParams
1313
*/
14-
var CommonParams = (function () {
14+
window.CommonParams = (function () {
1515
/**
1616
* @var {Object} params An associative array of key value pairs
1717
* @access private
@@ -87,7 +87,7 @@ var CommonParams = (function () {
8787
getUrlQuery: function (separator) {
8888
var sep = (typeof separator !== 'undefined') ? separator : '?';
8989
var common = this.get('common_query');
90-
var argsep = CommonParams.get('arg_separator');
90+
var argsep = window.CommonParams.get('arg_separator');
9191
if (typeof common === 'string' && common.length > 0) {
9292
// If the last char is the separator, do not add it
9393
// Else add it
@@ -112,8 +112,7 @@ var CommonParams = (function () {
112112
* The content for this is normally loaded from Header.php or
113113
* Response.php and executed by ajax.js
114114
*/
115-
// eslint-disable-next-line no-unused-vars
116-
var CommonActions = {
115+
window.CommonActions = {
117116
/**
118117
* Saves the database name when it's changed
119118
* and reloads the query window, if necessary
@@ -123,8 +122,8 @@ var CommonActions = {
123122
* @return {void}
124123
*/
125124
setDb: function (newDb) {
126-
if (newDb !== CommonParams.get('db')) {
127-
CommonParams.setAll({ 'db': newDb, 'table': '' });
125+
if (newDb !== window.CommonParams.get('db')) {
126+
window.CommonParams.setAll({ 'db': newDb, 'table': '' });
128127
}
129128
},
130129
/**
@@ -135,11 +134,11 @@ var CommonActions = {
135134
* @return {void}
136135
*/
137136
openDb: function (newDb) {
138-
CommonParams
137+
window.CommonParams
139138
.set('db', newDb)
140139
.set('table', '');
141140
this.refreshMain(
142-
CommonParams.get('opendb_url')
141+
window.CommonParams.get('opendb_url')
143142
);
144143
},
145144
/**
@@ -158,9 +157,9 @@ var CommonActions = {
158157
newUrl = newUrl.substring(0, newUrl.indexOf('?'));
159158
}
160159
if (newUrl.indexOf('?') !== -1) {
161-
newUrl += CommonParams.getUrlQuery(CommonParams.get('arg_separator'));
160+
newUrl += window.CommonParams.getUrlQuery(window.CommonParams.get('arg_separator'));
162161
} else {
163-
newUrl += CommonParams.getUrlQuery('?');
162+
newUrl += window.CommonParams.getUrlQuery('?');
164163
}
165164
$('<a></a>', { href: newUrl })
166165
.appendTo('body')

‎js/src/config.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ function savePrefsToLocalStorage (form) {
769769
type: 'POST',
770770
data: {
771771
'ajax_request': true,
772-
'server': CommonParams.get('server'),
772+
'server': window.CommonParams.get('server'),
773773
'submit_get_json': true
774774
},
775775
success: function (data) {
@@ -821,15 +821,15 @@ function offerPrefsAutoimport () {
821821
if ($a.attr('href') === '#no') {
822822
$cnt.remove();
823823
$.post('index.php', {
824-
'server': CommonParams.get('server'),
824+
'server': window.CommonParams.get('server'),
825825
'prefs_autoload': 'hide'
826826
}, null, 'html');
827827
return;
828828
} else if ($a.attr('href') === '#delete') {
829829
$cnt.remove();
830830
localStorage.clear();
831831
$.post('index.php', {
832-
'server': CommonParams.get('server'),
832+
'server': window.CommonParams.get('server'),
833833
'prefs_autoload': 'hide'
834834
}, null, 'html');
835835
return;

‎js/src/database/central_columns.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@ window.AJAX.registerOnload('database/central_columns.js', function () {
6363
Functions.ajaxShowMessage(Messages.strRadioUnchecked);
6464
return false;
6565
}
66-
var argsep = CommonParams.get('arg_separator');
67-
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');
66+
var argsep = window.CommonParams.get('arg_separator');
67+
var editColumnData = editColumnList + '' + argsep + 'edit_central_columns_page=true' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'db=' + encodeURIComponent(window.CommonParams.get('db')) + argsep + 'server=' + window.CommonParams.get('server');
6868
Functions.ajaxShowMessage();
6969
window.AJAX.source = $(this);
7070
$.post('index.php?route=/database/central-columns', editColumnData, window.AJAX.responseHandler);
7171
});
7272
$('#multi_edit_central_columns').on('submit', function (event) {
7373
event.preventDefault();
7474
event.stopPropagation();
75-
var argsep = CommonParams.get('arg_separator');
76-
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');
75+
var argsep = window.CommonParams.get('arg_separator');
76+
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(window.CommonParams.get('db')) + argsep + 'server=' + window.CommonParams.get('server');
7777
Functions.ajaxShowMessage();
7878
window.AJAX.source = $(this);
7979
$.post('index.php?route=/database/central-columns', multiColumnEditData, window.AJAX.responseHandler);
@@ -153,7 +153,7 @@ window.AJAX.registerOnload('database/central_columns.js', function () {
153153
$.ajax({
154154
type: 'POST',
155155
url: 'index.php?route=/database/central-columns',
156-
data: datastring + CommonParams.get('arg_separator') + 'ajax_request=true',
156+
data: datastring + window.CommonParams.get('arg_separator') + 'ajax_request=true',
157157
dataType: 'json',
158158
success: function (data) {
159159
if (data.message !== '1') {
@@ -196,8 +196,8 @@ window.AJAX.registerOnload('database/central_columns.js', function () {
196196
var href = 'index.php?route=/database/central-columns/populate';
197197
var params = {
198198
'ajax_request' : true,
199-
'server' : CommonParams.get('server'),
200-
'db' : CommonParams.get('db'),
199+
'server' : window.CommonParams.get('server'),
200+
'db' : window.CommonParams.get('db'),
201201
'selectedTable' : selectValue
202202
};
203203
$('#column-select').html('<option value="">' + Messages.strLoading + '</option>');

‎js/src/database/multi_table_query.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ window.AJAX.registerOnload('database/multi_table_query.js', function () {
7575
'db': $('#db_name').val(),
7676
'tables': Object.keys(tableAliases),
7777
'ajax_request': '1',
78-
'token': CommonParams.get('token')
78+
'token': window.CommonParams.get('token')
7979
},
8080
success: function (response) {
8181
foreignKeys = response.foreignKeyConstrains;
@@ -127,8 +127,8 @@ window.AJAX.registerOnload('database/multi_table_query.js', function () {
127127
'db': $('#db_name').val(),
128128
'sql_query': query,
129129
'ajax_request': '1',
130-
'server': CommonParams.get('server'),
131-
'token': CommonParams.get('token')
130+
'server': window.CommonParams.get('server'),
131+
'token': window.CommonParams.get('token')
132132
};
133133
$.ajax({
134134
type: 'POST',

‎js/src/database/operations.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ window.AJAX.registerOnload('database/operations.js', function () {
4040
return false;
4141
}
4242

43-
var oldDbName = CommonParams.get('db');
43+
var oldDbName = window.CommonParams.get('db');
4444
var newDbName = $('#new_db_name').val();
4545

4646
if (newDbName === oldDbName) {
@@ -56,10 +56,10 @@ window.AJAX.registerOnload('database/operations.js', function () {
5656

5757
$form.confirm(question, $form.attr('action'), function (url) {
5858
Functions.ajaxShowMessage(Messages.strRenamingDatabases, false);
59-
$.post(url, $('#rename_db_form').serialize() + CommonParams.get('arg_separator') + 'is_js_confirmed=1', function (data) {
59+
$.post(url, $('#rename_db_form').serialize() + window.CommonParams.get('arg_separator') + 'is_js_confirmed=1', function (data) {
6060
if (typeof data !== 'undefined' && data.success === true) {
6161
Functions.ajaxShowMessage(data.message);
62-
CommonParams.set('db', data.newname);
62+
window.CommonParams.set('db', data.newname);
6363

6464
Navigation.reload(function () {
6565
$('#pma_navigation_tree')
@@ -99,12 +99,12 @@ window.AJAX.registerOnload('database/operations.js', function () {
9999
$('.alert-success, .alert-danger').fadeOut();
100100
if (typeof data !== 'undefined' && data.success === true) {
101101
if ($('#checkbox_switch').is(':checked')) {
102-
CommonParams.set('db', data.newname);
103-
CommonActions.refreshMain(false, function () {
102+
window.CommonParams.set('db', data.newname);
103+
window.CommonActions.refreshMain(false, function () {
104104
Functions.ajaxShowMessage(data.message);
105105
});
106106
} else {
107-
CommonParams.set('db', data.db);
107+
window.CommonParams.set('db', data.db);
108108
Functions.ajaxShowMessage(data.message);
109109
}
110110
Navigation.reload();
@@ -151,7 +151,7 @@ window.AJAX.registerOnload('database/operations.js', function () {
151151
var question = Messages.strDropDatabaseStrongWarning + ' ';
152152
question += Functions.sprintf(
153153
Messages.strDoYouReally,
154-
'DROP DATABASE `' + Functions.escapeHtml(CommonParams.get('db') + '`')
154+
'DROP DATABASE `' + Functions.escapeHtml(window.CommonParams.get('db') + '`')
155155
);
156156
var params = Functions.getJsConfirmCommonParam(this, $link.getPostData());
157157

@@ -161,8 +161,8 @@ window.AJAX.registerOnload('database/operations.js', function () {
161161
if (typeof data !== 'undefined' && data.success) {
162162
// Database deleted successfully, refresh both the frames
163163
Navigation.reload();
164-
CommonParams.set('db', '');
165-
CommonActions.refreshMain(
164+
window.CommonParams.set('db', '');
165+
window.CommonActions.refreshMain(
166166
'index.php?route=/server/databases',
167167
function () {
168168
Functions.ajaxShowMessage(data.message);

‎js/src/database/search.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ window.AJAX.registerOnload('database/search.js', function () {
216216

217217
Functions.prepareForAjaxRequest($form);
218218

219-
var url = $form.serialize() + CommonParams.get('arg_separator') + 'submit_search=' + $('#buttonGo').val();
219+
var url = $form.serialize() + window.CommonParams.get('arg_separator') + 'submit_search=' + $('#buttonGo').val();
220220
$.post($form.attr('action'), url, function (data) {
221221
if (typeof data !== 'undefined' && data.success === true) {
222222
// found results

‎js/src/database/structure.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ window.AJAX.registerOnload('database/structure.js', function () {
198198
$('#makeConsistentWithCentralListModal').modal('show').on('shown.bs.modal', function () {
199199
$('#makeConsistentWithCentralListContinue').on('click', function () {
200200
const $form = $('#tablesForm');
201-
const argSep = CommonParams.get('arg_separator');
201+
const argSep = window.CommonParams.get('arg_separator');
202202
const data = $form.serialize() + argSep + 'ajax_request=true' + argSep + 'ajax_page_request=true';
203203

204204
Functions.ajaxShowMessage();
@@ -293,7 +293,7 @@ window.AJAX.registerOnload('database/structure.js', function () {
293293
}
294294

295295
var $form = $(this).parents('form');
296-
var argsep = CommonParams.get('arg_separator');
296+
var argsep = window.CommonParams.get('arg_separator');
297297
var data = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true';
298298

299299
Functions.ajaxShowMessage();

0 commit comments

Comments
 (0)