Cleanup #666

cmv · Feb 11, 2017 · 94baf8b · 94baf8b
1 parent 44caebf
commit 94baf8b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 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 (
@@ -45,7 +45,7 @@
         _MapMixin,
         _WidgetsMixin,
 
-        _WebMapMixin
+        // _WebMapMixin
         //_MyCustomMixin
 
     ) {

diff --git a/viewer/js/viewer/_LayoutMixin.js b/viewer/js/viewer/_LayoutMixin.js
@@ -12,7 +12,6 @@ define([
     'dojo/dom-geometry',
     'dojo/sniff',
     'dojo/Deferred',
-    'dojo/promise/all',
 
     'put-selector',
 
@@ -36,7 +35,6 @@ define([
     domGeom,
     has,
     Deferred,
-    promiseAll,
 
     put,
 

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';
 
@@ -65,8 +64,9 @@ define([
             var wait = this.inherited(arguments);
             if (wait) {
                 wait.then(function (warnings) {
-                    // are warnings passed?
-                    // returnWarnings.push(warnings);
+                    if (warnings) {
+                        returnWarnings = returnWarnings.concat(warnings);
+                    }
                     mapDeferred.resolve(returnWarnings);
                 });
             } else {

diff --git a/viewer/js/viewer/_WebMapMixin.js b/viewer/js/viewer/_WebMapMixin.js
@@ -2,7 +2,6 @@ define([
     'dojo/_base/declare',
     'dojo/_base/lang',
     'dojo/_base/array',
-    'dojo/promise/all',
     'dojo/dom',
 
     'esri/arcgis/utils',
@@ -14,7 +13,6 @@ define([
     declare,
     lang,
     array,
-    promiseAll,
     dom,
 
     arcgisUtils,

diff --git a/viewer/js/viewer/_WidgetsMixin.js b/viewer/js/viewer/_WidgetsMixin.js
@@ -64,9 +64,7 @@ define([
             }
             if (this.layoutDeferred) {
                 promiseAll([this.mapDeferred, this.layoutDeferred])
-                    .then(lang.hitch(this,
-                        'createWidgets', ['titlePane', 'contentPane', 'floating', 'domNode', 'invisible', 'layout']
-                    ));
+                    .then(lang.hitch(this, 'createWidgets'));
             }
         },
 
@@ -139,7 +137,7 @@ define([
                     source: 'Controller',
                     error: 'Widget type "' + widgetConfig.type + '" (' + widgetConfig.title + ') at position ' + position + ' is not supported.'
                 });
-                return;
+                return null;
             }
 
             if (position) {