diff --git a/js/src/chart.js b/js/src/chart.js
index 26669dbb6f..ccf40dcd50 100644
--- a/js/src/chart.js
+++ b/js/src/chart.js
@@ -11,6 +11,7 @@ var ChartType = {
TIMELINE: 'timeline',
SCATTER: 'scatter'
};
+window.ChartType = ChartType;
/**
* Column type enumeration
@@ -21,6 +22,7 @@ var ColumnType = {
BOOLEAN : 'boolean',
DATE : 'date'
};
+window.ColumnType = ColumnType;
/**
* Abstract chart factory which defines the contract for chart factories
@@ -153,7 +155,6 @@ ScatterChart.prototype.validateColumns = function (dataTable) {
/**
* The data table contains column information and data for the chart.
*/
-// eslint-disable-next-line no-unused-vars
var DataTable = function () {
var columns = [];
var data = null;
@@ -195,6 +196,7 @@ var DataTable = function () {
}
};
};
+window.DataTable = DataTable;
/** *****************************************************************************
* JQPlot specific code
@@ -679,3 +681,4 @@ JQPlotChartFactory.prototype.createChart = function (type, elementId) {
return chart;
};
+window.JQPlotChartFactory = JQPlotChartFactory;
diff --git a/js/src/database/multi_table_query.js b/js/src/database/multi_table_query.js
index eeb4e1c9b1..1472aae45b 100644
--- a/js/src/database/multi_table_query.js
+++ b/js/src/database/multi_table_query.js
@@ -9,8 +9,6 @@
*
*/
-/* global generateFromBlock, generateWhereBlock */ // js/database/query_generator.js
-
/**
* js file for handling AJAX and other events in /database/multi-table-query
*/
@@ -104,12 +102,12 @@ window.AJAX.registerOnload('database/multi_table_query.js', function () {
}
query += '\nFROM ';
- query += generateFromBlock(tableAliases, foreignKeys);
+ query += window.generateFromBlock(tableAliases, foreignKeys);
var $criteriaColCount = $('.criteria_col:checked').length;
if ($criteriaColCount > 0) {
query += '\nWHERE ';
- query += generateWhereBlock();
+ query += window.generateWhereBlock();
}
query += ';';
diff --git a/js/src/database/query_generator.js b/js/src/database/query_generator.js
index b09ef5fae7..cb4fafe27e 100644
--- a/js/src/database/query_generator.js
+++ b/js/src/database/query_generator.js
@@ -44,8 +44,7 @@ function generateCondition (criteriaDiv, table) {
return query;
}
-// eslint-disable-next-line no-unused-vars
-function generateWhereBlock () {
+window.generateWhereBlock = function () {
var count = 0;
var query = '';
$('.tableNameSelect').each(function () {
@@ -64,7 +63,7 @@ function generateWhereBlock () {
}
});
return query;
-}
+};
function generateJoin (newTable, tableAliases, fk) {
var query = '';
@@ -116,8 +115,7 @@ function appendTable (table, tableAliases, usedTables, foreignKeys) {
return query;
}
-// eslint-disable-next-line no-unused-vars
-function generateFromBlock (tableAliases, foreignKeys) {
+window.generateFromBlock = (tableAliases, foreignKeys) => {
var usedTables = [];
var query = '';
for (var table in tableAliases) {
@@ -126,4 +124,4 @@ function generateFromBlock (tableAliases, foreignKeys) {
}
}
return query;
-}
+};
diff --git a/js/src/database/search.js b/js/src/database/search.js
index 3bbb7858ca..ed85075317 100644
--- a/js/src/database/search.js
+++ b/js/src/database/search.js
@@ -7,8 +7,6 @@
* @package PhpMyAdmin
*/
-/* global makeGrid */ // js/makegrid.js
-
/**
* AJAX script for the Database Search page.
*
@@ -139,7 +137,7 @@ window.AJAX.registerOnload('database/search.js', function () {
$('#browse-results').html(data.message);
Functions.ajaxRemoveMessage($msg);
$('.table_results').each(function () {
- makeGrid(this, true, true, true, true);
+ window.makeGrid(this, true, true, true, true);
});
$('#browse-results').show();
Functions.highlightSql($('#browse-results'));
diff --git a/js/src/database/structure.js b/js/src/database/structure.js
index 9bcbd0abb4..0687d209cf 100644
--- a/js/src/database/structure.js
+++ b/js/src/database/structure.js
@@ -10,6 +10,7 @@
*/
var DatabaseStructure = {};
+window.DatabaseStructure = DatabaseStructure;
/**
* AJAX scripts for /database/structure
diff --git a/js/src/designer/database.js b/js/src/designer/database.js
index bfd808e969..199c1fffbf 100644
--- a/js/src/designer/database.js
+++ b/js/src/designer/database.js
@@ -11,7 +11,6 @@ var designerTables = [
}
];
-// eslint-disable-next-line no-unused-vars
var DesignerOfflineDB = (function () {
var designerDB = {};
@@ -232,3 +231,4 @@ var DesignerOfflineDB = (function () {
// Export the designerDB object.
return designerDB;
}());
+window.DesignerOfflineDB = DesignerOfflineDB;
diff --git a/js/src/designer/history.js b/js/src/designer/history.js
index 333285b870..da40334c9d 100644
--- a/js/src/designer/history.js
+++ b/js/src/designer/history.js
@@ -5,11 +5,10 @@
* @requires move.js
*/
-/* global contr */ // js/designer/init.js
-/* global fromArray:writable */ // js/designer/move.js
/* global themeImagePath */ // templates/javascript/variables.twig
var DesignerHistory = {};
+window.DesignerHistory = DesignerHistory;
var historyArray = []; // Global array to store history objects
var selectField = []; // Global array to store information for columns which are used in select clause
@@ -145,10 +144,10 @@ DesignerHistory.andOr = function (index) {
* @return {void}
*/
DesignerHistory.historyDelete = function (index) {
- var fromArrayLength = fromArray.length;
+ var fromArrayLength = window.fromArray.length;
for (var k = 0; k < fromArrayLength; k++) {
- if (fromArray[k] === historyArray[index].getTab()) {
- fromArray.splice(k, 1);
+ if (window.fromArray[k] === historyArray[index].getTab()) {
+ window.fromArray.splice(k, 1);
break;
}
}
@@ -630,7 +629,7 @@ DesignerHistory.queryFrom = function () {
var quer = '';
var parts = [];
var tArray = [];
- tArray = fromArray;
+ tArray = window.fromArray;
var K = 0;
var k;
var key;
@@ -643,10 +642,10 @@ DesignerHistory.queryFrom = function () {
var historyArrayLength = historyArray.length;
for (i = 0; i < historyArrayLength; i++) {
- fromArray.push(historyArray[i].getTab());
+ window.fromArray.push(historyArray[i].getTab());
}
- fromArray = DesignerHistory.unique(fromArray);
- tabLeft = fromArray;
+ window.fromArray = DesignerHistory.unique(window.fromArray);
+ tabLeft = window.fromArray;
temp = tabLeft.shift();
quer = '`' + temp + '`';
tabUsed.push(temp);
@@ -654,21 +653,21 @@ DesignerHistory.queryFrom = function () {
// if master table (key2) matches with tab used get all keys and check if tab_left matches
// after this check if master table (key2) matches with tab left then check if any foreign matches with master .
for (i = 0; i < 2; i++) {
- for (K in contr) {
- for (key in contr[K]) {// contr name
- for (key2 in contr[K][key]) {// table name
+ for (K in window.contr) {
+ for (key in window.contr[K]) {// contr name
+ for (key2 in window.contr[K][key]) {// table name
parts = key2.split('.');
if (DesignerHistory.found(tabUsed, parts[1]) > 0) {
- for (key3 in contr[K][key][key2]) {
- parts1 = contr[K][key][key2][key3][0].split('.');
+ for (key3 in window.contr[K][key][key2]) {
+ parts1 = window.contr[K][key][key2][key3][0].split('.');
if (DesignerHistory.found(tabLeft, parts1[1]) > 0) {
if (DesignerHistory.found(constraintsAdded, key) > 0) {
query += ' AND ' + '`' + parts[1] + '`.`' + key3 + '` = ';
- query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` ';
+ query += '`' + parts1[1] + '`.`' + window.contr[K][key][key2][key3][1] + '` ';
} else {
query += '\n' + 'LEFT JOIN ';
query += '`' + parts[1] + '` ON ';
- query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` = ';
+ query += '`' + parts1[1] + '`.`' + window.contr[K][key][key2][key3][1] + '` = ';
query += '`' + parts[1] + '`.`' + key3 + '` ';
constraintsAdded.push(key);
@@ -685,21 +684,21 @@ DesignerHistory.queryFrom = function () {
tabUsed = DesignerHistory.addArray(tTabLeft, tabUsed);
tabLeft = DesignerHistory.removeArray(tTabLeft, tabLeft);
tTabLeft = [];
- for (K in contr) {
- for (key in contr[K]) {
- for (key2 in contr[K][key]) {// table name
+ for (K in window.contr) {
+ for (key in window.contr[K]) {
+ for (key2 in window.contr[K][key]) {// table name
parts = key2.split('.');
if (DesignerHistory.found(tabLeft, parts[1]) > 0) {
- for (key3 in contr[K][key][key2]) {
- parts1 = contr[K][key][key2][key3][0].split('.');
+ for (key3 in window.contr[K][key][key2]) {
+ parts1 = window.contr[K][key][key2][key3][0].split('.');
if (DesignerHistory.found(tabUsed, parts1[1]) > 0) {
if (DesignerHistory.found(constraintsAdded, key) > 0) {
query += ' AND ' + '`' + parts[1] + '`.`' + key3 + '` = ';
- query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` ';
+ query += '`' + parts1[1] + '`.`' + window.contr[K][key][key2][key3][1] + '` ';
} else {
query += '\n' + 'LEFT JOIN ';
query += '`' + parts[1] + '` ON ';
- query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` = ';
+ query += '`' + parts1[1] + '`.`' + window.contr[K][key][key2][key3][1] + '` = ';
query += '`' + parts[1] + '`.`' + key3 + '` ';
constraintsAdded.push(key);
@@ -720,7 +719,7 @@ DesignerHistory.queryFrom = function () {
quer += ' , `' + tabLeft[k] + '`';
}
query = quer + query;
- fromArray = tArray;
+ window.fromArray = tArray;
return query;
};
diff --git a/js/src/designer/init.js b/js/src/designer/init.js
index 8334610a08..0703aa8cdc 100644
--- a/js/src/designer/init.js
+++ b/js/src/designer/init.js
@@ -8,18 +8,6 @@
/* global DesignerPage */ // js/designer/page.js
/* global designerConfig */ // templates/database/designer/main.twig
-/* eslint-disable no-unused-vars */
-var jTabs;
-var hTabs;
-var contr;
-var displayField;
-var server;
-var selectedPage;
-/* eslint-enable no-unused-vars */
-
-var db;
-var designerTablesEnabled;
-
window.AJAX.registerTeardown('designer/init.js', function () {
$('.trigger').off('click');
});
@@ -32,22 +20,21 @@ window.AJAX.registerOnload('designer/init.js', function () {
return false;
});
- jTabs = designerConfig.scriptTables.j_tabs;
- hTabs = designerConfig.scriptTables.h_tabs;
- contr = designerConfig.scriptContr;
- displayField = designerConfig.scriptDisplayField;
- server = designerConfig.server;
- selectedPage = designerConfig.displayPage;
-
- db = designerConfig.db;
- designerTablesEnabled = designerConfig.tablesEnabled;
+ window.jTabs = designerConfig.scriptTables.j_tabs;
+ window.hTabs = designerConfig.scriptTables.h_tabs;
+ window.contr = designerConfig.scriptContr;
+ window.displayField = designerConfig.scriptDisplayField;
+ window.server = designerConfig.server;
+ window.selectedPage = designerConfig.displayPage;
+ window.db = designerConfig.db;
+ window.designerTablesEnabled = designerConfig.tablesEnabled;
DesignerMove.main();
- if (! designerTablesEnabled) {
+ if (! window.designerTablesEnabled) {
DesignerOfflineDB.open(function (success) {
if (success) {
- DesignerPage.showTablesInLandingPage(db);
+ DesignerPage.showTablesInLandingPage(window.db);
}
});
}
diff --git a/js/src/designer/move.js b/js/src/designer/move.js
index eed110e997..ceb60fa5bd 100644
--- a/js/src/designer/move.js
+++ b/js/src/designer/move.js
@@ -4,11 +4,11 @@
/* global DesignerObjects */ // js/designer/objects.js
/* global DesignerHistory, historyArray, selectField */ // js/designer/history.js
-/* global contr, db, designerTablesEnabled, displayField, hTabs, jTabs, selectedPage:writable, server */ // js/designer/init.js
/* global DesignerPage */ // js/designer/page.js
/* global themeImagePath */ // templates/javascript/variables.twig
var DesignerMove = {};
+window.DesignerMove = DesignerMove;
var change = 0; // variable to track any change in designer layout.
var showRelationLines = true;
@@ -79,7 +79,7 @@ var globX;
var globY;
var timeoutId;
var layerMenuCurClick = 0;
-var fromArray = [];
+window.fromArray = [];
var menuMoved = false;
var gridSize = 10;
@@ -265,7 +265,7 @@ DesignerMove.main = function () {
DesignerMove.resizeOsnTab = function () {
var maxX = 0;
var maxY = 0;
- for (var key in jTabs) {
+ for (var key in window.jTabs) {
var kX = parseInt(document.getElementById(key).style[mainDirection], 10) + document.getElementById(key).offsetWidth;
var kY = parseInt(document.getElementById(key).style.top, 10) + document.getElementById(key).offsetHeight;
maxX = maxX < kX ? kX : maxX;
@@ -313,22 +313,22 @@ DesignerMove.reload = function () {
var key3;
DesignerMove.clear();
var osnTab = document.getElementById('osn_tab');
- for (K in contr) {
- for (key in contr[K]) {
+ for (K in window.contr) {
+ for (key in window.contr[K]) {
// contr name
- for (key2 in contr[K][key]) {
+ for (key2 in window.contr[K][key]) {
// table name
- for (key3 in contr[K][key][key2]) {
+ for (key3 in window.contr[K][key][key2]) {
// field name
if (!document.getElementById('check_vis_' + key2).checked ||
- !document.getElementById('check_vis_' + contr[K][key][key2][key3][0]).checked) {
+ !document.getElementById('check_vis_' + window.contr[K][key][key2][key3][0]).checked) {
// if hide
continue;
}
var x1Left = document.getElementById(key2).offsetLeft + 1;
var x1Right = x1Left + document.getElementById(key2).offsetWidth;
- var x2Left = document.getElementById(contr[K][key][key2][key3][0]).offsetLeft;
- var x2Right = x2Left + document.getElementById(contr[K][key][key2][key3][0]).offsetWidth;
+ var x2Left = document.getElementById(window.contr[K][key][key2][key3][0]).offsetLeft;
+ var x2Right = x2Left + document.getElementById(window.contr[K][key][key2][key3][0]).offsetWidth;
a[0] = Math.abs(x1Left - x2Left);
a[1] = Math.abs(x1Left - x2Right);
a[2] = Math.abs(x1Right - x2Left);
@@ -382,10 +382,10 @@ DesignerMove.reload = function () {
rowOffsetTop = 0;
- tabHideButton = document.getElementById('id_hide_tbody_' + contr[K][key][key2][key3][0]);
+ tabHideButton = document.getElementById('id_hide_tbody_' + window.contr[K][key][key2][key3][0]);
if (tabHideButton.innerHTML === 'v') {
- var toColumn = document.getElementById(contr[K][key][key2][key3][0] +
- '.' + contr[K][key][key2][key3][1]);
+ var toColumn = document.getElementById(window.contr[K][key][key2][key3][0] +
+ '.' + window.contr[K][key][key2][key3][1]);
if (toColumn) {
rowOffsetTop = toColumn.offsetTop;
} else {
@@ -394,12 +394,12 @@ DesignerMove.reload = function () {
}
var y2 =
- document.getElementById(contr[K][key][key2][key3][0]).offsetTop +
+ document.getElementById(window.contr[K][key][key2][key3][0]).offsetTop +
rowOffsetTop +
heightField;
DesignerMove.drawLine0(
- x1, x2, y1, y2, osnTab, contr[K][key][key2][key3][0] + '.' + contr[K][key][key2][key3][1]
+ x1, x2, y1, y2, osnTab, window.contr[K][key][key2][key3][0] + '.' + window.contr[K][key][key2][key3][1]
);
}
}
@@ -695,7 +695,7 @@ DesignerMove.addOtherDbTables = function () {
$('#container-form').append($newTableDom);
DesignerMove.enableTableEvents(null, $newTableDom);
DesignerMove.addTableToTablesList(null, $newTableDom);
- jTabs[dbEncoded + '.' + tableEncoded] = 1;
+ window.jTabs[dbEncoded + '.' + tableEncoded] = 1;
DesignerMove.markUnsaved();
}
});
@@ -735,7 +735,7 @@ DesignerMove.new = function () {
// ------------------------------ SAVE ------------------------------------------
// (del?) no for pdf
DesignerMove.save = function (url) {
- for (var key in jTabs) {
+ for (var key in window.jTabs) {
document.getElementById('t_x_' + key + '_').value = parseInt(document.getElementById(key).style.left, 10);
document.getElementById('t_y_' + key + '_').value = parseInt(document.getElementById(key).style.top, 10);
document.getElementById('t_v_' + key + '_').value = document.getElementById('id_tbody_' + key).style.display === 'none' ? 0 : 1;
@@ -747,11 +747,11 @@ DesignerMove.save = function (url) {
DesignerMove.getUrlPos = function (forceString) {
var key;
- if (designerTablesEnabled || forceString) {
+ if (window.designerTablesEnabled || forceString) {
var poststr = '';
var argsep = window.CommonParams.get('arg_separator');
var i = 1;
- for (key in jTabs) {
+ for (key in window.jTabs) {
poststr += argsep + 't_x[' + i + ']=' + parseInt(document.getElementById(key).style.left, 10);
poststr += argsep + 't_y[' + i + ']=' + parseInt(document.getElementById(key).style.top, 10);
poststr += argsep + 't_v[' + i + ']=' + (document.getElementById('id_tbody_' + key).style.display === 'none' ? 0 : 1);
@@ -763,7 +763,7 @@ DesignerMove.getUrlPos = function (forceString) {
return poststr;
} else {
var coords = [];
- for (key in jTabs) {
+ for (key in window.jTabs) {
if (document.getElementById('check_vis_' + key).checked) {
var x = parseInt(document.getElementById(key).style.left, 10);
var y = parseInt(document.getElementById(key).style.top, 10);
@@ -779,10 +779,10 @@ DesignerMove.getUrlPos = function (forceString) {
};
DesignerMove.save2 = function (callback) {
- if (designerTablesEnabled) {
+ if (window.designerTablesEnabled) {
var argsep = window.CommonParams.get('arg_separator');
var poststr = 'operation=savePage' + argsep + 'save_page=same' + argsep + 'ajax_request=true';
- poststr += argsep + 'server=' + server + argsep + 'db=' + encodeURIComponent(db) + argsep + 'selected_page=' + selectedPage;
+ poststr += argsep + 'server=' + window.server + argsep + 'db=' + encodeURIComponent(window.db) + argsep + 'selected_page=' + window.selectedPage;
poststr += DesignerMove.getUrlPos();
var $msgbox = Functions.ajaxShowMessage(window.Messages.strProcessingRequest);
@@ -800,7 +800,7 @@ DesignerMove.save2 = function (callback) {
});
} else {
var name = $('#page_name').html().trim();
- DesignerPage.saveToSelectedPage(db, selectedPage, name, DesignerMove.getUrlPos(), function () {
+ DesignerPage.saveToSelectedPage(window.db, window.selectedPage, name, DesignerMove.getUrlPos(), function () {
DesignerMove.markSaved();
if (typeof callback !== 'undefined') {
callback();
@@ -818,7 +818,7 @@ DesignerMove.submitSaveDialogAndClose = function (callback, modal) {
}
modal.modal('hide');
- if (designerTablesEnabled) {
+ if (window.designerTablesEnabled) {
var $msgbox = Functions.ajaxShowMessage(window.Messages.strProcessingRequest);
Functions.prepareForAjaxRequest($form);
$.post($form.attr('action'), $form.serialize() + DesignerMove.getUrlPos(), function (data) {
@@ -828,7 +828,7 @@ DesignerMove.submitSaveDialogAndClose = function (callback, modal) {
Functions.ajaxRemoveMessage($msgbox);
DesignerMove.markSaved();
if (data.id) {
- selectedPage = data.id;
+ window.selectedPage = data.id;
}
$('#page_name').text(name);
if (typeof callback !== 'undefined') {
@@ -837,10 +837,10 @@ DesignerMove.submitSaveDialogAndClose = function (callback, modal) {
}
});
} else {
- DesignerPage.saveToNewPage(db, name, DesignerMove.getUrlPos(), function (page) {
+ DesignerPage.saveToNewPage(window.db, name, DesignerMove.getUrlPos(), function (page) {
DesignerMove.markSaved();
if (page.pgNr) {
- selectedPage = page.pgNr;
+ window.selectedPage = page.pgNr;
}
$('#page_name').text(page.pageDescr);
if (typeof callback !== 'undefined') {
@@ -851,12 +851,12 @@ DesignerMove.submitSaveDialogAndClose = function (callback, modal) {
};
DesignerMove.save3 = function (callback) {
- if (selectedPage !== -1) {
+ if (window.selectedPage !== -1) {
DesignerMove.save2(callback);
} else {
var $form = $('
')
- .append('')
- .append($('').val(db))
+ .append('')
+ .append($('').val(window.db))
.append('')
.append('')
.append('