gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Assign JS globals to the window object

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2022-07-02 14:02:02 -03:00
parent e4ea2308c0
commit 7bba282caf
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
22 changed files with 191 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/chart.js
View File

@ -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;

6
js/src/database/multi_table_query.js
View File

@ -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 += ';';

10
js/src/database/query_generator.js
View File

@ -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;
}
};

4
js/src/database/search.js
View File

@ -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'));

1
js/src/database/structure.js
View File

@ -10,6 +10,7 @@
*/
var DatabaseStructure = {};
window.DatabaseStructure = DatabaseStructure;
/**
* AJAX scripts for /database/structure

2
js/src/designer/database.js
View File

@ -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;

47
js/src/designer/history.js
View File

@ -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;
};

33
js/src/designer/init.js
View File

@ -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);
}
});
}

224
js/src/designer/move.js
View File

@ -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 = $('<form action="index.php?route=/database/designer" method="post" name="save_page" id="save_page" class="ajax"></form>')
.append('<input type="hidden" name="server" value="' + server + '">')
.append($('<input type="hidden" name="db" />').val(db))
.append('<input type="hidden" name="server" value="' + window.server + '">')
.append($('<input type="hidden" name="db" />').val(window.db))
.append('<input type="hidden" name="operation" value="savePage">')
.append('<input type="hidden" name="save_page" value="new">')
.append('<label for="selected_value">' + window.Messages.strPageName +
@ -880,8 +880,8 @@ DesignerMove.editPages = function () {
var $msgbox = Functions.ajaxShowMessage();
$.post('index.php?route=/database/designer', {
'ajax_request': true,
'server': server,
'db': db,
'server': window.server,
'db': window.db,
'dialog': 'edit'
}, function (data) {
if (data.success === false) {
@ -889,8 +889,8 @@ DesignerMove.editPages = function () {
} else {
Functions.ajaxRemoveMessage($msgbox);
if (! designerTablesEnabled) {
DesignerPage.createPageList(db, function (options) {
if (! window.designerTablesEnabled) {
DesignerPage.createPageList(window.db, function (options) {
$('#selected_page').append(options);
});
}
@ -915,8 +915,8 @@ DesignerMove.deletePages = function () {
var $msgbox = Functions.ajaxShowMessage();
$.post('index.php?route=/database/designer', {
'ajax_request': true,
'server': server,
'db': db,
'server': window.server,
'db': window.db,
'dialog': 'delete'
}, function (data) {
if (data.success === false) {
@ -924,8 +924,8 @@ DesignerMove.deletePages = function () {
} else {
Functions.ajaxRemoveMessage($msgbox);
if (! designerTablesEnabled) {
DesignerPage.createPageList(db, function (options) {
if (! window.designerTablesEnabled) {
DesignerPage.createPageList(window.db, function (options) {
$('#selected_page').append(options);
});
}
@ -940,10 +940,10 @@ DesignerMove.deletePages = function () {
}
var $messageBox = Functions.ajaxShowMessage(window.Messages.strProcessingRequest);
var deletingCurrentPage = parseInt(selected) === selectedPage;
var deletingCurrentPage = parseInt(selected) === window.selectedPage;
Functions.prepareForAjaxRequest($form);
if (designerTablesEnabled) {
if (window.designerTablesEnabled) {
$.post($form.attr('action'), $form.serialize(), function (data) {
if (data.success === false) {
Functions.ajaxShowMessage(data.error, false);
@ -981,8 +981,8 @@ DesignerMove.saveAs = function () {
var $msgbox = Functions.ajaxShowMessage();
$.post('index.php?route=/database/designer', {
'ajax_request': true,
'server': server,
'db': db,
'server': window.server,
'db': window.db,
'dialog': 'save_as'
}, function (data) {
if (data.success === false) {
@ -990,8 +990,8 @@ DesignerMove.saveAs = function () {
} else {
Functions.ajaxRemoveMessage($msgbox);
if (! designerTablesEnabled) {
DesignerPage.createPageList(db, function (options) {
if (! window.designerTablesEnabled) {
DesignerPage.createPageList(window.db, function (options) {
$('#selected_page').append(options);
});
}
@ -1019,7 +1019,7 @@ DesignerMove.saveAs = function () {
}
var $msgbox = Functions.ajaxShowMessage(window.Messages.strProcessingRequest);
if (designerTablesEnabled) {
if (window.designerTablesEnabled) {
Functions.prepareForAjaxRequest($form);
$.post($form.attr('action'), $form.serialize() + DesignerMove.getUrlPos(), function (data) {
if (data.success === false) {
@ -1028,30 +1028,30 @@ DesignerMove.saveAs = function () {
Functions.ajaxRemoveMessage($msgbox);
DesignerMove.markSaved();
if (data.id) {
selectedPage = data.id;
window.selectedPage = data.id;
}
DesignerMove.loadPage(selectedPage);
DesignerMove.loadPage(window.selectedPage);
}
}); // end $.post()
} else {
if (choice === 'same') {
var selectedPageId = $selectedPage.find('option:selected').val();
DesignerPage.saveToSelectedPage(db, selectedPageId, name, DesignerMove.getUrlPos(), function (page) {
DesignerPage.saveToSelectedPage(window.db, selectedPageId, name, DesignerMove.getUrlPos(), function (page) {
Functions.ajaxRemoveMessage($msgbox);
DesignerMove.markSaved();
if (page.pgNr) {
selectedPage = page.pgNr;
window.selectedPage = page.pgNr;
}
DesignerMove.loadPage(selectedPage);
DesignerMove.loadPage(window.selectedPage);
});
} else if (choice === 'new') {
DesignerPage.saveToNewPage(db, name, DesignerMove.getUrlPos(), function (page) {
DesignerPage.saveToNewPage(window.db, name, DesignerMove.getUrlPos(), function (page) {
Functions.ajaxRemoveMessage($msgbox);
DesignerMove.markSaved();
if (page.pgNr) {
selectedPage = page.pgNr;
window.selectedPage = page.pgNr;
}
DesignerMove.loadPage(selectedPage);
DesignerMove.loadPage(window.selectedPage);
});
}
}
@ -1059,15 +1059,15 @@ DesignerMove.saveAs = function () {
modal.modal('hide');
});
// select current page by default
if (selectedPage !== -1) {
$('select[name="selected_page"]').val(selectedPage);
if (window.selectedPage !== -1) {
$('select[name="selected_page"]').val(window.selectedPage);
}
}
}); // end $.post()
};
DesignerMove.promptToSaveCurrentPage = function (callback) {
if (change === 1 || selectedPage === -1) {
if (change === 1 || window.selectedPage === -1) {
var modal = DesignerMove.displayModal('<div>' + window.Messages.strLeavingPage + '</div>',
window.Messages.strSavePage, '#designerPromptModal');
$('#designerModalYesButton').on('click', function () {
@ -1090,10 +1090,10 @@ DesignerMove.exportPages = function () {
$.post('index.php?route=/database/designer', {
'ajax_request': true,
'server': server,
'db': db,
'server': window.server,
'db': window.db,
'dialog': 'export',
'selected_page': selectedPage
'selected_page': window.selectedPage
}, function (data) {
if (data.success === false) {
Functions.ajaxShowMessage(data.error, false);
@ -1101,7 +1101,7 @@ DesignerMove.exportPages = function () {
Functions.ajaxRemoveMessage($msgbox);
var $form = $(data.message);
if (!designerTablesEnabled) {
if (! window.designerTablesEnabled) {
$form.append('<input type="hidden" name="offline_export" value="true">');
}
$.each(DesignerMove.getUrlPos(true).substring(1).split(argsep), function () {
@ -1128,18 +1128,18 @@ DesignerMove.exportPages = function () {
};
DesignerMove.loadPage = function (page) {
if (designerTablesEnabled) {
if (window.designerTablesEnabled) {
var paramPage = '';
var argsep = window.CommonParams.get('arg_separator');
if (page !== null) {
paramPage = argsep + 'page=' + page;
}
$('<a href="index.php?route=/database/designer&server=' + server + argsep + 'db=' + encodeURIComponent(db) + paramPage + '"></a>')
$('<a href="index.php?route=/database/designer&server=' + window.server + argsep + 'db=' + encodeURIComponent(window.db) + paramPage + '"></a>')
.appendTo($('#page_content'))
.trigger('click');
} else {
if (page === null) {
DesignerPage.showTablesInLandingPage(db);
DesignerPage.showTablesInLandingPage(window.db);
} else if (page > -1) {
DesignerPage.loadHtmlForPage(page);
} else if (page === -1) {
@ -1184,7 +1184,7 @@ DesignerMove.saveValueInConfig = function (indexSent, valueSent) {
'operation': 'save_setting_value',
'index': indexSent,
'ajax_request': true,
'server': server,
'server': window.server,
'value': valueSent
},
function (data) {
@ -1226,7 +1226,7 @@ DesignerMove.clickField = function (db, T, f, pk) {
alert(window.Messages.strPleaseSelectPrimaryOrUniqueKey);
return;// 0;
}// PK
if (jTabs[db + '.' + T] !== 1) {
if (window.jTabs[db + '.' + T] !== 1) {
document.getElementById('foreign_relation').style.display = 'none';
}
clickField = 1;
@ -1234,7 +1234,7 @@ DesignerMove.clickField = function (db, T, f, pk) {
document.getElementById('designer_hint').innerHTML = window.Messages.strSelectForeignKey;
} else {
DesignerMove.startRelation(); // hidden hint...
if (jTabs[db + '.' + T] !== 1 || !pkLocal) {
if (window.jTabs[db + '.' + T] !== 1 || !pkLocal) {
document.getElementById('foreign_relation').style.display = 'none';
}
var left = globX - (document.getElementById('layer_new_relation').offsetWidth >> 1);
@ -1249,11 +1249,11 @@ DesignerMove.clickField = function (db, T, f, pk) {
if (onDisplayField) {
var fieldNameToSend = decodeURIComponent(f);
var newDisplayFieldClass = 'tab_field';
var oldTabField = document.getElementById('id_tr_' + T + '.' + displayField[T]);
var oldTabField = document.getElementById('id_tr_' + T + '.' + window.displayField[T]);
// if is display field
if (displayField[T] === f) {// The display field is already the one defined, user wants to remove it
if (window.displayField[T] === f) {// The display field is already the one defined, user wants to remove it
newDisplayFieldClass = 'tab_field';
delete displayField[T];
delete window.displayField[T];
if (oldTabField) {// Clear the style
// Set display field class on old item
oldTabField.className = 'tab_field';
@ -1261,16 +1261,16 @@ DesignerMove.clickField = function (db, T, f, pk) {
fieldNameToSend = '';
} else {
newDisplayFieldClass = 'tab_field_3';
if (displayField[T]) { // Had a previous one, clear it
if (window.displayField[T]) { // Had a previous one, clear it
if (oldTabField) {
// Set display field class on old item
oldTabField.className = 'tab_field';
}
delete displayField[T];
delete window.displayField[T];
}
displayField[T] = f;
window.displayField[T] = f;
var tabField = document.getElementById('id_tr_' + T + '.' + displayField[T]);
var tabField = document.getElementById('id_tr_' + T + '.' + window.displayField[T]);
if (tabField) {
// Set new display field class
tabField.className = newDisplayFieldClass;
@ -1286,7 +1286,7 @@ DesignerMove.clickField = function (db, T, f, pk) {
{
'operation': 'setDisplayField',
'ajax_request': true,
'server': server,
'server': window.server,
'db': db,
'table': T,
'field': fieldNameToSend
@ -1305,7 +1305,7 @@ DesignerMove.clickField = function (db, T, f, pk) {
DesignerMove.newRelation = function () {
document.getElementById('layer_new_relation').style.display = 'none';
var argsep = window.CommonParams.get('arg_separator');
linkRelation += argsep + 'server=' + server + argsep + 'db=' + db + argsep + 'db2=p';
linkRelation += argsep + 'server=' + window.server + argsep + 'db=' + window.db + argsep + 'db2=p';
linkRelation += argsep + 'on_delete=' + document.getElementById('on_delete').value + argsep + 'on_update=' + document.getElementById('on_update').value;
linkRelation += argsep + 'operation=addNewRelation' + argsep + 'ajax_request=true';
@ -1316,7 +1316,7 @@ DesignerMove.newRelation = function () {
} else {
Functions.ajaxRemoveMessage($msgbox);
Functions.ajaxShowMessage(data.message);
DesignerMove.loadPage(selectedPage);
DesignerMove.loadPage(window.selectedPage);
}
}); // end $.post()
};
@ -1366,7 +1366,7 @@ DesignerMove.smallTabAll = function (idThis) {
// invert max/min all tables
DesignerMove.smallTabInvert = function () {
for (var key in jTabs) {
for (var key in window.jTabs) {
DesignerMove.smallTab(key, 0);
}
DesignerMove.reload();
@ -1381,7 +1381,7 @@ DesignerMove.relationLinesInvert = function () {
};
DesignerMove.smallTabRefresh = function () {
for (var key in jTabs) {
for (var key in window.jTabs) {
if (document.getElementById('id_hide_tbody_' + key).innerHTML !== 'v') {
DesignerMove.smallTab(key, 0);
}
@ -1445,18 +1445,18 @@ DesignerMove.canvasClick = function (id, event) {
localY -= $('#osn_tab').offset().top;
DesignerMove.clear();
var osnTab = document.getElementById('osn_tab');
for (K in contr) {
for (key in contr[K]) {
for (key2 in contr[K][key]) {
for (key3 in contr[K][key][key2]) {
for (K in window.contr) {
for (key in window.contr[K]) {
for (key2 in window.contr[K][key]) {
for (key3 in window.contr[K][key][key2]) {
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) {
continue; // if hide
}
var x1Left = document.getElementById(key2).offsetLeft + 1;// document.getElementById(key2+"."+key3).offsetLeft;
var x1Right = x1Left + document.getElementById(key2).offsetWidth;
var x2Left = document.getElementById(contr[K][key][key2][key3][0]).offsetLeft;// +document.getElementById(contr[K][key2][key3][0]+"."+contr[K][key2][key3][1]).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;// +document.getElementById(contr[K][key2][key3][0]+"."+contr[K][key2][key3][1]).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);
@ -1493,8 +1493,8 @@ DesignerMove.canvasClick = function (id, event) {
}
var y1 = document.getElementById(key2).offsetTop + document.getElementById(key2 + '.' + key3).offsetTop + heightField;
var y2 = document.getElementById(contr[K][key][key2][key3][0]).offsetTop +
document.getElementById(contr[K][key][key2][key3][0] + '.' + contr[K][key][key2][key3][1]).offsetTop + heightField;
var y2 = document.getElementById(window.contr[K][key][key2][key3][0]).offsetTop +
document.getElementById(window.contr[K][key][key2][key3][0] + '.' + window.contr[K][key][key2][key3][1]).offsetTop + heightField;
if (!selected && localX > x1 - 10 && localX < x1 + 10 && localY > y1 - 7 && localY < y1 + 7) {
DesignerMove.drawLine0(
@ -1502,15 +1502,15 @@ DesignerMove.canvasClick = function (id, event) {
);
selected = 1;
Key0 = contr[K][key][key2][key3][0];
Key1 = contr[K][key][key2][key3][1];
Key0 = window.contr[K][key][key2][key3][0];
Key1 = window.contr[K][key][key2][key3][1];
Key2 = key2;
Key3 = key3;
Key = K;
} else {
DesignerMove.drawLine0(
x1, x2, y1, y2, osnTab,
contr[K][key][key2][key3][0] + '.' + contr[K][key][key2][key3][1]
window.contr[K][key][key2][key3][0] + '.' + window.contr[K][key][key2][key3][1]
);
}
}
@ -1532,7 +1532,7 @@ DesignerMove.canvasClick = function (id, event) {
DesignerMove.updRelation = function () {
document.getElementById('layer_upd_relation').style.display = 'none';
var argsep = window.CommonParams.get('arg_separator');
linkRelation += argsep + 'server=' + server + argsep + 'db=' + db;
linkRelation += argsep + 'server=' + window.server + argsep + 'db=' + window.db;
linkRelation += argsep + 'operation=removeRelation' + argsep + 'ajax_request=true';
var $msgbox = Functions.ajaxShowMessage(window.Messages.strProcessingRequest);
@ -1542,7 +1542,7 @@ DesignerMove.updRelation = function () {
} else {
Functions.ajaxRemoveMessage($msgbox);
Functions.ajaxShowMessage(data.message);
DesignerMove.loadPage(selectedPage);
DesignerMove.loadPage(window.selectedPage);
}
}); // end $.post()
};
@ -1599,14 +1599,14 @@ DesignerMove.noHaveConstr = function (idThis) {
var key;
var key2;
var key3;
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
a[key2] = a[contr[K][key][key2][key3][0]] = 1; // exist constr
a[key2] = a[window.contr[K][key][key2][key3][0]] = 1; // exist constr
}
}
}
@ -1815,7 +1815,7 @@ DesignerMove.selectAll = function (tableName, dbName, idSelectAll) {
});
if (parentIsChecked) {
selectField.push('`' + tableName + '`.*');
fromArray.push(tableName);
window.fromArray.push(tableName);
} else {
var i;
for (i = 0; i < selectField.length; i++) {
@ -1824,9 +1824,9 @@ DesignerMove.selectAll = function (tableName, dbName, idSelectAll) {
}
}
var k;
for (k = 0; k < fromArray.length; k++) {
if (fromArray[k] === tableName) {
fromArray.splice(k, 1);
for (k = 0; k < window.fromArray.length; k++) {
if (window.fromArray[k] === tableName) {
window.fromArray.splice(k, 1);
break;
}
}
@ -1863,7 +1863,7 @@ DesignerMove.storeColumn = function (tableName, colName, checkboxId) {
var selectKeyField = '`' + tableName + '`.`' + colName + '`';
if (document.getElementById(checkboxId).checked === true) {
selectField.push(selectKeyField);
fromArray.push(tableName);
window.fromArray.push(tableName);
} else {
for (i = 0; i < selectField.length; i++) {
if (selectField[i] === selectKeyField) {
@ -1871,9 +1871,9 @@ DesignerMove.storeColumn = function (tableName, colName, checkboxId) {
break;
}
}
for (k = 0; k < fromArray.length; k++) {
if (fromArray[k] === tableName) {
fromArray.splice(k, 1);
for (k = 0; k < window.fromArray.length; k++) {
if (window.fromArray[k] === tableName) {
window.fromArray.splice(k, 1);
break;
}
}
@ -1903,22 +1903,22 @@ DesignerMove.addObject = function (dbName, tableName, colName, dbTableNameUrl) {
}
p = document.getElementById('Query');
whereObj = new DesignerHistory.Where(rel.value, p.value);// make where object
historyArray.push(new DesignerHistory.HistoryObj(colName, whereObj, tableName, hTabs[dbTableNameUrl], 'Where'));
historyArray.push(new DesignerHistory.HistoryObj(colName, whereObj, tableName, window.hTabs[dbTableNameUrl], 'Where'));
sum = sum + 1;
}
if (document.getElementById('new_name').value !== '') {
var renameObj = new DesignerHistory.Rename(document.getElementById('new_name').value);// make Rename object
historyArray.push(new DesignerHistory.HistoryObj(colName, renameObj, tableName, hTabs[dbTableNameUrl], 'Rename'));
historyArray.push(new DesignerHistory.HistoryObj(colName, renameObj, tableName, window.hTabs[dbTableNameUrl], 'Rename'));
sum = sum + 1;
}
if (document.getElementById('operator').value !== '---') {
var aggregateObj = new DesignerHistory.Aggregate(document.getElementById('operator').value);
historyArray.push(new DesignerHistory.HistoryObj(colName, aggregateObj, tableName, hTabs[dbTableNameUrl], 'Aggregate'));
historyArray.push(new DesignerHistory.HistoryObj(colName, aggregateObj, tableName, window.hTabs[dbTableNameUrl], 'Aggregate'));
sum = sum + 1;
// make aggregate operator
}
if (document.getElementById('groupby').checked === true) {
historyArray.push(new DesignerHistory.HistoryObj(colName, 'GroupBy', tableName, hTabs[dbTableNameUrl], 'GroupBy'));
historyArray.push(new DesignerHistory.HistoryObj(colName, 'GroupBy', tableName, window.hTabs[dbTableNameUrl], 'GroupBy'));
sum = sum + 1;
// make groupby
}
@ -1931,13 +1931,13 @@ DesignerMove.addObject = function (dbName, tableName, colName, dbTableNameUrl) {
document.getElementById('having').value,
document.getElementById('h_operator').value
);// make where object
historyArray.push(new DesignerHistory.HistoryObj(colName, whereObj, tableName, hTabs[dbTableNameUrl], 'Having'));
historyArray.push(new DesignerHistory.HistoryObj(colName, whereObj, tableName, window.hTabs[dbTableNameUrl], 'Having'));
sum = sum + 1;
// make having
}
if (document.getElementById('orderby').value !== '---') {
var orderByObj = new DesignerHistory.OrderBy(document.getElementById('orderby').value);
historyArray.push(new DesignerHistory.HistoryObj(colName, orderByObj, tableName, hTabs[dbTableNameUrl], 'OrderBy'));
historyArray.push(new DesignerHistory.HistoryObj(colName, orderByObj, tableName, window.hTabs[dbTableNameUrl], 'OrderBy'));
sum = sum + 1;
// make orderby
}
@ -2114,7 +2114,7 @@ window.AJAX.registerOnload('designer/move.js', function () {
return false;
});
$('#reloadPage').on('click', function () {
DesignerMove.loadPage(selectedPage);
DesignerMove.loadPage(window.selectedPage);
});
$('#angular_direct_button').on('click', function () {
DesignerMove.angularDirect();

2
js/src/designer/objects.js
View File

@ -1,4 +1,3 @@
// eslint-disable-next-line no-unused-vars
var DesignerObjects = {
PdfPage: function (dbName, pageDescr, tblCords) {
// eslint-disable-next-line no-unused-vars
@ -15,3 +14,4 @@ var DesignerObjects = {
this.y = y;
}
};
window.DesignerObjects = DesignerObjects;

13
js/src/designer/page.js
View File

@ -1,16 +1,15 @@
/* global DesignerOfflineDB */ // js/designer/database.js
// eslint-disable-next-line no-unused-vars
/* global db, selectedPage:writable */ // js/designer/init.js
/* global DesignerMove */ // js/designer/move.js
/* global DesignerObjects */ // js/designer/objects.js
var DesignerPage = {};
window.DesignerPage = DesignerPage;
DesignerPage.showTablesInLandingPage = function (db) {
DesignerPage.loadFirstPage(db, function (page) {
if (page) {
DesignerPage.loadHtmlForPage(page.pgNr);
selectedPage = page.pgNr;
window.selectedPage = page.pgNr;
} else {
DesignerPage.showNewPageTables(true);
}
@ -45,7 +44,7 @@ DesignerPage.saveToSelectedPage = function (db, pageId, pageName, tablePositions
if (typeof callback !== 'undefined') {
callback(page);
}
selectedPage = page.pgNr;
window.selectedPage = page.pgNr;
});
};
@ -122,7 +121,7 @@ DesignerPage.showNewPageTables = function (check) {
DesignerMove.visibleTab(input, input.value);
}
}
selectedPage = -1;
window.selectedPage = -1;
$('#page_name').text(window.Messages.strUntitled);
DesignerMove.markUnsaved();
};
@ -133,7 +132,7 @@ DesignerPage.loadHtmlForPage = function (pageId) {
$('#name-panel').find('#page_name').text(page.pageDescr);
var tableMissing = false;
for (var t = 0; t < tblCords.length; t++) {
var tbId = db + '.' + tblCords[t].tableName;
var tbId = window.db + '.' + tblCords[t].tableName;
var table = document.getElementById(tbId);
if (table === null) {
tableMissing = true;
@ -151,7 +150,7 @@ DesignerPage.loadHtmlForPage = function (pageId) {
DesignerMove.markUnsaved();
Functions.ajaxShowMessage(window.Messages.strSavedPageTableMissing);
}
selectedPage = page.pgNr;
window.selectedPage = page.pgNr;
});
};

