[Test] Specify JS Globals

diff --git a/.eslintrc.json b/.eslintrc.json
index 2c32e16a7af2b679ff82f8d1ddf1fa8153f74094..32530cd18ec8eb70578e1c01cce0ad8168908c36 100644 (file)
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -3,6 +3,9 @@
         "browser": true
     },
     "extends": "eslint:all",
+    "globals": {
+        "define": false
+    },
     "rules": {
         "array-bracket-newline": ["error", "consistent"],
         "camelcase": "off",
@@ -76,7 +79,6 @@
         "no-param-reassign": "off",
         "no-redeclare": "off",
         "no-shadow": "off",
-        "no-undef": "off",
         "no-underscore-dangle": "off",
         "no-use-before-define": "off",
         "one-var-declaration-per-line": "off",

diff --git a/interface/js/app/config.js b/interface/js/app/config.js
index fe9d27a168b629a49888edca8465ac84f79cc521..a64e8f3ab1aeb065179434ef3fb745770c07b477 100644 (file)
--- a/interface/js/app/config.js
+++ b/interface/js/app/config.js
@@ -22,6 +22,8 @@
  THE SOFTWARE.
  */
 
+/* global $span:true, $tbody:true */
+
 define(["jquery"],
     function ($) {
         var interface = {};
@@ -240,7 +242,7 @@ define(["jquery"],
                     $("#modalTitle").html(item.uri);
                     $("#" + item.map).first().show();
                     $("#modalDialog .progress").hide();
-                    $("#modalDialog").modal(show = true, backdrop = true, keyboard = show);
+                    $("#modalDialog").modal({backdrop: true, keyboard: "show", show: true});
                     if (item.editable === false) {
                         $("#modalSave").hide();
                         $("#modalSaveAll").hide();

diff --git a/interface/js/app/graph.js b/interface/js/app/graph.js
index c5fba91b12f9b9f42cdb686d47a093abf0f66920..6a63500fc1befce860ae4b1b1a49267c1f8f7648 100644 (file)
--- a/interface/js/app/graph.js
+++ b/interface/js/app/graph.js
@@ -23,6 +23,8 @@
  THE SOFTWARE.
  */
 
+/* global d3:false */
+
 define(["jquery", "d3evolution", "footable"],
     function ($, D3Evolution) {
         var rrd_pie_config = {

diff --git a/interface/js/app/history.js b/interface/js/app/history.js
index be2471c57fbc67b39887b22b3b95decafd07e2b2..8147c39a1890b2846e52b8075c1f5a74dc98d2d9 100644 (file)
--- a/interface/js/app/history.js
+++ b/interface/js/app/history.js
@@ -22,6 +22,8 @@
  THE SOFTWARE.
  */
 
+/* global FooTable:false */
+
 define(["jquery", "footable", "humanize"],
     function ($, _, Humanize) {
         var interface = {};

diff --git a/interface/js/app/rspamd.js b/interface/js/app/rspamd.js
index 8f6bc412bfcde081acbc9b6a222dc5259c1a1fa1..b935cf6c2b188236126276cf3b7b0dc5d702e696 100644 (file)
--- a/interface/js/app/rspamd.js
+++ b/interface/js/app/rspamd.js
@@ -22,6 +22,9 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  */
+
+/* global jQuery:false, Visibility:false */
+
 define(["jquery", "d3pie", "visibility", "app/stats", "app/graph", "app/config",
     "app/symbols", "app/history", "app/upload"],
 function ($, d3pie, visibility, tab_stat, tab_graph, tab_config,

diff --git a/interface/js/app/symbols.js b/interface/js/app/symbols.js
index 358deb0e5dd9cde9356b1a943fac7af27284d0fa..a639127f4783388e91d70b8f93f8e50aab463c47 100644 (file)
--- a/interface/js/app/symbols.js
+++ b/interface/js/app/symbols.js
@@ -22,6 +22,8 @@
  THE SOFTWARE.
  */
 
+/* global FooTable:false */
+
 define(["jquery", "footable"],
     function ($) {
         var interface = {};

diff --git a/interface/js/main.js b/interface/js/main.js
index af7c63b8308f436f05f71e2cd2bf0fb05b4e01a9..51564566736c17bc82efe4ac85aff484a48a858f 100644 (file)
--- a/interface/js/main.js
+++ b/interface/js/main.js
@@ -1,3 +1,5 @@
+/* global d3:false, require:false, requirejs:false */ // eslint-disable-line no-unused-vars
+
 requirejs.config({
     baseUrl: "js/lib",
     paths: {
@@ -26,7 +28,7 @@ document.title = window.location.hostname +
     " - Rspamd Web Interface";
 
 define("d3.global", ["d3"], function (_) {
-    d3 = _;
+    d3 = _; // eslint-disable-line no-global-assign
 });
 
 // Load main UI