fix lint errors

cmv · Feb 1, 2017 · f3cf778 · f3cf778
1 parent 50cc823
commit f3cf778
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/viewer/js/config/app.js b/viewer/js/config/app.js
@@ -31,9 +31,9 @@
         'viewer/_ConfigMixin', // manage the Configuration
         'viewer/_LayoutMixin', // build and manage the Page Layout and User Interface
         'viewer/_MapMixin', // build and manage the Map
-        'viewer/_WidgetsMixin', // build and manage the Widgets
+        'viewer/_WidgetsMixin' // build and manage the Widgets
 
-        'viewer/_WebMapMixin' // for WebMaps
+        // 'viewer/_WebMapMixin' // for WebMaps
         //'config/_customMixin'
 
     ], function (
@@ -43,9 +43,9 @@
         _ConfigMixin,
         _LayoutMixin,
         _MapMixin,
-        _WidgetsMixin,
+        _WidgetsMixin
 
-        _WebMapMixin
+        // _WebMapMixin
         //_MyCustomMixin
 
     ) {

diff --git a/viewer/js/viewer/_MapMixin.js b/viewer/js/viewer/_MapMixin.js
@@ -55,7 +55,6 @@ define([
             }
 
             // otherwise we can create the map
-            var returnWarnings = [];
             var mapDeferred = new Deferred(),
                 container = dom.byId(this.config.layout.map) || 'mapCenter';
 
@@ -64,7 +63,7 @@ define([
             // let some other mixins modify or add map items async
             var wait = this.inherited(arguments);
             if (wait) {
-                wait.then(function (warnings) {
+                wait.then(function () {
                     // are warnings passed?
                     // returnWarnings.push(warnings);
                     mapDeferred.resolve(returnWarnings);

diff --git a/viewer/js/viewer/_WidgetsMixin.js b/viewer/js/viewer/_WidgetsMixin.js
@@ -50,7 +50,7 @@ define([
                 }));
             } else {
                 var deferreds = this.createWidgets(['loading']);
-                if (deferreds.length) {
+                if (deferreds && deferreds.length) {
                     waitDeferred = promiseAll(deferreds);
                 }
             }
@@ -139,7 +139,7 @@ define([
                     source: 'Controller',
                     error: 'Widget type "' + widgetConfig.type + '" (' + widgetConfig.title + ') at position ' + position + ' is not supported.'
                 });
-                return;
+                return null;
             }
 
             if (position) {