add documentation and fix typo

cmv · Jan 20, 2017 · 44caebf · 44caebf
1 parent 705ecb6
commit 44caebf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/viewer/js/config/app.js b/viewer/js/config/app.js
@@ -50,12 +50,24 @@
 
     ) {
         var App = declare([
+
+            // add custom mixins here...note order may be important and
+            // overriding certain methods incorrectly may break the app
+            // First on the list are last called last, for instance the startup
+            // method on _ControllerBase is called FIRST, and _LayoutMixin is called LAST
+            // for the most part they are interchangeable, except _ConfigMixin
+            // and _ControllerBase
+            //
             _LayoutMixin,
             _WidgetsMixin,
-
-            _WebMapMixin,
+            // _WebMapMixin,
             _MapMixin,
+
+            // configMixin should be right before _ControllerBase so it is
+            // called first to initialize the config object
             _ConfigMixin,
+
+            // controller base needs to be last
             _ControllerBase
         ]);
         var app = new App();

diff --git a/viewer/js/viewer/_MapMixin.js b/viewer/js/viewer/_MapMixin.js
@@ -62,7 +62,7 @@ define([
             this.map = new Map(container, this.config.mapOptions);
 
             // let some other mixins modify or add map items async
-            wait = this.inherited(arguments) || wait;
+            var wait = this.inherited(arguments);
             if (wait) {
                 wait.then(function (warnings) {
                     // are warnings passed?