Merge 212670e into 3101faa

terrestris · Jun 24, 2019 · cdb1a3a · cdb1a3a
2 parents 3101faa + 212670e
commit cdb1a3a
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 49 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,17 +1,17 @@
 {
-  "globals":{
-    "BasiGX":false,
-    "Ext":false,
-    "GeoExt":false,
+  "globals": {
+    "BasiGX": false,
+    "Ext": false,
+    "GeoExt": false,
     "MutationObserver": false,
-    "ol":false,
+    "ol": false,
     "proj4": false,
-    "window":false,
-    "document":false,
+    "window": false,
+    "document": false,
     "DOMParser": false,
-    "btoa":false,
-    "atob":false,
-    "Blob":false,
+    "btoa": false,
+    "atob": false,
+    "Blob": false,
     "Jsonix": false,
     "SLD_1_0_0": false,
     "Filter_1_0_0": false,
@@ -20,41 +20,42 @@
     "opentype": false,
     "shpwrite": false,
     "Uint8Array": false,
-    "FileReader": false
+    "FileReader": false,
+    "jsts": false
   },
-  "rules":{
-    "consistent-this":[
+  "rules": {
+    "consistent-this": [
       1,
       "me"
     ],
-    "indent":[
+    "indent": [
       1,
       4,
       {
-        "VariableDeclarator":1,
-        "SwitchCase":1
+        "VariableDeclarator": 1,
+        "SwitchCase": 1
       }
     ],
-    "max-len":[
+    "max-len": [
       2,
       80,
       4
     ],
-    "one-var":[
+    "one-var": [
       2,
       "never"
     ],
-    "quote-props":[
+    "quote-props": [
       1,
       "consistent"
     ],
-    "valid-jsdoc":[
+    "valid-jsdoc": [
       2,
       {
-        "prefer":{
-          "returns":"return"
+        "prefer": {
+          "returns": "return"
         },
-        "requireReturn":false
+        "requireReturn": false
       }
     ],
     "comma-dangle": 2,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "devDependencies": {
         "copyfiles": "2.1.0",
         "coveralls": "3.0.4",
-        "eslint": "5.16.0",
+        "eslint": "6.0.0",
         "expect.js": "0.3.1",
         "istanbul": "0.4.5",
         "karma": "4.1.0",

diff --git a/src/util/Url.js b/src/util/Url.js
@@ -1,4 +1,3 @@
-/*global Ext, window*/
 /* Copyright (c) 2015-present terrestris GmbH & Co. KG
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/src/ux/ContextSensitiveHelp.js b/src/ux/ContextSensitiveHelp.js
@@ -1,4 +1,3 @@
-/*global Ext, window, document*/
 /* Copyright (C) 2011-present terrestris GmbH & Co. KG
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/src/view/button/SpatialOperatorDifference.js b/src/view/button/SpatialOperatorDifference.js
@@ -1,4 +1,3 @@
-/* global jsts*/
 /* Copyright (c) 2018-present terrestris GmbH & Co. KG
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/src/view/button/SpatialOperatorIntersect.js b/src/view/button/SpatialOperatorIntersect.js
@@ -1,4 +1,3 @@
-/* global jsts*/
 /* Copyright (c) 2018-present terrestris GmbH & Co. KG
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/src/view/button/SpatialOperatorUnion.js b/src/view/button/SpatialOperatorUnion.js
@@ -1,4 +1,3 @@
-/* global jsts*/
 /* Copyright (c) 2018-present terrestris GmbH & Co. KG
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/src/view/form/CsvImport.js b/src/view/form/CsvImport.js
@@ -1,4 +1,3 @@
-/*global FileReader*/
 /* Copyright (c) 2015-present terrestris GmbH & Co. KG
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/test/load-tests.js b/test/load-tests.js
@@ -1,4 +1,3 @@
-/*global document*/
 // This file is taken from GeoExt3
 (function() {
     Ext.Loader.setConfig({