Skip to content

Commit 3b99d77

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #17614 from MauricioFauth/js-ajax-global
Assign `AJAX` to the `window` global object
2 parents da7c7a8 + 9ff5655 commit 3b99d77

Some content is hidden

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

65 files changed

+296
-297
lines changed

‎.eslintrc.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"jquery": true
1616
},
1717
"globals": {
18-
"AJAX": "readonly",
1918
"bootstrap": "readonly",
2019
"CodeMirror": "readonly",
2120
"CommonActions": "readonly",

‎js/src/ajax.js‎

Lines changed: 77 additions & 77 deletions
Large diffs are not rendered by default.

‎js/src/common.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ var CommonActions = {
167167
.trigger('click')
168168
.remove();
169169
if (typeof callback !== 'undefined') {
170-
AJAX.callback = callback;
170+
window.AJAX.callback = callback;
171171
}
172172
}
173173
};

‎js/src/config.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function isStorageSupported (type, warn = false) {
3434
/**
3535
* Unbind all event handlers before tearing down a page
3636
*/
37-
AJAX.registerTeardown('config.js', function () {
37+
window.AJAX.registerTeardown('config.js', function () {
3838
$('.optbox input[id], .optbox select[id], .optbox textarea[id]').off('change').off('keyup');
3939
$('.optbox input[type=button][name=submit_reset]').off('click');
4040
$('div.tab-content').off();
@@ -44,7 +44,7 @@ AJAX.registerTeardown('config.js', function () {
4444
$('#prefs_autoload').find('a').off('click');
4545
});
4646

47-
AJAX.registerOnload('config.js', function () {
47+
window.AJAX.registerOnload('config.js', function () {
4848
var $topmenuUpt = $('#user_prefs_tabs');
4949
$topmenuUpt.find('a.active').attr('rel', 'samepage');
5050
$topmenuUpt.find('a:not(.active)').attr('rel', 'newpage');
@@ -592,7 +592,7 @@ function setupValidation () {
592592
}
593593
}
594594

595-
AJAX.registerOnload('config.js', function () {
595+
window.AJAX.registerOnload('config.js', function () {
596596
setupValidation();
597597
});
598598

@@ -610,15 +610,15 @@ function adjustPrefsNotification () {
610610
}
611611
}
612612

613-
AJAX.registerOnload('config.js', function () {
613+
window.AJAX.registerOnload('config.js', function () {
614614
adjustPrefsNotification();
615615
});
616616

617617
// ------------------------------------------------------------------
618618
// Form reset buttons
619619
//
620620

621-
AJAX.registerOnload('config.js', function () {
621+
window.AJAX.registerOnload('config.js', function () {
622622
$('.optbox input[type=button][name=submit_reset]').on('click', function () {
623623
var fields = $(this).closest('fieldset').find('input, select, textarea');
624624
for (var i = 0, imax = fields.length; i < imax; i++) {
@@ -678,7 +678,7 @@ function setupRestoreField () {
678678
.css({ display: 'inline-block', opacity: 0.25 });
679679
}
680680

681-
AJAX.registerOnload('config.js', function () {
681+
window.AJAX.registerOnload('config.js', function () {
682682
setupRestoreField();
683683
});
684684

@@ -690,7 +690,7 @@ AJAX.registerOnload('config.js', function () {
690690
// User preferences import/export
691691
//
692692

693-
AJAX.registerOnload('config.js', function () {
693+
window.AJAX.registerOnload('config.js', function () {
694694
offerPrefsAutoimport();
695695
var $radios = $('#import_local_storage, #export_local_storage');
696696
if (!$radios.length) {

‎js/src/database/central_columns.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
AJAX.registerTeardown('database/central_columns.js', function () {
18+
window.AJAX.registerTeardown('database/central_columns.js', function () {
1919
$('.edit').off('click');
2020
$('.edit_save_form').off('click');
2121
$('.edit_cancel_form').off('click');
@@ -32,7 +32,7 @@ AJAX.registerTeardown('database/central_columns.js', function () {
3232
$('button[name=\'edit_central_columns\']').off('click');
3333
});
3434

35-
AJAX.registerOnload('database/central_columns.js', function () {
35+
window.AJAX.registerOnload('database/central_columns.js', function () {
3636
$('#tableslistcontainer input,#tableslistcontainer select,#tableslistcontainer .default_value,#tableslistcontainer .open_enum_editor').hide();
3737
$('#tableslistcontainer').find('.checkall').show();
3838
$('#tableslistcontainer').find('.checkall_box').show();
@@ -66,17 +66,17 @@ AJAX.registerOnload('database/central_columns.js', function () {
6666
var argsep = CommonParams.get('arg_separator');
6767
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');
6868
Functions.ajaxShowMessage();
69-
AJAX.source = $(this);
70-
$.post('index.php?route=/database/central-columns', editColumnData, AJAX.responseHandler);
69+
window.AJAX.source = $(this);
70+
$.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();
7575
var argsep = CommonParams.get('arg_separator');
7676
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');
7777
Functions.ajaxShowMessage();
78-
AJAX.source = $(this);
79-
$.post('index.php?route=/database/central-columns', multiColumnEditData, AJAX.responseHandler);
78+
window.AJAX.source = $(this);
79+
$.post('index.php?route=/database/central-columns', multiColumnEditData, window.AJAX.responseHandler);
8080
});
8181
$('#add_new').find('td').each(function () {
8282
if ($(this).attr('name') !== 'undefined') {

‎js/src/database/events.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AJAX.registerTeardown('database/events.js', function () {
1+
window.AJAX.registerTeardown('database/events.js', function () {
22
$(document).off('click', 'a.ajax.add_anchor, a.ajax.edit_anchor');
33
$(document).off('click', 'a.ajax.export_anchor');
44
$(document).off('click', '#bulkActionExportButton');
@@ -509,7 +509,7 @@ const DatabaseEvents = {
509509
}
510510
};
511511

512-
AJAX.registerOnload('database/events.js', function () {
512+
window.AJAX.registerOnload('database/events.js', function () {
513513
/**
514514
* Attach Ajax event handlers for the Add/Edit functionality.
515515
*/

‎js/src/database/multi_table_query.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
/**
1919
* Unbind all event handlers before tearing down a page
2020
*/
21-
AJAX.registerTeardown('database/multi_table_query.js', function () {
21+
window.AJAX.registerTeardown('database/multi_table_query.js', function () {
2222
$('.tableNameSelect').each(function () {
2323
$(this).off('change');
2424
});
2525
$('#update_query_button').off('click');
2626
$('#add_column_button').off('click');
2727
});
2828

29-
AJAX.registerOnload('database/multi_table_query.js', function () {
29+
window.AJAX.registerOnload('database/multi_table_query.js', function () {
3030
var editor = Functions.getSqlEditor($('#MultiSqlquery'), {}, 'both');
3131
$('.CodeMirror-line').css('text-align', 'left');
3232
editor.setSize(-1, 50);

‎js/src/database/operations.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
/**
2222
* Unbind all event handlers before tearing down a page
2323
*/
24-
AJAX.registerTeardown('database/operations.js', function () {
24+
window.AJAX.registerTeardown('database/operations.js', function () {
2525
$(document).off('submit', '#rename_db_form.ajax');
2626
$(document).off('submit', '#copy_db_form.ajax');
2727
$(document).off('submit', '#change_db_charset_form.ajax');
2828
$(document).off('click', '#drop_db_anchor.ajax');
2929
});
3030

31-
AJAX.registerOnload('database/operations.js', function () {
31+
window.AJAX.registerOnload('database/operations.js', function () {
3232
/**
3333
* Ajax event handlers for 'Rename Database'
3434
*/

‎js/src/database/qbe.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
/**
1919
* Unbind all event handlers before tearing down a page
2020
*/
21-
AJAX.registerTeardown('database/qbe.js', function () {
21+
window.AJAX.registerTeardown('database/qbe.js', function () {
2222
$(document).off('change', 'select[name^=criteriaColumn]');
2323
$(document).off('change', '#searchId');
2424
$(document).off('click', '#saveSearch');
2525
$(document).off('click', '#updateSearch');
2626
$(document).off('click', '#deleteSearch');
2727
});
2828

29-
AJAX.registerOnload('database/qbe.js', function () {
29+
window.AJAX.registerOnload('database/qbe.js', function () {
3030
Functions.getSqlEditor($('#textSqlquery'), {}, 'none');
3131

3232
$('#tblQbe').width($('#tblQbe').parent().width());

‎js/src/database/routines.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AJAX.registerTeardown('database/routines.js', function () {
1+
window.AJAX.registerTeardown('database/routines.js', function () {
22
$(document).off('click', 'a.ajax.add_anchor');
33
$(document).off('click', 'a.ajax.edit_anchor');
44
$(document).off('click', 'a.ajax.exec_anchor');
@@ -838,7 +838,7 @@ const DatabaseRoutines = {
838838
}
839839
};
840840

841-
AJAX.registerOnload('database/routines.js', function () {
841+
window.AJAX.registerOnload('database/routines.js', function () {
842842
$(document).on('click', 'a.ajax.add_anchor', function (event) {
843843
event.preventDefault();
844844
$.datepicker.initialized = false;

0 commit comments

Comments
 (0)