jquery dependency added where necessary

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",

frontend-js/src/main/js/Admin.js

 "use strict";
 
 /* exported logger */
+var $ = require('jquery');
 
 var Promise = require("bluebird");
 

frontend-js/src/main/js/Configuration.js

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

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;

frontend-js/src/main/js/GuiConnector.js

 "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

frontend-js/src/main/js/gui/AbstractGuiElement.js

 "use strict";
 
 /* exported logger */
+var $ = require('jquery');
 
 var ObjectWithListeners = require('../ObjectWithListeners');
 var PanelControlElementType = require('./PanelControlElementType');

frontend-js/src/main/js/gui/AddOverlayDialog.js

 "use strict";
 
 /* exported logger */
+var $ = require('jquery');
 
 var AbstractGuiElement = require('./AbstractGuiElement');
 var GuiConnector = require('../GuiConnector');

frontend-js/src/main/js/gui/CommentDialog.js

 "use strict";
 
+var $ = require('jquery');
+
 /* exported logger */
 
 var Promise = require("bluebird");

frontend-js/src/main/js/gui/ContextMenu.js

 "use strict";
 
+var $ = require('jquery');
+
 /* exported logger */
 
 var AbstractGuiElement = require('./AbstractGuiElement');

frontend-js/src/main/js/gui/Header.js

 "use strict";
 
 /* exported logger */
+var $ = require('jquery');
 
 var AbstractGuiElement = require('./AbstractGuiElement');
 var PanelControlElementType = require('./PanelControlElementType');

frontend-js/src/main/js/gui/Legend.js

 "use strict";
 
+var $ = require('jquery');
 var AbstractGuiElement = require('./AbstractGuiElement');
 var ConfigurationType = require('../ConfigurationType');
 var Functions = require('../Functions');

frontend-js/src/main/js/gui/LoginDialog.js

 "use strict";
 
 /* exported logger */
+var $ = require('jquery');
 
 var AbstractGuiElement = require('./AbstractGuiElement');
 var GuiConnector = require('../GuiConnector');

frontend-js/src/main/js/gui/OverviewDialog.js

 "use strict";
 
 /* exported logger */
+var $ = require('jquery');
 
 var AbstractGuiElement = require('./AbstractGuiElement');
 var GuiConnector = require('../GuiConnector');

frontend-js/src/main/js/gui/Panel.js

 "use strict";
 
 /* exported logger */
+var $ = require('jquery');
 
 var GuiConnector = require('../GuiConnector');
 var AbstractGuiElement = require('./AbstractGuiElement');

frontend-js/src/main/js/gui/PluginDialog.js

 "use strict";
+
+var $ = require('jquery');
 var AbstractGuiElement = require('./AbstractGuiElement');
 var GuiConnector = require('../GuiConnector');
 var GuiUtils = require('./leftPanel/GuiUtils');

frontend-js/src/main/js/gui/SubMenu.js

 "use strict";
 
+var $ = require('jquery');
+
 /* exported logger */
 
 var AbstractGuiElement = require('./AbstractGuiElement');

frontend-js/src/main/js/gui/admin/AddPluginDialog.js

 "use strict";
 
 var Promise = require("bluebird");
+var $ = require('jquery');
 
 var AbstractGuiElement = require('../AbstractGuiElement');
 var GuiConnector = require('../../GuiConnector');

frontend-js/src/main/js/gui/admin/AddProjectDialog.js

 "use strict";
 
+var $ = require('jquery');
 var Promise = require("bluebird");
 var JSZip = require("jszip");
 var xss = require('xss');

frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js

 "use strict";
 
 /* exported logger */
+var $ = require('jquery');
 
 var AbstractAnnotatorsDialog = require('./AbstractAnnotatorsDialog');
 var Annotator = require("../../map/data/Annotator");

frontend-js/src/main/js/gui/admin/ChooseValidatorsDialog.js

 "use strict";
 
 /* exported logger */
+var $ = require('jquery');
+require('jquery-ui/dialog');
+require('jstree');
 
 var AbstractAnnotatorsDialog = require('./AbstractAnnotatorsDialog');
 var GuiConnector = require("../../GuiConnector");