diff --git a/frontend-js/package.json b/frontend-js/package.json index 84561e114941091fa47b68bcad7c1eabc9749a00..ace3914e3b54693a6ba9a0a8edc3e05f0abcbed4 100644 --- a/frontend-js/package.json +++ b/frontend-js/package.json @@ -20,7 +20,6 @@ "devDependencies": { "assert": "1.4.1", "bluebird": "^3.5.2", - "bootstrap": "^3.3.7", "browserify": "^13.1.1", "chai": "^3.5.0", "clean-css-cli": "^4.2.1", @@ -39,6 +38,7 @@ "uglifyjs": "^2.4.10" }, "dependencies": { + "bootstrap": "^3.3.7", "csv-stringify": "^4.0.0", "datatables.net": "^1.10.19", "datatables.net-rowreorder": "^1.2.5", diff --git a/frontend-js/src/main/js/Admin.js b/frontend-js/src/main/js/Admin.js index b77926c6634a4ab47dee46550a884ff310b3dd25..eb472626aa8c35a6ae9edc65563e5030ff9e22fd 100644 --- a/frontend-js/src/main/js/Admin.js +++ b/frontend-js/src/main/js/Admin.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var Promise = require("bluebird"); diff --git a/frontend-js/src/main/js/Configuration.js b/frontend-js/src/main/js/Configuration.js index 2b9f2ce4514f799c0d79cf3762552f4e714370da..cd676612994bd073be94ddea1f03d3dae3a22b2e 100644 --- a/frontend-js/src/main/js/Configuration.js +++ b/frontend-js/src/main/js/Configuration.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); // noinspection JSUnusedLocalSymbols var logger = require('./logger'); @@ -613,7 +614,7 @@ function createCopy(original) { } return result; } else { - return jQuery.extend({}, original); + return $.extend({}, original); } } diff --git a/frontend-js/src/main/js/Functions.js b/frontend-js/src/main/js/Functions.js index 4b8bc38a711004db23e438804cec0276ec39974b..3a6e5fb5e824d172b30b227d839128a25e61f263 100644 --- a/frontend-js/src/main/js/Functions.js +++ b/frontend-js/src/main/js/Functions.js @@ -304,6 +304,7 @@ Functions.prototype.getElementByName = function (element, name) { * @returns {HTMLElement|undefined} */ Functions.prototype.getElementByClassName = function (element, name) { + var $ = require('jquery'); if (name.indexOf(".") !== 0) { name = "." + name; } @@ -384,6 +385,7 @@ Functions.prototype.createElement = function (params) { result.index = params.index; } if (params.data !== null && params.data !== undefined) { + var $ = require('jquery'); $(result).attr("data", params.data); } return result; @@ -715,6 +717,18 @@ Functions.prototype.isString = function (value) { return (value instanceof String || typeof value === "string"); }; +/** + * + * @param {String} selector + * @return {String} + */ +Functions.prototype.escapeSelector = function (selector) { + // return $.escapeSelector(selector); + return "".replace.call(selector, + /(^[^_a-zA-Z\u00a0-\uffff]|[^-_a-zA-Z0-9\u00a0-\uffff])/g, + "\\$1"); +}; + var singleton = new Functions(); module.exports = singleton; diff --git a/frontend-js/src/main/js/GuiConnector.js b/frontend-js/src/main/js/GuiConnector.js index 90968a42ac5257186d919408b82b3f65921975ce..67067f3ed2ff171f453c53deb9870c3956e47d4b 100644 --- a/frontend-js/src/main/js/GuiConnector.js +++ b/frontend-js/src/main/js/GuiConnector.js @@ -1,5 +1,11 @@ "use strict"; +var $ = require('jquery'); +var jQuery = $; +var dt = require('datatables.net')(); +var dtReorder = require('datatables.net-rowreorder')(); +require('jquery-ui/dialog'); + var Promise = require("bluebird"); var logger = require('./logger'); @@ -9,11 +15,6 @@ var ObjectWithListeners = require('./ObjectWithListeners'); var SecurityError = require('./SecurityError'); var ValidationError = require('./ValidationError'); -var $ = require('jquery'); -var jQuery = $; -var dt = require('datatables.net')(); -var dtReorder = require('datatables.net-rowreorder')(); -require('jquery-ui/dialog'); /** * This static global object contains set of functions that returns/set data in diff --git a/frontend-js/src/main/js/gui/AbstractGuiElement.js b/frontend-js/src/main/js/gui/AbstractGuiElement.js index d5be62beb61320ee976f5a500c173896b9d61b9b..9dab5e9d6eec5db682b56d3ec985a0f32bf975c4 100644 --- a/frontend-js/src/main/js/gui/AbstractGuiElement.js +++ b/frontend-js/src/main/js/gui/AbstractGuiElement.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var ObjectWithListeners = require('../ObjectWithListeners'); var PanelControlElementType = require('./PanelControlElementType'); diff --git a/frontend-js/src/main/js/gui/AddOverlayDialog.js b/frontend-js/src/main/js/gui/AddOverlayDialog.js index f860127ded2f141821f87ad83edc94ec3b74a559..c9f0c38d09a9ba606522a135ec7586ded1a2a82a 100644 --- a/frontend-js/src/main/js/gui/AddOverlayDialog.js +++ b/frontend-js/src/main/js/gui/AddOverlayDialog.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var AbstractGuiElement = require('./AbstractGuiElement'); var GuiConnector = require('../GuiConnector'); diff --git a/frontend-js/src/main/js/gui/CommentDialog.js b/frontend-js/src/main/js/gui/CommentDialog.js index 58e89acdfd2204c272e4d2596eff36c6d2601d10..94cad0b18caab595ce6e743da5a6f4cd0ac8501a 100644 --- a/frontend-js/src/main/js/gui/CommentDialog.js +++ b/frontend-js/src/main/js/gui/CommentDialog.js @@ -1,5 +1,7 @@ "use strict"; +var $ = require('jquery'); + /* exported logger */ var Promise = require("bluebird"); diff --git a/frontend-js/src/main/js/gui/ContextMenu.js b/frontend-js/src/main/js/gui/ContextMenu.js index 6a3ad94e3e9ad0ad9a0649d6a7e25dc38d94d781..d00fcdc656f77cbe22ecf75d54357a78dc070bd7 100644 --- a/frontend-js/src/main/js/gui/ContextMenu.js +++ b/frontend-js/src/main/js/gui/ContextMenu.js @@ -1,5 +1,7 @@ "use strict"; +var $ = require('jquery'); + /* exported logger */ var AbstractGuiElement = require('./AbstractGuiElement'); diff --git a/frontend-js/src/main/js/gui/Header.js b/frontend-js/src/main/js/gui/Header.js index 6597b83641f731cdfdfd9eb9930027c5b5fc3706..247ea133d0f8ee2ffaf0ab253b9c6ac0a4b666b1 100644 --- a/frontend-js/src/main/js/gui/Header.js +++ b/frontend-js/src/main/js/gui/Header.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var AbstractGuiElement = require('./AbstractGuiElement'); var PanelControlElementType = require('./PanelControlElementType'); diff --git a/frontend-js/src/main/js/gui/Legend.js b/frontend-js/src/main/js/gui/Legend.js index a976ab7a3e54e87c0575a4c5b8a62c900330b4ad..5d41585b51103cf62f22f8f49a2f2df2607dd56c 100644 --- a/frontend-js/src/main/js/gui/Legend.js +++ b/frontend-js/src/main/js/gui/Legend.js @@ -1,5 +1,6 @@ "use strict"; +var $ = require('jquery'); var AbstractGuiElement = require('./AbstractGuiElement'); var ConfigurationType = require('../ConfigurationType'); var Functions = require('../Functions'); diff --git a/frontend-js/src/main/js/gui/LoginDialog.js b/frontend-js/src/main/js/gui/LoginDialog.js index 09d5d8621a6ef085950ace3081745858c8b0a389..30c14c0366fd33d3a4a2aefef8b81d1bbe8731c5 100644 --- a/frontend-js/src/main/js/gui/LoginDialog.js +++ b/frontend-js/src/main/js/gui/LoginDialog.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var AbstractGuiElement = require('./AbstractGuiElement'); var GuiConnector = require('../GuiConnector'); diff --git a/frontend-js/src/main/js/gui/OverviewDialog.js b/frontend-js/src/main/js/gui/OverviewDialog.js index c23d7c9b589e7c251fa7a1a22e637dcfdc091a1b..6a0cc5cd3fbe929436876d71fc454df6483ae280 100644 --- a/frontend-js/src/main/js/gui/OverviewDialog.js +++ b/frontend-js/src/main/js/gui/OverviewDialog.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var AbstractGuiElement = require('./AbstractGuiElement'); var GuiConnector = require('../GuiConnector'); diff --git a/frontend-js/src/main/js/gui/Panel.js b/frontend-js/src/main/js/gui/Panel.js index d0e8c98d23849c3cfde72903d084784f70077ac9..2bbb1124068b1bb7c1535da085890084d76f28a9 100644 --- a/frontend-js/src/main/js/gui/Panel.js +++ b/frontend-js/src/main/js/gui/Panel.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var GuiConnector = require('../GuiConnector'); var AbstractGuiElement = require('./AbstractGuiElement'); diff --git a/frontend-js/src/main/js/gui/PluginDialog.js b/frontend-js/src/main/js/gui/PluginDialog.js index f075dd68ec0f204103a980384c2311fdef1dafad..2ae76160922bd8ffe44fdb625e016942039c8a5e 100644 --- a/frontend-js/src/main/js/gui/PluginDialog.js +++ b/frontend-js/src/main/js/gui/PluginDialog.js @@ -1,4 +1,6 @@ "use strict"; + +var $ = require('jquery'); var AbstractGuiElement = require('./AbstractGuiElement'); var GuiConnector = require('../GuiConnector'); var GuiUtils = require('./leftPanel/GuiUtils'); diff --git a/frontend-js/src/main/js/gui/SubMenu.js b/frontend-js/src/main/js/gui/SubMenu.js index 88924fb023f5f5f9af3a1a5d0bee00af62045aea..1c2838ff293cbfbf40ec9748fc0e40d14b2619a4 100644 --- a/frontend-js/src/main/js/gui/SubMenu.js +++ b/frontend-js/src/main/js/gui/SubMenu.js @@ -1,5 +1,7 @@ "use strict"; +var $ = require('jquery'); + /* exported logger */ var AbstractGuiElement = require('./AbstractGuiElement'); diff --git a/frontend-js/src/main/js/gui/admin/AddPluginDialog.js b/frontend-js/src/main/js/gui/admin/AddPluginDialog.js index 3b229d85600aa4594c5a69c2b17672cdd50fbf45..b16d20cb190fd199c7704b60bf1f9e1726e4abb5 100644 --- a/frontend-js/src/main/js/gui/admin/AddPluginDialog.js +++ b/frontend-js/src/main/js/gui/admin/AddPluginDialog.js @@ -1,6 +1,7 @@ "use strict"; var Promise = require("bluebird"); +var $ = require('jquery'); var AbstractGuiElement = require('../AbstractGuiElement'); var GuiConnector = require('../../GuiConnector'); diff --git a/frontend-js/src/main/js/gui/admin/AddProjectDialog.js b/frontend-js/src/main/js/gui/admin/AddProjectDialog.js index 7f821bd6a90d7031f7eb4af60776c44b9ba3d28d..d9ac2de36e0bf19630616e1e6a85166c669af9cd 100644 --- a/frontend-js/src/main/js/gui/admin/AddProjectDialog.js +++ b/frontend-js/src/main/js/gui/admin/AddProjectDialog.js @@ -1,5 +1,6 @@ "use strict"; +var $ = require('jquery'); var Promise = require("bluebird"); var JSZip = require("jszip"); var xss = require('xss'); diff --git a/frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js b/frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js index 9f5d5795694076bfccdfc213cc661e745cd7227b..24f5401eff36e35c179635689bfdb3a6c19ee45f 100644 --- a/frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js +++ b/frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var AbstractAnnotatorsDialog = require('./AbstractAnnotatorsDialog'); var Annotator = require("../../map/data/Annotator"); diff --git a/frontend-js/src/main/js/gui/admin/ChooseValidatorsDialog.js b/frontend-js/src/main/js/gui/admin/ChooseValidatorsDialog.js index 29c189bb8484b8c2e6e41ba80ec4348cb9d86725..78cfe774507c3cb3d6d9f10ae7c1d45c2604b7dc 100644 --- a/frontend-js/src/main/js/gui/admin/ChooseValidatorsDialog.js +++ b/frontend-js/src/main/js/gui/admin/ChooseValidatorsDialog.js @@ -1,6 +1,9 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); +require('jquery-ui/dialog'); +require('jstree'); var AbstractAnnotatorsDialog = require('./AbstractAnnotatorsDialog'); var GuiConnector = require("../../GuiConnector"); diff --git a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js index 86994e14f5256d18b6b89e82436e94c7acb6b33e..064e6297e73dc6f151556d104405c636a532b6aa 100644 --- a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js +++ b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js @@ -1,5 +1,6 @@ "use strict"; +var $ = require('jquery'); var AbstractGuiElement = require('../AbstractGuiElement'); var Functions = require('../../Functions'); diff --git a/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js b/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js index f159106c09acbe3af7213f4a6f48f0265b8c00e1..ff32dae5972f594ed7a809d1f4385a68575ff064 100644 --- a/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js +++ b/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js @@ -1,5 +1,7 @@ "use strict"; +var $ = require('jquery'); + var AbstractAdminPanel = require('./AbstractAdminPanel'); var PrivilegeType = require('../../map/data/PrivilegeType'); var ConfigurationType = require('../../ConfigurationType'); diff --git a/frontend-js/src/main/js/gui/admin/EditGenomeDialog.js b/frontend-js/src/main/js/gui/admin/EditGenomeDialog.js index a15c8af0d4054bad9b306f4fe7bf03e815dc288b..eec66fe6079ff10bb58612cb5431a1d28ce8471b 100644 --- a/frontend-js/src/main/js/gui/admin/EditGenomeDialog.js +++ b/frontend-js/src/main/js/gui/admin/EditGenomeDialog.js @@ -1,6 +1,7 @@ "use strict"; var Promise = require("bluebird"); +var $ = require('jquery'); var AbstractGuiElement = require('../AbstractGuiElement'); var Annotation = require('../../map/data/Annotation'); diff --git a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js index 8ea5f570df1d3dc3bf08f6a33c1d6207d9334021..313827182ce1549d2dcc41ad65891c18536967d7 100644 --- a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js +++ b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js @@ -2,6 +2,7 @@ /* exported logger */ var Promise = require("bluebird"); +var $ = require('jquery'); var AbstractGuiElement = require('../AbstractGuiElement'); var AddOverlayDialog = require('../AddOverlayDialog'); diff --git a/frontend-js/src/main/js/gui/admin/EditUserDialog.js b/frontend-js/src/main/js/gui/admin/EditUserDialog.js index dc27e389abc1c2bf193d72249006329cdd75ccd6..2f1f3b14c787627a5cfc01540be7e4f365172275 100644 --- a/frontend-js/src/main/js/gui/admin/EditUserDialog.js +++ b/frontend-js/src/main/js/gui/admin/EditUserDialog.js @@ -1,5 +1,6 @@ "use strict"; +var $ = require('jquery'); var Promise = require("bluebird"); var xss = require('xss'); diff --git a/frontend-js/src/main/js/gui/admin/GenomeAdminPanel.js b/frontend-js/src/main/js/gui/admin/GenomeAdminPanel.js index 7fbca524a25271ebdf80f2ec6caaf2bb6d8e8b73..a6da28570ca9b931b597c4d090262a716ec414df 100644 --- a/frontend-js/src/main/js/gui/admin/GenomeAdminPanel.js +++ b/frontend-js/src/main/js/gui/admin/GenomeAdminPanel.js @@ -1,5 +1,7 @@ "use strict"; +var $ = require('jquery'); + var AbstractAdminPanel = require('./AbstractAdminPanel'); var EditGenomeDialog = require('./EditGenomeDialog'); diff --git a/frontend-js/src/main/js/gui/admin/LogListDialog.js b/frontend-js/src/main/js/gui/admin/LogListDialog.js index f8f09a7c86237bd3d6291971533852e93fce4c21..954ef03bc3cef01d97aba7d6426ffe45a1e16a41 100644 --- a/frontend-js/src/main/js/gui/admin/LogListDialog.js +++ b/frontend-js/src/main/js/gui/admin/LogListDialog.js @@ -1,6 +1,7 @@ "use strict"; var Promise = require("bluebird"); +var $ = require('jquery'); /* exported logger */ diff --git a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js index 2d10ac4619dc2e8d687cec98546bdfacb7e9a20f..dcac66b096da9038fe252ab6b68368cd2becb53f 100644 --- a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js +++ b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var AbstractAdminPanel = require('./AbstractAdminPanel'); var AddProjectDialog = require('./AddProjectDialog'); diff --git a/frontend-js/src/main/js/gui/admin/PluginAdminPanel.js b/frontend-js/src/main/js/gui/admin/PluginAdminPanel.js index b4a223dbc922da1288b124214a6958de9a61e432..a27c2b42222c6ad773b6fd60e470a77156491ef4 100644 --- a/frontend-js/src/main/js/gui/admin/PluginAdminPanel.js +++ b/frontend-js/src/main/js/gui/admin/PluginAdminPanel.js @@ -1,5 +1,7 @@ "use strict"; +var $ = require('jquery'); + var AbstractAdminPanel = require('./AbstractAdminPanel'); var AddPluginDialog = require('./AddPluginDialog'); diff --git a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js index 8b4ee91e377f14a293e84bd96335f2bd23b8ced5..6de9dbcf6e3d527e1099a29bb47de20ba79b5688 100644 --- a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js +++ b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js @@ -1,5 +1,7 @@ "use strict"; +var $ = require('jquery'); + var Promise = require('bluebird'); var PrivilegeType = require('../../map/data/PrivilegeType'); @@ -299,7 +301,7 @@ UsersAdminPanel.prototype.addUpdateListener = function (user, dataTableRow) { } } var listener = function () { - var login = $.escapeSelector(user.getLogin()); + var login = Functions.escapeSelector(user.getLogin()); self.userToTableRow(user, dataTableRow); var row = $($("[name='usersTable']", self.getElement())[0]).DataTable().row("#" + login); if (row.length > 0) { diff --git a/frontend-js/src/main/js/gui/export/AbstractExportPanel.js b/frontend-js/src/main/js/gui/export/AbstractExportPanel.js index 167770bd575ab714fa6eff12863c0e66af947a4a..e22bb9beb066340a497a1d30d156571db2c352de 100644 --- a/frontend-js/src/main/js/gui/export/AbstractExportPanel.js +++ b/frontend-js/src/main/js/gui/export/AbstractExportPanel.js @@ -2,6 +2,7 @@ /* exported logger */ +var $ = require('jquery'); var Panel = require('../Panel'); var GuiConnector = require('../../GuiConnector'); diff --git a/frontend-js/src/main/js/gui/export/ElementExportPanel.js b/frontend-js/src/main/js/gui/export/ElementExportPanel.js index 5cfd1aa9864288936c89e0ce61989f14d647b1e2..a1ef96c581466c2b2fe626ee99dfd64c485d1662 100644 --- a/frontend-js/src/main/js/gui/export/ElementExportPanel.js +++ b/frontend-js/src/main/js/gui/export/ElementExportPanel.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var AbstractExportPanel = require('./AbstractExportPanel'); var ValidationError = require('../../ValidationError'); diff --git a/frontend-js/src/main/js/gui/export/GraphicsExportPanel.js b/frontend-js/src/main/js/gui/export/GraphicsExportPanel.js index db001d2bb212bb209722758b6b1e8b429b58bc66..af03579bd5d5b7f1d07ad3b7190358eb2d478731 100644 --- a/frontend-js/src/main/js/gui/export/GraphicsExportPanel.js +++ b/frontend-js/src/main/js/gui/export/GraphicsExportPanel.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var AbstractExportPanel = require('./AbstractExportPanel'); var Functions = require('../../Functions'); diff --git a/frontend-js/src/main/js/gui/export/NetworkExportPanel.js b/frontend-js/src/main/js/gui/export/NetworkExportPanel.js index 7e5bed4223df67eb08da3c792f496c1ab4e877cc..46a728fac879d268378b4817743a8258ac147cf0 100644 --- a/frontend-js/src/main/js/gui/export/NetworkExportPanel.js +++ b/frontend-js/src/main/js/gui/export/NetworkExportPanel.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var AbstractExportPanel = require('./AbstractExportPanel'); diff --git a/frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js b/frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js index e2719750f793a9d33d8a3f446ff64e460624b8cc..0bf53d845eade74312d80a8baccc0942cfaeb336 100644 --- a/frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js +++ b/frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js @@ -2,6 +2,7 @@ /* exported logger */ +var $ = require('jquery'); var Promise = require("bluebird"); var AbstractDbOverlay = require('../../map/overlay/AbstractDbOverlay'); diff --git a/frontend-js/src/main/js/gui/leftPanel/GuiUtils.js b/frontend-js/src/main/js/gui/leftPanel/GuiUtils.js index e71109f650aa861c2f61453232691d776f39a8e0..ad32d2872b61c4be08bd56b54388e2098dff39cd 100644 --- a/frontend-js/src/main/js/gui/leftPanel/GuiUtils.js +++ b/frontend-js/src/main/js/gui/leftPanel/GuiUtils.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var Alias = require('../../map/data/Alias'); var ConfigurationType = require('../../ConfigurationType'); @@ -1133,7 +1134,7 @@ GuiUtils.prototype.addTab = function (abstractGuiElement, params) { }; if (params.options !== undefined) { - options = jQuery.extend(options, params.options); + options = $.extend(options, params.options); } var panel = new params.panelClass(options); diff --git a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js index 1c6454fa0405edb0fa5984c960cd024bd1b6f455..fccbc57c9db34792b97a9fd52059b55f06894fce 100644 --- a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js +++ b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var AddOverlayDialog = require('../AddOverlayDialog'); var Panel = require('../Panel'); diff --git a/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js b/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js index 0ed1dc7a4c51b4d495ad274ddda3460f60a9b464..114cc4a567739c19688e443202ce78bc423ae611 100644 --- a/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js +++ b/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js @@ -1,6 +1,7 @@ "use strict"; /* exported logger */ +var $ = require('jquery'); var ConfigurationType = require('../../ConfigurationType'); var GuiConnector = require('../../GuiConnector'); diff --git a/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js b/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js index aa9a0225aa768adf00903251f9cb618dac98ef41..cea011042c3f9b98a892f4c847bcc14b1eb38f86 100644 --- a/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js +++ b/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js @@ -1,6 +1,7 @@ "use strict"; var Promise = require("bluebird"); +var $ = require('jquery'); /* exported logger */ diff --git a/frontend-js/src/main/js/gui/leftPanel/SearchPanel.js b/frontend-js/src/main/js/gui/leftPanel/SearchPanel.js index 713ca6bb60e3b7ff146df2716efb5fe626158738..001288164d4f6e0bb62d4b2f8c6c2deca5aeb1b4 100644 --- a/frontend-js/src/main/js/gui/leftPanel/SearchPanel.js +++ b/frontend-js/src/main/js/gui/leftPanel/SearchPanel.js @@ -1,6 +1,7 @@ "use strict"; var Promise = require("bluebird"); +var $ = require('jquery'); /* exported logger */ diff --git a/frontend-js/src/main/js/gui/leftPanel/SubmapPanel.js b/frontend-js/src/main/js/gui/leftPanel/SubmapPanel.js index dfe1ea7c4d00cb842a7ae455df6736c5b079ca77..a46393f7c41d796244df5d45be3a53aa8bd2f8b3 100644 --- a/frontend-js/src/main/js/gui/leftPanel/SubmapPanel.js +++ b/frontend-js/src/main/js/gui/leftPanel/SubmapPanel.js @@ -1,6 +1,7 @@ "use strict"; var Promise = require("bluebird"); +var $ = require('jquery'); var GuiConnector = require('../../GuiConnector'); var Panel = require('../Panel'); diff --git a/frontend-js/src/main/js/gui/topMenu/TopMenu.js b/frontend-js/src/main/js/gui/topMenu/TopMenu.js index 3930a4c8bb3857ca22d01a6d12efe46c68d7f5b5..95ff88f63e843b41c950d721d9368182c1d2b633 100644 --- a/frontend-js/src/main/js/gui/topMenu/TopMenu.js +++ b/frontend-js/src/main/js/gui/topMenu/TopMenu.js @@ -1,6 +1,7 @@ "use strict"; var Promise = require("bluebird"); +var $ = require('jquery'); /* exported logger */ diff --git a/frontend-js/src/main/js/map/AbstractCustomMap.js b/frontend-js/src/main/js/map/AbstractCustomMap.js index b57688098afebb9fe5658606347398e55dd694ee..319e7d08685579d73ccfb1f5ef0546cfbeeb426c 100644 --- a/frontend-js/src/main/js/map/AbstractCustomMap.js +++ b/frontend-js/src/main/js/map/AbstractCustomMap.js @@ -1,5 +1,6 @@ "use strict"; +var $ = require('jquery'); var Promise = require("bluebird"); var logger = require('../logger'); diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js index e647327c61a500ca5efb7e3c6b03a48b0dd03001..9aa0cbcae287e5bfd018dab9582b812b9ab684ae 100644 --- a/frontend-js/src/main/js/map/CustomMap.js +++ b/frontend-js/src/main/js/map/CustomMap.js @@ -1,5 +1,7 @@ "use strict"; +var $ = require('jquery'); + var Promise = require("bluebird"); var logger = require('../logger'); diff --git a/frontend-js/src/main/js/map/Submap.js b/frontend-js/src/main/js/map/Submap.js index 26dcb67cd97e4cf3bbb982d3c02115bf74e304c1..f45fdffacc9e17dddca645a710458f56427038f4 100644 --- a/frontend-js/src/main/js/map/Submap.js +++ b/frontend-js/src/main/js/map/Submap.js @@ -1,5 +1,7 @@ "use strict"; +var $ = require('jquery'); + /* exported logger */ // noinspection JSUnusedLocalSymbols diff --git a/frontend-js/src/main/js/map/canvas/OpenLayers/OpenLayerCanvas.js b/frontend-js/src/main/js/map/canvas/OpenLayers/OpenLayerCanvas.js index ada5885aaabfb938a479fccf72835b927988dcba..d960d471bb1e49b663b2932f8632c942f4b910ee 100644 --- a/frontend-js/src/main/js/map/canvas/OpenLayers/OpenLayerCanvas.js +++ b/frontend-js/src/main/js/map/canvas/OpenLayers/OpenLayerCanvas.js @@ -1,5 +1,7 @@ "use strict"; +var $ = require('jquery'); + var ol; // noinspection JSUnusedLocalSymbols diff --git a/frontend-js/src/main/js/map/canvas/OpenLayers/OpenLayerInfoWindow.js b/frontend-js/src/main/js/map/canvas/OpenLayers/OpenLayerInfoWindow.js index 1a7c39ed6de73b7ce3b493c47d73cb6e5c363993..33d67f39775365793acb24ca5e51f5b05b9045da 100644 --- a/frontend-js/src/main/js/map/canvas/OpenLayers/OpenLayerInfoWindow.js +++ b/frontend-js/src/main/js/map/canvas/OpenLayers/OpenLayerInfoWindow.js @@ -1,5 +1,7 @@ "use strict"; +var $ = require('jquery'); + var InfoWindow = require('../InfoWindow'); var OpenLayerMarker = require('./OpenLayerMarker'); diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js index 041461972608c65ef9a178b61fd177b89a040ff6..2bb66c5e20eeb2eeb1fc43a52435e52c04f4cf71 100644 --- a/frontend-js/src/main/js/minerva.js +++ b/frontend-js/src/main/js/minerva.js @@ -1,5 +1,6 @@ 'use strict'; +var $ = require('jquery'); var functions = require('./Functions'); var AbstractDbOverlay = require('./map/overlay/AbstractDbOverlay'); diff --git a/frontend-js/src/main/js/plugin/PluginManager.js b/frontend-js/src/main/js/plugin/PluginManager.js index d577830ae4baf19d4e5e47b1b959c090f967f9cb..ff458420f697e3e4fdc740db0538f14ac5ccce9f 100644 --- a/frontend-js/src/main/js/plugin/PluginManager.js +++ b/frontend-js/src/main/js/plugin/PluginManager.js @@ -1,5 +1,6 @@ "use strict"; +var $ = require('jquery'); var AbstractGuiElement = require('../gui/AbstractGuiElement'); var Plugin = require('./Plugin'); var GuiUtils = require('../gui/leftPanel/GuiUtils'); diff --git a/frontend-js/src/test/js/Admin-test.js b/frontend-js/src/test/js/Admin-test.js index 510455bf6b5f3533ca09389a5d52091e723e6ed4..84dd40ac7f8a95f56e7a0947a5c4a5c393ef2c40 100644 --- a/frontend-js/src/test/js/Admin-test.js +++ b/frontend-js/src/test/js/Admin-test.js @@ -1,6 +1,7 @@ "use strict"; require("./mocha-config"); +var $ = require('jquery'); var Admin = require('../../main/js/Admin'); var ServerConnector = require('./ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/AddOverlayDialog-test.js b/frontend-js/src/test/js/gui/AddOverlayDialog-test.js index 509a417300a61eeb162c2c69fdbef8eb09066627..acc37f9345e0358c4428ac3e7e3660d6f4e0617d 100644 --- a/frontend-js/src/test/js/gui/AddOverlayDialog-test.js +++ b/frontend-js/src/test/js/gui/AddOverlayDialog-test.js @@ -1,6 +1,7 @@ "use strict"; require("../mocha-config"); +var $ = require('jquery'); var AddOverlayDialog = require('../../../main/js/gui/AddOverlayDialog'); var ServerConnector = require('../ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/CommentDialog-test.js b/frontend-js/src/test/js/gui/CommentDialog-test.js index 4bf8cb943329ab915c2be6f5295acb1a984a5f51..0479f788bb5520047fbfd202ccee60748dac4074 100644 --- a/frontend-js/src/test/js/gui/CommentDialog-test.js +++ b/frontend-js/src/test/js/gui/CommentDialog-test.js @@ -1,6 +1,7 @@ "use strict"; require('../mocha-config'); +var $ = require('jquery'); var CommentDialog = require('../../../main/js/gui/CommentDialog'); var ServerConnector = require('../ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/Header-test.js b/frontend-js/src/test/js/gui/Header-test.js index eb76c462261d10ba821f3a89102a43db25eb4a2c..9bfede17bf6e193dd6ed5ee3d39023cdd7dd761f 100644 --- a/frontend-js/src/test/js/gui/Header-test.js +++ b/frontend-js/src/test/js/gui/Header-test.js @@ -1,6 +1,7 @@ "use strict"; require("../mocha-config.js"); +var $ = require('jquery'); var Header = require('../../../main/js/gui/Header'); diff --git a/frontend-js/src/test/js/gui/MapContextMenu-test.js b/frontend-js/src/test/js/gui/MapContextMenu-test.js index 4070e8ab1b2ae71ca33bafb6520532a9378ebe9b..5cf8c8c39bb3920c7960377705c50e92e223173d 100644 --- a/frontend-js/src/test/js/gui/MapContextMenu-test.js +++ b/frontend-js/src/test/js/gui/MapContextMenu-test.js @@ -1,6 +1,7 @@ "use strict"; require("../mocha-config.js"); +var $ = require('jquery'); var MapContextMenu = require('../../../main/js/gui/MapContextMenu'); var Point = require('../../../main/js/map/canvas/Point'); diff --git a/frontend-js/src/test/js/gui/OptionsMenu-test.js b/frontend-js/src/test/js/gui/OptionsMenu-test.js index 45638dcedf65f632313a968f077836d3a44faba4..e66817949bf1afc69f39aadf26ee5683c53689c8 100644 --- a/frontend-js/src/test/js/gui/OptionsMenu-test.js +++ b/frontend-js/src/test/js/gui/OptionsMenu-test.js @@ -1,6 +1,7 @@ "use strict"; require("../mocha-config.js"); +var $ = require('jquery'); var OptionsMenu = require('../../../main/js/gui/OptionsMenu'); var PluginManager = require('../../../main/js/plugin/PluginManager'); diff --git a/frontend-js/src/test/js/gui/SelectionContextMenu-test.js b/frontend-js/src/test/js/gui/SelectionContextMenu-test.js index 8a5314558e2de6993f106fd0e2fe2f2b93eb3848..d8d9910af0b4cf7744f48620dbab820053a640de 100644 --- a/frontend-js/src/test/js/gui/SelectionContextMenu-test.js +++ b/frontend-js/src/test/js/gui/SelectionContextMenu-test.js @@ -1,6 +1,7 @@ "use strict"; require("../mocha-config.js"); +var $ = require('jquery'); var Point = require('../../../main/js/map/canvas/Point'); var SelectionContextMenu = require('../../../main/js/gui/SelectionContextMenu'); diff --git a/frontend-js/src/test/js/gui/admin/AddPluginDialog-test.js b/frontend-js/src/test/js/gui/admin/AddPluginDialog-test.js index 6956ab3cbb116a7b14e98b3c198ca7cd519d17fd..b36b5c189a8dd9a2301b87c5b94616510b04da14 100644 --- a/frontend-js/src/test/js/gui/admin/AddPluginDialog-test.js +++ b/frontend-js/src/test/js/gui/admin/AddPluginDialog-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var AddPluginDialog = require('../../../../main/js/gui/admin/AddPluginDialog'); var ServerConnector = require('../../ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/admin/AddProjectDialog-test.js b/frontend-js/src/test/js/gui/admin/AddProjectDialog-test.js index 4460649174c7f6cc2fee3caabd5c9625dba3a204..2d98ec407cd6dc7d0cc19f57ffd6d925cf2d190f 100644 --- a/frontend-js/src/test/js/gui/admin/AddProjectDialog-test.js +++ b/frontend-js/src/test/js/gui/admin/AddProjectDialog-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var AddProjectDialog = require('../../../../main/js/gui/admin/AddProjectDialog'); var ServerConnector = require('../../ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/admin/ChooseAnnotatorsDialog-test.js b/frontend-js/src/test/js/gui/admin/ChooseAnnotatorsDialog-test.js index c45c0496c1a0fdfd4a449d615f68139f8492b72d..f4335179dc8137dd8b0931f2a5d7ba7e24da039c 100644 --- a/frontend-js/src/test/js/gui/admin/ChooseAnnotatorsDialog-test.js +++ b/frontend-js/src/test/js/gui/admin/ChooseAnnotatorsDialog-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var ChooseAnnotatorsDialog = require('../../../../main/js/gui/admin/ChooseAnnotatorsDialog'); var Annotator = require('../../../../main/js/map/data/Annotator'); diff --git a/frontend-js/src/test/js/gui/admin/ChooseValidatorsDialog-test.js b/frontend-js/src/test/js/gui/admin/ChooseValidatorsDialog-test.js index c40a4c1d5b0ef26763e231abe14c911e31d411d5..d9c985baf8423f2c4048293d37351c77043678d5 100644 --- a/frontend-js/src/test/js/gui/admin/ChooseValidatorsDialog-test.js +++ b/frontend-js/src/test/js/gui/admin/ChooseValidatorsDialog-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var ChooseValidatorsDialog = require('../../../../main/js/gui/admin/ChooseValidatorsDialog'); var ServerConnector = require('../../ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/admin/CommentsAdminPanel-test.js b/frontend-js/src/test/js/gui/admin/CommentsAdminPanel-test.js index 9716082db7a592d0c0552e51b5e1b34e7ea478f0..82d76ccef06ae256c50b85bddc6d59e66c1809ec 100644 --- a/frontend-js/src/test/js/gui/admin/CommentsAdminPanel-test.js +++ b/frontend-js/src/test/js/gui/admin/CommentsAdminPanel-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var CommentsAdminPanel = require('../../../../main/js/gui/admin/CommentsAdminPanel'); var ServerConnector = require('../../ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/admin/ConfigurationAdminPanel-test.js b/frontend-js/src/test/js/gui/admin/ConfigurationAdminPanel-test.js index 975a37203887ad3a7b1eee71dedb6a2bae8fdc8b..c8d96e22e0a8026acb079bdaedc01f267040f3ab 100644 --- a/frontend-js/src/test/js/gui/admin/ConfigurationAdminPanel-test.js +++ b/frontend-js/src/test/js/gui/admin/ConfigurationAdminPanel-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var ConfigurationAdminPanel = require('../../../../main/js/gui/admin/ConfigurationAdminPanel'); var ConfigurationType = require('../../../../main/js/ConfigurationType'); diff --git a/frontend-js/src/test/js/gui/admin/EditGenomeDialog-test.js b/frontend-js/src/test/js/gui/admin/EditGenomeDialog-test.js index 36be57ba12a2bba3917ae2b59fa8bdc66bcf0a53..e995a2c7b937beb46888ab100302742da26306ff 100644 --- a/frontend-js/src/test/js/gui/admin/EditGenomeDialog-test.js +++ b/frontend-js/src/test/js/gui/admin/EditGenomeDialog-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var EditGenomeDialog = require('../../../../main/js/gui/admin/EditGenomeDialog'); var ReferenceGenome = require('../../../../main/js/map/data/ReferenceGenome'); diff --git a/frontend-js/src/test/js/gui/admin/EditProjectDialog-test.js b/frontend-js/src/test/js/gui/admin/EditProjectDialog-test.js index 68cb514c1672312504581b6e8869ca760da90582..69a90af297db8f1ac486a5056aa01d972862093c 100644 --- a/frontend-js/src/test/js/gui/admin/EditProjectDialog-test.js +++ b/frontend-js/src/test/js/gui/admin/EditProjectDialog-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var EditProjectDialog = require('../../../../main/js/gui/admin/EditProjectDialog'); var ServerConnector = require('../../ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/admin/EditUserDialog-test.js b/frontend-js/src/test/js/gui/admin/EditUserDialog-test.js index 1912c157b6712b3302028dda3d8ef53f5850d19b..d6eeb71c49494849b3aceb1db69566e5fdb160ed 100644 --- a/frontend-js/src/test/js/gui/admin/EditUserDialog-test.js +++ b/frontend-js/src/test/js/gui/admin/EditUserDialog-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var EditUserDialog = require('../../../../main/js/gui/admin/EditUserDialog'); var User = require('../../../../main/js/map/data/User'); diff --git a/frontend-js/src/test/js/gui/admin/GenomeAdminPanel-test.js b/frontend-js/src/test/js/gui/admin/GenomeAdminPanel-test.js index cacce056d11957f6f55479003bae47cfb10325d6..c04af2bb680d17a29220e5a6bd0ddbb22dcb077a 100644 --- a/frontend-js/src/test/js/gui/admin/GenomeAdminPanel-test.js +++ b/frontend-js/src/test/js/gui/admin/GenomeAdminPanel-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var GenomeAdminPanel = require('../../../../main/js/gui/admin/GenomeAdminPanel'); var ServerConnector = require('../../ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js b/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js index 37bccc05fb85c142ffce0aeb7a49d4201a49bc9a..8509f57ba1cc83f45d5bdddbb93f9e16422ab253 100644 --- a/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js +++ b/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var MapsAdminPanel = require('../../../../main/js/gui/admin/MapsAdminPanel'); var ServerConnector = require('../../ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/admin/PluginAdminPanel-test.js b/frontend-js/src/test/js/gui/admin/PluginAdminPanel-test.js index ce9e707659880cdd7483f7eccb3f38d35ee78154..5e81b4e059e73098d6fa8e2f5c7307708bde4fd6 100644 --- a/frontend-js/src/test/js/gui/admin/PluginAdminPanel-test.js +++ b/frontend-js/src/test/js/gui/admin/PluginAdminPanel-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var PluginData = require('../../../../main/js/map/data/PluginData'); var PrivilegeType = require('../../../../main/js/map/data/PrivilegeType'); diff --git a/frontend-js/src/test/js/gui/export/ElementExportPanel-test.js b/frontend-js/src/test/js/gui/export/ElementExportPanel-test.js index 2ae3767818c37ff3c62881bfefd0c14cc7bff44a..9868a89ca007bf05a68c67f45c458c4d7d8b34f4 100644 --- a/frontend-js/src/test/js/gui/export/ElementExportPanel-test.js +++ b/frontend-js/src/test/js/gui/export/ElementExportPanel-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config.js"); +var $ = require('jquery'); var ElementExportPanel = require('../../../../main/js/gui/export/ElementExportPanel'); var ValidationError = require('../../../../main/js/ValidationError'); diff --git a/frontend-js/src/test/js/gui/export/GraphicsExportPanel-test.js b/frontend-js/src/test/js/gui/export/GraphicsExportPanel-test.js index db7727993f913d32f7f9128ffc514f4adc75bf36..4411a401e71fd68dcde27fd95cc92adaea50986a 100644 --- a/frontend-js/src/test/js/gui/export/GraphicsExportPanel-test.js +++ b/frontend-js/src/test/js/gui/export/GraphicsExportPanel-test.js @@ -1,5 +1,6 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var GraphicsExportPanel = require('../../../../main/js/gui/export/GraphicsExportPanel'); var ServerConnector = require('../../ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/export/NetworkExportPanel-test.js b/frontend-js/src/test/js/gui/export/NetworkExportPanel-test.js index dabdbd9764455b06ee0f8289da47cb4be69f7f75..40687d712bf8c71df720c29903c4e02685d70a0f 100644 --- a/frontend-js/src/test/js/gui/export/NetworkExportPanel-test.js +++ b/frontend-js/src/test/js/gui/export/NetworkExportPanel-test.js @@ -1,6 +1,7 @@ "use strict"; require("../../mocha-config"); +var $ = require('jquery'); var NetworkExportPanel = require('../../../../main/js/gui/export/NetworkExportPanel'); var ServerConnector = require('../../ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/leftPanel/GuiUtils-test.js b/frontend-js/src/test/js/gui/leftPanel/GuiUtils-test.js index 1ad333b042c3e591b1b2e305e1e711f81eab30bc..5819a4c213df9031732aa6a6637288ac4b075692 100644 --- a/frontend-js/src/test/js/gui/leftPanel/GuiUtils-test.js +++ b/frontend-js/src/test/js/gui/leftPanel/GuiUtils-test.js @@ -1,6 +1,7 @@ "use strict"; require('../../mocha-config.js'); +var $ = require('jquery'); var Alias = require('../../../../main/js/map/data/Alias'); var Annotation = require('../../../../main/js/map/data/Annotation'); diff --git a/frontend-js/src/test/js/gui/leftPanel/OverlayPanel-test.js b/frontend-js/src/test/js/gui/leftPanel/OverlayPanel-test.js index b6a96eef7be975f94addc3e2ed6d2aeb60381def..690b906124bece411b8db6e68c6f9aeee2cc3d7c 100644 --- a/frontend-js/src/test/js/gui/leftPanel/OverlayPanel-test.js +++ b/frontend-js/src/test/js/gui/leftPanel/OverlayPanel-test.js @@ -1,6 +1,7 @@ "use strict"; require('../../mocha-config.js'); +var $ = require('jquery'); var OverlayPanel = require('../../../../main/js/gui/leftPanel/OverlayPanel'); var ServerConnector = require('../../ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/leftPanel/ProjectInfoPanel-test.js b/frontend-js/src/test/js/gui/leftPanel/ProjectInfoPanel-test.js index d293005b216cd89ff41a5bf504b78b3484bbc7c7..bcd0b4fc6285793765d86a35a1d46215ca2ac454 100644 --- a/frontend-js/src/test/js/gui/leftPanel/ProjectInfoPanel-test.js +++ b/frontend-js/src/test/js/gui/leftPanel/ProjectInfoPanel-test.js @@ -1,6 +1,7 @@ "use strict"; require('../../mocha-config.js'); +var $ = require('jquery'); var ProjectInfoPanel = require('../../../../main/js/gui/leftPanel/ProjectInfoPanel'); var ServerConnector = require('../../ServerConnector-mock'); diff --git a/frontend-js/src/test/js/gui/topMenu/TopMenu-test.js b/frontend-js/src/test/js/gui/topMenu/TopMenu-test.js index 90843d5592b0a5795a2e2c8697f352e5b531bc99..293f67200065ecdc4ee2d2b374c9df86173b7b23 100644 --- a/frontend-js/src/test/js/gui/topMenu/TopMenu-test.js +++ b/frontend-js/src/test/js/gui/topMenu/TopMenu-test.js @@ -3,6 +3,7 @@ /* exported logger */ require('../../mocha-config.js'); +var $ = require('jquery'); var Legend = require('../../../../main/js/gui/Legend'); var TopMenu = require('../../../../main/js/gui/topMenu/TopMenu'); diff --git a/frontend-js/src/test/js/helper.js b/frontend-js/src/test/js/helper.js index 8197e2fe6477ab66a7ea38dc2d98fd4b601517f5..526516795eecc7581dbcf185d6e89037c5574987 100644 --- a/frontend-js/src/test/js/helper.js +++ b/frontend-js/src/test/js/helper.js @@ -1,6 +1,7 @@ "use strict"; require("./mocha-config"); +var $ = require('jquery'); var logger = require('./logger'); diff --git a/frontend-js/src/test/js/map/CustomMap-test.js b/frontend-js/src/test/js/map/CustomMap-test.js index 28aa5f553d2d1166241491bda33b69c5a6824906..fbbc81db345f9c277c82116e3ad185648f58c1cb 100644 --- a/frontend-js/src/test/js/map/CustomMap-test.js +++ b/frontend-js/src/test/js/map/CustomMap-test.js @@ -3,6 +3,7 @@ var Promise = require("bluebird"); require("../mocha-config.js"); +var $ = require('jquery'); var AliasMarker = require('../../../main/js/map/marker/AliasMarker'); var AliasSurface = require('../../../main/js/map/surface/AliasSurface'); diff --git a/frontend-js/src/test/js/minerva-test.js b/frontend-js/src/test/js/minerva-test.js index 1813fcdf521814f47206013f917de841a8391428..6d5195461e81dee33bd1d47830db33b276860f1c 100644 --- a/frontend-js/src/test/js/minerva-test.js +++ b/frontend-js/src/test/js/minerva-test.js @@ -1,6 +1,7 @@ "use strict"; require("./mocha-config"); +var $ = require('jquery'); var Promise = require("bluebird");