Skip to content

Commit 7bba282

Browse files
MauricioFauthMauricioFauth
committed
Assign JS globals to the window object
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent e4ea230 commit 7bba282

22 files changed

Lines changed: 191 additions & 200 deletions

‎js/src/chart.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ var ChartType = {
1111
TIMELINE: 'timeline',
1212
SCATTER: 'scatter'
1313
};
14+
window.ChartType = ChartType;
1415

1516
/**
1617
* Column type enumeration
@@ -21,6 +22,7 @@ var ColumnType = {
2122
BOOLEAN : 'boolean',
2223
DATE : 'date'
2324
};
25+
window.ColumnType = ColumnType;
2426

2527
/**
2628
* Abstract chart factory which defines the contract for chart factories
@@ -153,7 +155,6 @@ ScatterChart.prototype.validateColumns = function (dataTable) {
153155
/**
154156
* The data table contains column information and data for the chart.
155157
*/
156-
// eslint-disable-next-line no-unused-vars
157158
var DataTable = function () {
158159
var columns = [];
159160
var data = null;
@@ -195,6 +196,7 @@ var DataTable = function () {
195196
}
196197
};
197198
};
199+
window.DataTable = DataTable;
198200

199201
/** *****************************************************************************
200202
* JQPlot specific code
@@ -679,3 +681,4 @@ JQPlotChartFactory.prototype.createChart = function (type, elementId) {
679681

680682
return chart;
681683
};
684+
window.JQPlotChartFactory = JQPlotChartFactory;

‎js/src/database/multi_table_query.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
*
1010
*/
1111

