eslint rule for use strict in modules has changed so we don't need …

…it any more. also a few cases of enforcing consistent returns.
cmv · Apr 5, 2016 · b125888 · b125888
1 parent 4ab37f7
commit b125888
Show file tree

Hide file tree

Showing 50 changed files with 18 additions and 61 deletions.
diff --git a/viewer/js/config/app.js b/viewer/js/config/app.js
@@ -1,5 +1,4 @@
 (function () {
-    'use strict';
     var path = location.pathname.replace(/[^\/]+$/, '');
     window.dojoConfig = {
         async: true,

diff --git a/viewer/js/config/basemaps.js b/viewer/js/config/basemaps.js
@@ -2,7 +2,6 @@ define([
     //'esri/dijit/Basemap',
     //'esri/dijit/BasemapLayer'
 ], function (/* Basemap, BasemapLayer */) {
-    'use strict';
 
     return {
         map: true, // needs a reference to the map

diff --git a/viewer/js/config/find.js b/viewer/js/config/find.js
@@ -1,4 +1,4 @@
-/*eslint strict: 0, no-console: 0, no-alert: 0*/
+/*eslint no-console: 0, no-alert: 0*/
 define({
     map: true,
     zoomExtentFactor: 2,

diff --git a/viewer/js/config/viewer.js b/viewer/js/config/viewer.js
@@ -6,7 +6,6 @@ define([
     'esri/tasks/GeometryService',
     'esri/layers/ImageParameters'
 ], function (units, Extent, esriConfig, /*urlUtils,*/ GeometryService, ImageParameters) {
-    'use strict';
 
     // url to your proxy page, must be on same machine hosting you app. See proxy folder for readme.
     esriConfig.defaults.io.proxyUrl = 'proxy/proxy.ashx';

diff --git a/viewer/js/gis/dijit/Basemaps.js b/viewer/js/gis/dijit/Basemaps.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dijit/_WidgetBase',

diff --git a/viewer/js/gis/dijit/Bookmarks.js b/viewer/js/gis/dijit/Bookmarks.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dijit/_WidgetBase',

diff --git a/viewer/js/gis/dijit/Directions.js b/viewer/js/gis/dijit/Directions.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dijit/_WidgetBase',

diff --git a/viewer/js/gis/dijit/Draw.js b/viewer/js/gis/dijit/Draw.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dijit/_WidgetBase',
@@ -216,7 +215,6 @@ define([
             } else {
                 return false;
             }
-            return false;
 
         },
         onLayoutChange: function (open) {

diff --git a/viewer/js/gis/dijit/Editor.js b/viewer/js/gis/dijit/Editor.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dijit/_WidgetBase',

diff --git a/viewer/js/gis/dijit/Find.js b/viewer/js/gis/dijit/Find.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dijit/_WidgetBase',

diff --git a/viewer/js/gis/dijit/FloatingTitlePane.js b/viewer/js/gis/dijit/FloatingTitlePane.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dijit/TitlePane',

diff --git a/viewer/js/gis/dijit/FloatingWidgetDialog.js b/viewer/js/gis/dijit/FloatingWidgetDialog.js
@@ -2,7 +2,6 @@ define([
     'dojo/_base/declare',
     'dijit/Dialog'
 ], function (declare, Dialog) {
-    'use strict';
 
     return declare([Dialog], {
         declaredClass: 'gis.dijit.FloatingWidget',

diff --git a/viewer/js/gis/dijit/Geocoder.js b/viewer/js/gis/dijit/Geocoder.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 // adapted from https://github.com/esri/arcgis-dijit-geocoder-button-js/
 define([
     'dojo/_base/declare',

diff --git a/viewer/js/gis/dijit/Growler.js b/viewer/js/gis/dijit/Growler.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dijit/_WidgetBase',

diff --git a/viewer/js/gis/dijit/Help.js b/viewer/js/gis/dijit/Help.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dijit/_WidgetBase',

diff --git a/viewer/js/gis/dijit/Identify.js b/viewer/js/gis/dijit/Identify.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dijit/_WidgetBase',

diff --git a/viewer/js/gis/dijit/LayerControl.js b/viewer/js/gis/dijit/LayerControl.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dojo/_base/array',
@@ -181,7 +180,7 @@ define([
             this._vectorContainer.getChildren().filter(function (c) {
                 return _filterList(c);
             })).concat(
-            this.getChildren().filter(function (c) { 
+            this.getChildren().filter(function (c) {
                 return _filterList(c);
             }));
             // follow the same logic as when the layers were added
@@ -237,10 +236,10 @@ define([
         _applyLayerControlOptions: function (controlOptions, layer) {
             if (typeof controlOptions.includeUnspecifiedLayers === 'undefined' && typeof controlOptions.subLayerInfos === 'undefined' && typeof controlOptions.excludedLayers === 'undefined') {
                 return;
-            }			
+            }
             var esriLayerInfos = [];
             // Case 1: only show the layers that are explicitly listed
-            if (!controlOptions.includeUnspecifiedLayers && controlOptions.subLayerInfos && controlOptions.subLayerInfos.length !== 0) {            
+            if (!controlOptions.includeUnspecifiedLayers && controlOptions.subLayerInfos && controlOptions.subLayerInfos.length !== 0) {
                 var subLayerInfos = array.map(controlOptions.subLayerInfos, function (sli) {
                     return sli.id;
                 });
@@ -276,7 +275,7 @@ define([
             }), function (l) {
                 return l.id;
             });
-            layer.setVisibleLayers(visibleIds);  
+            layer.setVisibleLayers(visibleIds);
         },
         _mixinLayerInfos: function (esriLayerInfos, subLayerInfos) {
             // for each of the sublayers, go through the subLayerInfos from the controlOptions and see if defaultVisiblity is set to true or false

diff --git a/viewer/js/gis/dijit/LayerControl/controls/CSV.js b/viewer/js/gis/dijit/LayerControl/controls/CSV.js
@@ -13,7 +13,6 @@ define([
     _Control,
     legendUtil
 ) {
-    'use strict';
 
     var CSVControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'vector', // constant

diff --git a/viewer/js/gis/dijit/LayerControl/controls/Dynamic.js b/viewer/js/gis/dijit/LayerControl/controls/Dynamic.js
@@ -39,7 +39,6 @@ define([
     legendUtil,
     i18n
 ) {
-    'use strict';
 
     var DynamicControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'overlay', // constant
@@ -100,8 +99,8 @@ define([
         _createSublayers: function (layer) {
             // check for single sublayer - if so no sublayer/folder controls
             if (layer.layerInfos.length > 1) {
-                var allLayers = array.map(layer.layerInfos, function (l) { 
-                    return l.id; 
+                var allLayers = array.map(layer.layerInfos, function (l) {
+                    return l.id;
                 });
                 array.forEach(layer.layerInfos, lang.hitch(this, function (info) {
                     // see if there was any override needed from the subLayerInfos array in the controlOptions
@@ -113,7 +112,7 @@ define([
                         slids = info.subLayerIds,
                         controlId = layer.id + '-' + info.id + '-sublayer-control',
                         control;
-                    // it's a top level 
+                    // it's a top level
                     if (pid === -1 || allLayers.indexOf(pid) === -1) {
                         if (slids === null) {
                             // it's a top level sublayer

diff --git a/viewer/js/gis/dijit/LayerControl/controls/Feature.js b/viewer/js/gis/dijit/LayerControl/controls/Feature.js
@@ -13,7 +13,6 @@ define([
     _Control,
     legendUtil
 ) {
-    'use strict';
 
     var FeatureControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'vector', // constant

diff --git a/viewer/js/gis/dijit/LayerControl/controls/GeoRSS.js b/viewer/js/gis/dijit/LayerControl/controls/GeoRSS.js
@@ -11,7 +11,6 @@ define([
     _Contained,
     _Control
 ) {
-    'use strict';
 
     var GeoRSSControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'vector', // constant

diff --git a/viewer/js/gis/dijit/LayerControl/controls/Image.js b/viewer/js/gis/dijit/LayerControl/controls/Image.js
@@ -13,7 +13,6 @@ define([
     _Control,
     legendUtil
 ) {
-    'use strict';
 
     var ImageControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'overlay', // constant

diff --git a/viewer/js/gis/dijit/LayerControl/controls/ImageVector.js b/viewer/js/gis/dijit/LayerControl/controls/ImageVector.js
@@ -13,7 +13,6 @@ define([
     _Control,
     legendUtil
 ) {
-    'use strict';
 
     var ImageVectorControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'overlay', // constant

diff --git a/viewer/js/gis/dijit/LayerControl/controls/KML.js b/viewer/js/gis/dijit/LayerControl/controls/KML.js
@@ -13,7 +13,6 @@ define([
     _Control,
     legendUtil
 ) {
-    'use strict';
 
     var KMLControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'vector', // constant

diff --git a/viewer/js/gis/dijit/LayerControl/controls/Raster.js b/viewer/js/gis/dijit/LayerControl/controls/Raster.js
@@ -11,7 +11,6 @@ define([
     _Contained,
     _Control
 ) {
-    'use strict';
 
     var RasterControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'overlay', // constant

diff --git a/viewer/js/gis/dijit/LayerControl/controls/Stream.js b/viewer/js/gis/dijit/LayerControl/controls/Stream.js
@@ -13,7 +13,6 @@ define([
     _Control,
     legendUtil
 ) {
-    'use strict';
 
     var StreamControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'overlay', // constant

diff --git a/viewer/js/gis/dijit/LayerControl/controls/Tiled.js b/viewer/js/gis/dijit/LayerControl/controls/Tiled.js
@@ -13,7 +13,6 @@ define([
     _Control,
     legendUtil
 ) {
-    'use strict';
 
     var TiledControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'overlay', // constant

diff --git a/viewer/js/gis/dijit/LayerControl/controls/VectorTile.js b/viewer/js/gis/dijit/LayerControl/controls/VectorTile.js
@@ -11,7 +11,6 @@ define([
     _Contained,
     _Control
 ) {
-    'use strict';
 
     var VectorTileControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'overlay', // constant

diff --git a/viewer/js/gis/dijit/LayerControl/controls/WFS.js b/viewer/js/gis/dijit/LayerControl/controls/WFS.js
@@ -12,7 +12,6 @@ define([
     _Contained,
     _Control
 ) {
-    'use strict';
 
     var WFSControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'vector', // constant

diff --git a/viewer/js/gis/dijit/LayerControl/controls/WMS.js b/viewer/js/gis/dijit/LayerControl/controls/WMS.js
@@ -11,7 +11,6 @@ define([
     _Contained,
     _Control
 ) {
-    'use strict';
 
     var WMSControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'overlay', // constant

diff --git a/viewer/js/gis/dijit/LayerControl/controls/WebTiled.js b/viewer/js/gis/dijit/LayerControl/controls/WebTiled.js
@@ -11,7 +11,6 @@ define([
     _Contained,
     _Control
 ) {
-    'use strict';
 
     var WebTiledControl = declare([_WidgetBase, _TemplatedMixin, _Contained, _Control], {
         _layerType: 'overlay', // constant

diff --git a/viewer/js/gis/dijit/LayerControl/controls/_Control.js b/viewer/js/gis/dijit/LayerControl/controls/_Control.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dojo/_base/lang',

diff --git a/viewer/js/gis/dijit/LayerControl/controls/_DynamicFolder.js b/viewer/js/gis/dijit/LayerControl/controls/_DynamicFolder.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dojo/_base/lang',
@@ -119,8 +118,8 @@ define([
         },
         destroy: function () {
             this.inherited(arguments);
-            this._handlers.forEach(function (h) { 
-                h.remove(); 
+            this._handlers.forEach(function (h) {
+                h.remove();
             });
         }
     });

diff --git a/viewer/js/gis/dijit/LayerControl/controls/_DynamicSublayer.js b/viewer/js/gis/dijit/LayerControl/controls/_DynamicSublayer.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dojo/_base/lang',

diff --git a/viewer/js/gis/dijit/LayerControl/plugins/LayerMenu.js b/viewer/js/gis/dijit/LayerControl/plugins/LayerMenu.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dijit/Menu',

diff --git a/viewer/js/gis/dijit/LayerControl/plugins/Transparency.js b/viewer/js/gis/dijit/LayerControl/plugins/Transparency.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 /* transparency component */
 define([
     'dojo/_base/declare',

diff --git a/viewer/js/gis/dijit/LayerControl/plugins/legendUtil.js b/viewer/js/gis/dijit/LayerControl/plugins/legendUtil.js
@@ -31,7 +31,6 @@ define([
     esriBundle,
     i18n
 ) {
-    'use strict';
 
     esriBundle.widgets.legend.NLS_noLegend = i18n.noLegend;
 
@@ -55,6 +54,7 @@ define([
                     return false;
                 }
             }
+            return false;
         },
         // request legend json
         _legendRequest: function (layer, expandNode, callback, errback) {
@@ -335,8 +335,9 @@ define([
                         param.push(e);
                     }
                 }, this);
-                return JSON.stringify(param);                
+                return JSON.stringify(param);
             }
+            return null;
         }
     };
 });
diff --git a/viewer/js/gis/dijit/LocateButton.js b/viewer/js/gis/dijit/LocateButton.js
@@ -8,7 +8,6 @@ define([
     'esri/InfoTemplate',
     'dojo/topic'
 ], function (declare, lang, LocateButton, SimpleRenderer, PictureMarkerSymbol, GraphicsLayer, InfoTemplate, topic) {
-    'use strict';
 
     return declare(null, {
         growlTemplate: 'latitude: {latitude}<br/>longitude: {longitude}<br/>accuracy: {accuracy}<br/>altitude: {altitude}<br/>altitude accuracy: {altitudeAccuracy}<br/>heading: {heading}<br/>speed: {speed}',

diff --git a/viewer/js/gis/dijit/MapInfo.js b/viewer/js/gis/dijit/MapInfo.js
@@ -23,7 +23,7 @@ define([
     topic,
     proj4
 ) {
-    'use strict';
+
     return declare([WidgetBase, TemplatedMixin], {
         map: null,
         mode: 'map',

diff --git a/viewer/js/gis/dijit/Measurement.js b/viewer/js/gis/dijit/Measurement.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dijit/_WidgetBase',

diff --git a/viewer/js/gis/dijit/Print.js b/viewer/js/gis/dijit/Print.js
@@ -1,4 +1,4 @@
-/*eslint strict: 0, no-eval: 0 */
+/*eslint no-eval: 0 */
 define([
     'dojo/_base/declare',
     'dijit/_WidgetBase',

diff --git a/viewer/js/gis/dijit/StreetView.js b/viewer/js/gis/dijit/StreetView.js
@@ -1,5 +1,4 @@
 /*global google */
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dijit/_WidgetBase',

diff --git a/viewer/js/gis/dijit/Vim.js b/viewer/js/gis/dijit/Vim.js
@@ -13,7 +13,6 @@ define([
     'dojo/_base/unload',
     'dojo/_base/lang'
 ], function (declare, kernel, cookie, JSON, baseUnload, lang) {
-    'use strict';
 
     return declare(null, {
         constructor: function (idStateName) {

diff --git a/viewer/js/gis/dijit/_FloatingWidgetMixin.js b/viewer/js/gis/dijit/_FloatingWidgetMixin.js
@@ -1,4 +1,3 @@
-/*eslint strict: 0*/
 define([
     'dojo/_base/declare',
     'dojo/on',

diff --git a/viewer/js/gis/plugins/async.js b/viewer/js/gis/plugins/async.js
@@ -1,5 +1,4 @@
 define(function () {
-    'use strict';
 
     var cb = '_asyncApiLoaderCallback';
     return {

diff --git a/viewer/js/viewer/_ConfigMixin.js b/viewer/js/viewer/_ConfigMixin.js
@@ -7,7 +7,6 @@ define([
     lang,
     Deferred
 ) {
-    'use strict';
 
     return declare(null, {
 

diff --git a/viewer/js/viewer/_ControllerBase.js b/viewer/js/viewer/_ControllerBase.js
@@ -1,4 +1,4 @@
-/*eslint strict: 0, no-console: 0*/
+/*eslint no-console: 0*/
 define([
     'dojo/_base/declare',
     'dojo/_base/lang'