4
js/src/doclinks.js
View File

@ -2,7 +2,6 @@
* Definition of links to MySQL documentation.
*/
// eslint-disable-next-line no-unused-vars
var mysqlDocKeyword = {
/* Multi word */
'CHARACTER SET': ['charset'],
@ -330,8 +329,8 @@ var mysqlDocKeyword = {
'COUNT_DISTINCT': ['aggregate-functions', 'function_count-distinct'],
'NOT_IN': ['comparison-operators', 'function_not-in']
};
window.mysqlDocKeyword = mysqlDocKeyword;
// eslint-disable-next-line no-unused-vars
var mysqlDocBuiltin = {
'TINYINT': ['numeric-types'],
'SMALLINT': ['numeric-types'],
@ -365,3 +364,4 @@ var mysqlDocBuiltin = {
'ENUM': ['string-types'],
'SET': ['string-types']
};
window.mysqlDocBuiltin = mysqlDocBuiltin;

10
js/src/gis_data_editor.js
View File

@ -8,8 +8,7 @@
/* global addZoomPanControllers, storeGisSvgRef, selectVisualization, styleOSM, zoomAndPan */ // js/table/gis_visualization.js
/* global themeImagePath */ // templates/javascript/variables.twig
// eslint-disable-next-line no-unused-vars
var gisEditorLoaded = false;
window.gisEditorLoaded = false;
/**
* Closes the GIS data editor and perform necessary clean up work.
@ -91,7 +90,6 @@ function initGISEditorVisualization () {
* @param inputName name of the input field
* @param token token
*/
// eslint-disable-next-line no-unused-vars
function loadJSAndGISEditor (value, field, type, inputName) {
var head = document.getElementsByTagName('head')[0];
var script;
@ -121,8 +119,9 @@ function loadJSAndGISEditor (value, field, type, inputName) {
script.src = 'js/vendor/openlayers/OpenLayers.js';
head.appendChild(script);
gisEditorLoaded = true;
window.gisEditorLoaded = true;
}
window.loadJSAndGISEditor = loadJSAndGISEditor;
/**
* Loads the GIS editor via AJAX
@ -152,11 +151,11 @@ function loadGISEditor (value, field, type, inputName) {
}
}, 'json');
}
window.loadGISEditor = loadGISEditor;
/**
* Opens up the dialog for the GIS data editor.
*/
// eslint-disable-next-line no-unused-vars
function openGISEditor () {
// Center the popup
var windowWidth = document.documentElement.clientWidth;
@ -183,6 +182,7 @@ function openGISEditor () {
$background.fadeIn('fast');
$gisEditor.fadeIn('fast');
}
window.openGISEditor = openGISEditor;
/**
* Prepare and insert the GIS data in Well Known Text format

1
js/src/indexes.js
View File

@ -10,6 +10,7 @@
*/
var Indexes = {};
window.Indexes = Indexes;
/**
* Returns the array of indexes based on the index choice

3
js/src/makegrid.js
View File

@ -16,8 +16,7 @@
* @param enableVisib Optional, if false, show/hide column feature will be disabled
* @param enableGridEdit Optional, if false, grid editing feature will be disabled
*/
// eslint-disable-next-line no-unused-vars
var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGridEdit) {
window.makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGridEdit) {
var isResizeEnabled = enableResize === undefined ? true : enableResize;
var isReorderEnabled = enableReorder === undefined ? true : enableReorder;
var isVisibEnabled = enableVisib === undefined ? true : enableVisib;

1
js/src/navigation.js
View File

@ -5,6 +5,7 @@
*/
var Navigation = {};
window.Navigation = Navigation;
/**
* updates the tree state in sessionStorage

1
js/src/server/status/sorter.js
View File

@ -19,6 +19,7 @@ function initTableSorter (tabid) {
$table.find('tr').first().find('th')
.append('<div class="sorticon"></div>');
}
window.initTableSorter = initTableSorter;
$(function () {
$.tablesorter.addParser({

4
js/src/sql.js
View File

@ -8,10 +8,10 @@
*/
/* global Navigation */
/* global makeGrid */ // js/makegrid.js
/* global themeImagePath */ // templates/javascript/variables.twig
var Sql = {};
window.Sql = Sql;
/**
* decode a string URL_encoded
@ -624,7 +624,7 @@ window.AJAX.registerOnload('sql.js', function () {
*/
$(document).on('makegrid', '.sqlqueryresults', function () {
$('.table_results').each(function () {
makeGrid(this);
window.makeGrid(this);
});
});

9
js/src/table/change.js
View File

@ -8,7 +8,7 @@
*/
/* global extendingValidatorMessages */ // templates/javascript/variables.twig
/* global openGISEditor, gisEditorLoaded, loadJSAndGISEditor, loadGISEditor */ // js/gis_data_editor.js
/* global openGISEditor, loadJSAndGISEditor, loadGISEditor */ // js/gis_data_editor.js
/**
* Modify form controls when the "NULL" checkbox is checked
@ -59,7 +59,6 @@ function nullify (theType, urlField, md5Field, multiEdit) {
return true;
} // end of the 'nullify()' function
/**
* javascript DateTime format validation.
* its used to prevent adding default (0000-00-00 00:00:00) to database when user enter wrong values
@ -195,6 +194,7 @@ function verifyAfterSearchFieldChange (index, searchFormId) {
$thisInput.valid();
}
}
window.verifyAfterSearchFieldChange = verifyAfterSearchFieldChange;
/**
* Validate the an input contains multiple int values
@ -406,6 +406,7 @@ function verificationsAfterFieldChange (urlField, multiEdit, theType) {
$thisInput.data('rulesadded', null);
}
}
window.verificationsAfterFieldChange = verificationsAfterFieldChange;
/* End of fields validation*/
/**
@ -508,7 +509,7 @@ window.AJAX.registerOnload('table/change.js', function () {
var inputName = $span.parent('td').children('input[type=\'text\']').attr('name');
openGISEditor();
if (!gisEditorLoaded) {
if (! window.gisEditorLoaded) {
loadJSAndGISEditor(value, field, type, inputName);
} else {
loadGISEditor(value, field, type, inputName);
@ -844,7 +845,6 @@ function addNewContinueInsertionFields (event) {
Functions.addDateTimePicker();
}
// eslint-disable-next-line no-unused-vars
function changeValueFieldType (elem, searchIndex) {
var fieldsValue = $('input#fieldID_' + searchIndex);
if (0 === fieldsValue.size()) {
@ -873,3 +873,4 @@ function changeValueFieldType (elem, searchIndex) {
$('#fieldID_' + searchIndex).prop('multiple', false);
}
}
window.changeValueFieldType = changeValueFieldType;

5
js/src/table/gis_visualization.js
View File

@ -37,6 +37,7 @@ function zoomAndPan () {
$('polyline.vector', gisSvg).attr('stroke-width', 2 / scale);
$('path.vector', gisSvg).attr('stroke-width', 0.5 / scale);
}
window.zoomAndPan = zoomAndPan;
/**
* Initially loads either SVG or OSM visualization based on the choice.
@ -48,6 +49,7 @@ function selectVisualization () {
$('#placeholder').hide();
}
}
window.selectVisualization = selectVisualization;
/**
* Adds necessary styles to the div that contains the openStreetMap.
@ -62,6 +64,7 @@ function styleOSM () {
};
$('#openlayersmap').css(cssObj);
}
window.styleOSM = styleOSM;
/**
* Store a reference to the gis svg element.
@ -69,6 +72,7 @@ function styleOSM () {
function storeGisSvgRef () {
gisSvg = $('#placeholder').find('svg').get(0);
}
window.storeGisSvgRef = storeGisSvgRef;
/**
* Adds controls for zooming and panning.
@ -90,6 +94,7 @@ function addZoomPanControllers () {
'<img class="button" id="zoom_out" src="' + themeImagePath + 'zoom-minus-mini.png">'
);
}
window.addZoomPanControllers = addZoomPanControllers;
/**
* Resizes the GIS visualization to fit into the space available.

4
js/src/table/select.js
View File

@ -6,7 +6,7 @@
*/
/* global changeValueFieldType, verifyAfterSearchFieldChange */ // js/table/change.js
/* global openGISEditor, gisEditorLoaded, loadJSAndGISEditor, loadGISEditor */ // js/gis_data_editor.js
/* global openGISEditor, loadJSAndGISEditor, loadGISEditor */ // js/gis_data_editor.js
var TableSelect = {};
@ -264,7 +264,7 @@ window.AJAX.registerOnload('table/select.js', function () {
// Token
openGISEditor();
if (!gisEditorLoaded) {
if (! window.gisEditorLoaded) {
loadJSAndGISEditor(value, field, type, inputName);
} else {
loadGISEditor(value, field, type, inputName);

2
js/src/validator-messages.js
View File

@ -1,4 +1,3 @@
// eslint-disable-next-line no-unused-vars
function extendingValidatorMessages () {
$.extend($.validator.messages, {
required: window.Messages.strValidatorRequired,
@ -23,3 +22,4 @@ function extendingValidatorMessages () {
validationFunctionForAesDesEncrypt: $.validator.format(window.Messages.strValidationFunctionForAesDesEncrypt),
});
}
window.extendingValidatorMessages = extendingValidatorMessages;