diff --git a/.eslintrc.json b/.eslintrc.json index 7d3808c4f5e..5559ce5b6e8 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,6 @@ { "extends": "./Tools/eslint-config-cesium/browser.js", "rules": { - "no-unused-vars": ["error", {"vars": "all", "args": "none"}], - "quotes": ["error", "single", {"avoidEscape": true}] + "no-unused-vars": ["error", {"vars": "all", "args": "none"}] } } diff --git a/Source/Scene/BoxEmitter.js b/Source/Scene/BoxEmitter.js index f92aea0a76b..02f91c866a0 100644 --- a/Source/Scene/BoxEmitter.js +++ b/Source/Scene/BoxEmitter.js @@ -11,7 +11,7 @@ define([ Cartesian3, Check, CesiumMath) { - "use strict"; + 'use strict'; var defaultDimensions = new Cartesian3(1.0, 1.0, 1.0); diff --git a/Source/Scene/CircleEmitter.js b/Source/Scene/CircleEmitter.js index d7a5eb99e89..77614e4af0b 100644 --- a/Source/Scene/CircleEmitter.js +++ b/Source/Scene/CircleEmitter.js @@ -11,7 +11,7 @@ define([ Cartesian3, Check, CesiumMath) { - "use strict"; + 'use strict'; /** * A ParticleEmitter that emits particles from a circle. diff --git a/Source/Scene/ConeEmitter.js b/Source/Scene/ConeEmitter.js index c6a8b62b2b4..21201b4dda4 100644 --- a/Source/Scene/ConeEmitter.js +++ b/Source/Scene/ConeEmitter.js @@ -11,7 +11,7 @@ define([ Cartesian3, Check, CesiumMath) { - "use strict"; + 'use strict'; var defaultAngle = CesiumMath.toRadians(30.0); diff --git a/Source/Scene/Expression.js b/Source/Scene/Expression.js index d00383c5b9b..860e9a88706 100644 --- a/Source/Scene/Expression.js +++ b/Source/Scene/Expression.js @@ -476,7 +476,7 @@ define([ if (j < 0) { throw new RuntimeError('Unmatched {.'); } - result += "czm_" + exp.substr(i + 2, j - (i + 2)); + result += 'czm_' + exp.substr(i + 2, j - (i + 2)); exp = exp.substr(j + 1); i = exp.indexOf('${'); } diff --git a/Source/Scene/Particle.js b/Source/Scene/Particle.js index ef66eb26ee5..1aae2cb4de5 100644 --- a/Source/Scene/Particle.js +++ b/Source/Scene/Particle.js @@ -13,7 +13,7 @@ define([ Cartesian2, Cartesian3, Color) { - "use strict"; + 'use strict'; var defaultSize = new Cartesian2(1.0, 1.0); diff --git a/Source/Scene/ParticleSystem.js b/Source/Scene/ParticleSystem.js index 4b99d32ad28..3571a28b135 100644 --- a/Source/Scene/ParticleSystem.js +++ b/Source/Scene/ParticleSystem.js @@ -31,7 +31,7 @@ define([ BillboardCollection, Particle, CircleEmitter) { - "use strict"; + 'use strict'; /** * A ParticleSystem manages the updating and display of a collection of particles. diff --git a/Source/Scene/SphereEmitter.js b/Source/Scene/SphereEmitter.js index 4b97c720b41..23c0bb86eea 100644 --- a/Source/Scene/SphereEmitter.js +++ b/Source/Scene/SphereEmitter.js @@ -11,7 +11,7 @@ define([ Cartesian3, Check, CesiumMath) { - "use strict"; + 'use strict'; /** * A ParticleEmitter that emits particles within a sphere. diff --git a/Tools/eslint-config-cesium/CHANGES.md b/Tools/eslint-config-cesium/CHANGES.md index f1fd366c54a..20f22f07fe2 100644 --- a/Tools/eslint-config-cesium/CHANGES.md +++ b/Tools/eslint-config-cesium/CHANGES.md @@ -10,6 +10,7 @@ Change Log * Enable [no-loop-func](http://eslint.org/docs/rules/no-loop-func). * Enable [no-undef-init](http://eslint.org/docs/rules/no-undef-init). * Enable [no-implicit-globals](http://eslint.org/docs/rules/no-implicit-globals). +* Enable [quotes](http://eslint.org/docs/rules/quotes) to enforce use of single quotes. ### 1.0.0 - 2017-06-12 diff --git a/Tools/eslint-config-cesium/index.js b/Tools/eslint-config-cesium/index.js index eb577bb9c26..1f5cc8a981b 100644 --- a/Tools/eslint-config-cesium/index.js +++ b/Tools/eslint-config-cesium/index.js @@ -36,6 +36,7 @@ module.exports = { 'no-unused-vars': ['error', {vars: 'all', args: 'all'}], 'no-useless-escape': 'off', 'no-use-before-define': ['error', 'nofunc'], + 'quotes': ['error', 'single', {avoidEscape: true}], semi: 'error', strict: 'error', 'wrap-iife': ['error', 'any'] diff --git a/index.release.html b/index.release.html index 4c1f2a88106..18c112f0653 100644 --- a/index.release.html +++ b/index.release.html @@ -106,7 +106,7 @@