Merge pull request #7809 from AnalyticalGraphicsInc/eslint-updates

eslint configuration updates and fixes
CesiumGS · May 3, 2019 · a35f010 · a35f010
2 parents 284b70b + 8034629
commit a35f010
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 28 deletions.
diff --git a/Apps/Sandcastle/gallery/Imagery Layers Split.html b/Apps/Sandcastle/gallery/Imagery Layers Split.html
@@ -69,31 +69,31 @@
 var moveActive = false;
 
 function move(movement) {
-	if(!moveActive) {
-		return;
-	}
-
-	var relativeOffset = movement.endPosition.x ;
-	var splitPosition = (slider.offsetLeft + relativeOffset) / slider.parentElement.offsetWidth;
-	slider.style.left = 100.0 * splitPosition + '%';
-	viewer.scene.imagerySplitPosition = splitPosition;
+    if(!moveActive) {
+        return;
+    }
+
+    var relativeOffset = movement.endPosition.x ;
+    var splitPosition = (slider.offsetLeft + relativeOffset) / slider.parentElement.offsetWidth;
+    slider.style.left = 100.0 * splitPosition + '%';
+    viewer.scene.imagerySplitPosition = splitPosition;
 }
 
 handler.setInputAction(function() {
-	moveActive = true;
+    moveActive = true;
 }, Cesium.ScreenSpaceEventType.LEFT_DOWN);
 handler.setInputAction(function() {
-	moveActive = true;
+    moveActive = true;
 }, Cesium.ScreenSpaceEventType.PINCH_START);
 
 handler.setInputAction(move, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
 handler.setInputAction(move, Cesium.ScreenSpaceEventType.PINCH_MOVE);
 
 handler.setInputAction(function() {
-	moveActive = false;
+    moveActive = false;
 }, Cesium.ScreenSpaceEventType.LEFT_UP);
 handler.setInputAction(function() {
-	moveActive = false;
+    moveActive = false;
 }, Cesium.ScreenSpaceEventType.PINCH_END);
 
 //Sandcastle_End

diff --git a/Source/Scene/Vector3DTilePolygons.js b/Source/Scene/Vector3DTilePolygons.js
@@ -285,8 +285,8 @@ define([
             var minimumHeights = polygons._polygonMinimumHeights;
             var maximumHeights = polygons._polygonMaximumHeights;
             if (defined(minimumHeights) && defined(maximumHeights)) {
-				minimumHeights = arraySlice(minimumHeights);
-				maximumHeights = arraySlice(maximumHeights);
+                minimumHeights = arraySlice(minimumHeights);
+                maximumHeights = arraySlice(maximumHeights);
 
                 transferrableObjects.push(minimumHeights.buffer, maximumHeights.buffer);
                 parameters.minimumHeights = minimumHeights;

diff --git a/Specs/DataSources/KmlDataSourceSpec.js b/Specs/DataSources/KmlDataSourceSpec.js
@@ -3866,16 +3866,16 @@ defineSuite([
         });
     });
 
-	it('can load styles from a KML file with namespaces', function() {
-		return KmlDataSource.load('Data/KML/namespaced.kml', options).then(function(dataSource) {
-			console.debug(dataSource.entities.values[2]);
-			var polyline = dataSource.entities.values[2].polyline;
-			var expectedColor = Color.fromBytes(0xff, 0x00, 0xff, 0x00);
-			var polylineColor = polyline.material.color.getValue();
-			expect(polylineColor).toEqual(expectedColor);
-			expect(polyline.width.getValue()).toEqual(10);
-		});
-	});
+    it('can load styles from a KML file with namespaces', function() {
+        return KmlDataSource.load('Data/KML/namespaced.kml', options).then(function(dataSource) {
+            console.debug(dataSource.entities.values[2]);
+            var polyline = dataSource.entities.values[2].polyline;
+            var expectedColor = Color.fromBytes(0xff, 0x00, 0xff, 0x00);
+            var polylineColor = polyline.material.color.getValue();
+            expect(polylineColor).toEqual(expectedColor);
+            expect(polyline.width.getValue()).toEqual(10);
+        });
+    });
 
     it('Boolean values can use true string', function() {
         var kml = '<?xml version="1.0" encoding="UTF-8"?>\
@@ -3960,7 +3960,7 @@ defineSuite([
         return KmlDataSource.load(parser.parseFromString(kml, 'text/xml'), options).then(function(dataSource) {
             expect(dataSource.entities.values.length).toEqual(1);
             expect(console.warn.calls.count()).toEqual(1);
-			expect(console.warn).toHaveBeenCalledWith('KML - Unsupported Icon refreshMode: onInterval');
+            expect(console.warn).toHaveBeenCalledWith('KML - Unsupported Icon refreshMode: onInterval');
         });
     });
 

diff --git a/Specs/customizeJasmine.js b/Specs/customizeJasmine.js
@@ -31,7 +31,7 @@ define([
             define(deps, function() {
                 var args = arguments;
                 if (focus) {
-                    fdescribe(name, function() {
+                    fdescribe(name, function() { //eslint-disable-line
                         suite.apply(null, args);
                     }, categories);
                 } else {

diff --git a/Tools/eslint-config-cesium/CHANGES.md b/Tools/eslint-config-cesium/CHANGES.md
@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+### 7.0.0 - 2019-05-03
+* Update Node ecmaVersion to '2019'.
+* Enable [no-tabs](https://eslint.org/docs/rules/no-tabs).
+* Enabled [no-restricted-globals](https://eslint.org/docs/rules/no-restricted-globals) for jasmine `fit` and `fdescribe`.
+
 ### 6.0.1 - 2019-01-23
 * Allow ES6 global variables in Node.js code.
 

diff --git a/Tools/eslint-config-cesium/index.js b/Tools/eslint-config-cesium/index.js
@@ -37,9 +37,11 @@ module.exports = {
         'no-multiple-empty-lines': ['error', { max: 1, maxEOF: 1 }],
         'no-new': 'error',
         'no-sequences': 'error',
+        'no-tabs': 'error',
         'no-trailing-spaces': 'error',
         'no-undef': 'error',
         'no-undef-init': 'error',
+        'no-restricted-globals': ["error", "fdescribe", "fit"],
         'no-unused-expressions': 'error',
         'no-unused-vars': ['error', {vars: 'all', args: 'all'}],
         'no-useless-escape': 'off',

diff --git a/Tools/eslint-config-cesium/node.js b/Tools/eslint-config-cesium/node.js
@@ -7,7 +7,7 @@ module.exports = {
         es6: true
     },
     parserOptions: {
-        ecmaVersion: 2017
+        ecmaVersion: 2019
     },
     rules: {
         'global-require': 'error',

diff --git a/Tools/eslint-config-cesium/package.json b/Tools/eslint-config-cesium/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-cesium",
-  "version": "6.0.1",
+  "version": "7.0.0",
   "description": "ESLint shareable configs for Cesium",
   "homepage": "http://cesiumjs.org",
   "license": "Apache-2.0",