12-
/* global generateFromBlock, generateWhereBlock */ // js/database/query_generator.js
13-
1412
/**
1513
* js file for handling AJAX and other events in /database/multi-table-query
1614
*/
@@ -104,12 +102,12 @@ window.AJAX.registerOnload('database/multi_table_query.js', function () {
104102
}
105103
query += '\nFROM ';
106104

107-
query += generateFromBlock(tableAliases, foreignKeys);
105+
query += window.generateFromBlock(tableAliases, foreignKeys);
108106

109107
var $criteriaColCount = $('.criteria_col:checked').length;
110108
if ($criteriaColCount > 0) {
111109
query += '\nWHERE ';
112-
query += generateWhereBlock();
110+
query += window.generateWhereBlock();
113111
}
114112

115113
query += ';';

‎js/src/database/query_generator.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ function generateCondition (criteriaDiv, table) {
4444
return query;
4545
}
4646

47-
// eslint-disable-next-line no-unused-vars
48-
function generateWhereBlock () {
47+
window.generateWhereBlock = function () {
4948
var count = 0;
5049
var query = '';
5150
$('.tableNameSelect').each(function () {
@@ -64,7 +63,7 @@ function generateWhereBlock () {
6463
}
6564
});
6665
return query;
67-
}
66+
};
6867

6968
function generateJoin (newTable, tableAliases, fk) {
7069
var query = '';
@@ -116,8 +115,7 @@ function appendTable (table, tableAliases, usedTables, foreignKeys) {
116115
return query;
117116
}
118117

119-
// eslint-disable-next-line no-unused-vars
120-
function generateFromBlock (tableAliases, foreignKeys) {
118+
window.generateFromBlock = (tableAliases, foreignKeys) => {
121119
var usedTables = [];
122120
var query = '';
123121
for (var table in tableAliases) {
@@ -126,4 +124,4 @@ function generateFromBlock (tableAliases, foreignKeys) {
126124
}
127125
}
128126
return query;
129-
}
127+
};

‎js/src/database/search.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
* @package PhpMyAdmin
88
*/
99

10-
/* global makeGrid */ // js/makegrid.js
11-
1210
/**
1311
* AJAX script for the Database Search page.
1412
*
@@ -139,7 +137,7 @@ window.AJAX.registerOnload('database/search.js', function () {
139137
$('#browse-results').html(data.message);
140138
Functions.ajaxRemoveMessage($msg);
141139
$('.table_results').each(function () {
142-
makeGrid(this, true, true, true, true);
140+
window.makeGrid(this, true, true, true, true);
143141
});
144142
$('#browse-results').show();
145143
Functions.highlightSql($('#browse-results'));

‎js/src/database/structure.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
var DatabaseStructure = {};
13+
window.DatabaseStructure = DatabaseStructure;
1314

1415
/**
1516
* AJAX scripts for /database/structure

‎js/src/designer/database.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ var designerTables = [
1111
}
1212
];
1313

14-
// eslint-disable-next-line no-unused-vars
1514
var DesignerOfflineDB = (function () {
1615
var designerDB = {};
1716

@@ -232,3 +231,4 @@ var DesignerOfflineDB = (function () {
232231
// Export the designerDB object.
233232
return designerDB;
234233
}());
234+
window.DesignerOfflineDB = DesignerOfflineDB;

‎js/src/designer/history.js‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
* @requires move.js
66
*/
77

8-
/* global contr */ // js/designer/init.js
9-
/* global fromArray:writable */ // js/designer/move.js
108
/* global themeImagePath */ // templates/javascript/variables.twig
119

1210
var DesignerHistory = {};
11+
window.DesignerHistory = DesignerHistory;
1312

1413
var historyArray = []; // Global array to store history objects
1514
var selectField = []; // Global array to store information for columns which are used in select clause
@@ -145,10 +144,10 @@ DesignerHistory.andOr = function (index) {
145144
* @return {void}
146145
*/
147146
DesignerHistory.historyDelete = function (index) {
148-
var fromArrayLength = fromArray.length;
147+
var fromArrayLength = window.fromArray.length;
149148
for (var k = 0; k < fromArrayLength; k++) {
150-
if (fromArray[k] === historyArray[index].getTab()) {
151-
fromArray.splice(k, 1);
149+
if (window.fromArray[k] === historyArray[index].getTab()) {
150+
window.fromArray.splice(k, 1);
152151
break;
153152
}
154153
}
@@ -630,7 +629,7 @@ DesignerHistory.queryFrom = function () {
630629
var quer = '';
631630
var parts = [];
632631
var tArray = [];
633-
tArray = fromArray;
632+
tArray = window.fromArray;
634633
var K = 0;
635634
var k;
636635
var key;
@@ -643,32 +642,32 @@ DesignerHistory.queryFrom = function () {
643642

644643
var historyArrayLength = historyArray.length;
645644
for (i = 0; i < historyArrayLength; i++) {
646-
fromArray.push(historyArray[i].getTab());
645+
window.fromArray.push(historyArray[i].getTab());
647646
}
648-
fromArray = DesignerHistory.unique(fromArray);
649-
tabLeft = fromArray;
647+
window.fromArray = DesignerHistory.unique(window.fromArray);
648+
tabLeft = window.fromArray;
650649
temp = tabLeft.shift();
651650
quer = '`' + temp + '`';
652651
tabUsed.push(temp);
653652

654653
// if master table (key2) matches with tab used get all keys and check if tab_left matches
655654
// after this check if master table (key2) matches with tab left then check if any foreign matches with master .
656655
for (i = 0; i < 2; i++) {
657-
for (K in contr) {
658-
for (key in contr[K]) {// contr name
659-
for (key2 in contr[K][key]) {// table name
656+
for (K in window.contr) {
657+
for (key in window.contr[K]) {// contr name
658+
for (key2 in window.contr[K][key]) {// table name
660659
parts = key2.split('.');
661660
if (DesignerHistory.found(tabUsed, parts[1]) > 0) {
662-
for (key3 in contr[K][key][key2]) {
663-
parts1 = contr[K][key][key2][key3][0].split('.');
661+
for (key3 in window.contr[K][key][key2]) {
662+
parts1 = window.contr[K][key][key2][key3][0].split('.');
664663
if (DesignerHistory.found(tabLeft, parts1[1]) > 0) {
665664
if (DesignerHistory.found(constraintsAdded, key) > 0) {
666665
query += ' AND ' + '`' + parts[1] + '`.`' + key3 + '` = ';
667-
query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` ';
666+
query += '`' + parts1[1] + '`.`' + window.contr[K][key][key2][key3][1] + '` ';
668667
} else {
669668
query += '\n' + 'LEFT JOIN ';
670669
query += '`' + parts[1] + '` ON ';
671-
query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` = ';
670+
query += '`' + parts1[1] + '`.`' + window.contr[K][key][key2][key3][1] + '` = ';
672671
query += '`' + parts[1] + '`.`' + key3 + '` ';
673672

674673
constraintsAdded.push(key);
@@ -685,21 +684,21 @@ DesignerHistory.queryFrom = function () {
685684
tabUsed = DesignerHistory.addArray(tTabLeft, tabUsed);
686685
tabLeft = DesignerHistory.removeArray(tTabLeft, tabLeft);
687686
tTabLeft = [];
688-
for (K in contr) {
689-
for (key in contr[K]) {
690-
for (key2 in contr[K][key]) {// table name
687+
for (K in window.contr) {
688+
for (key in window.contr[K]) {
689+
for (key2 in window.contr[K][key]) {// table name
691690
parts = key2.split('.');
692691
if (DesignerHistory.found(tabLeft, parts[1]) > 0) {
693-
for (key3 in contr[K][key][key2]) {
694-
parts1 = contr[K][key][key2][key3][0].split('.');
692+
for (key3 in window.contr[K][key][key2]) {
693+
parts1 = window.contr[K][key][key2][key3][0].split('.');
695694
if (DesignerHistory.found(tabUsed, parts1[1]) > 0) {
696695
if (DesignerHistory.found(constraintsAdded, key) > 0) {
697696
query += ' AND ' + '`' + parts[1] + '`.`' + key3 + '` = ';
698-
query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` ';
697+
query += '`' + parts1[1] + '`.`' + window.contr[K][key][key2][key3][1] + '` ';
699698
} else {
700699
query += '\n' + 'LEFT JOIN ';
701700
query += '`' + parts[1] + '` ON ';
702-
query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` = ';
701+
query += '`' + parts1[1] + '`.`' + window.contr[K][key][key2][key3][1] + '` = ';
703702
query += '`' + parts[1] + '`.`' + key3 + '` ';
704703

705704
constraintsAdded.push(key);
@@ -720,7 +719,7 @@ DesignerHistory.queryFrom = function () {
720719
quer += ' , `' + tabLeft[k] + '`';
721720
}
722721
query = quer + query;
723-
fromArray = tArray;
722+
window.fromArray = tArray;
724723
return query;
725724
};
726725

‎js/src/designer/init.js‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,6 @@
88
/* global DesignerPage */ // js/designer/page.js
99
/* global designerConfig */ // templates/database/designer/main.twig
1010

11-
/* eslint-disable no-unused-vars */
12-
var jTabs;
13-
var hTabs;
14-
var contr;
15-
var displayField;
16-
var server;
17-
var selectedPage;
18-
/* eslint-enable no-unused-vars */
19-
20-
var db;
21-
var designerTablesEnabled;
22-
2311
window.AJAX.registerTeardown('designer/init.js', function () {
2412
$('.trigger').off('click');
2513
});
@@ -32,22 +20,21 @@ window.AJAX.registerOnload('designer/init.js', function () {
3220
return false;
3321
});
3422

35-
jTabs = designerConfig.scriptTables.j_tabs;
36-
hTabs = designerConfig.scriptTables.h_tabs;
37-
contr = designerConfig.scriptContr;
38-
displayField = designerConfig.scriptDisplayField;
39-
server = designerConfig.server;
40-
selectedPage = designerConfig.displayPage;
41-
42-
db = designerConfig.db;
43-
designerTablesEnabled = designerConfig.tablesEnabled;
23+
window.jTabs = designerConfig.scriptTables.j_tabs;
24+
window.hTabs = designerConfig.scriptTables.h_tabs;
25+
window.contr = designerConfig.scriptContr;
26+
window.displayField = designerConfig.scriptDisplayField;
27+
window.server = designerConfig.server;
28+
window.selectedPage = designerConfig.displayPage;
29+
window.db = designerConfig.db;
30+
window.designerTablesEnabled = designerConfig.tablesEnabled;
4431

4532
DesignerMove.main();
4633

47-
if (! designerTablesEnabled) {
34+
if (! window.designerTablesEnabled) {
4835
DesignerOfflineDB.open(function (success) {
4936
if (success) {
50-
DesignerPage.showTablesInLandingPage(db);
37+
DesignerPage.showTablesInLandingPage(window.db);
5138
}
5239
});
5340
}

0 commit comments

Comments
 (0)