rename preStartup to postConfig for clarity

cmv · Feb 1, 2017 · 5c65783 · 5c65783
1 parent 5c6b537
commit 5c65783
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 20 deletions.
diff --git a/viewer/js/viewer/_ControllerBase.js b/viewer/js/viewer/_ControllerBase.js
@@ -7,6 +7,7 @@ define([
     declare, lang, Deferred
 ) {
     return declare(null, {
+
         /**
          * A method run before anything else, can be inherited by mixins to
          * load and process the config sync or async
@@ -22,9 +23,32 @@ define([
          * @return {undefined | Deferred} If the operation is async it should return
          * a deferred, otherwise it should return the value of `this.inherited(arguments)`
          */
-        preStartup: function () {
+        postConfig: function () {
             return this.inherited(arguments);
         },
+        /**
+         * Start the application mixin chain, once the
+         * startupDeferred is resolved
+         * @return {undefined}
+         */
+        startup: function () {
+
+            // cache the inherited
+            var inherited = this.getInherited(arguments);
+
+            // load config and process it
+            this.startupDeferred = this.executeSync([
+                this.loadConfig,
+                this.postConfig
+            ]);
+
+            // wait for any loading to complete
+            this.startupDeferred.then(lang.hitch(this, function () {
+
+                // start up the mixin chain
+                inherited.apply(this);
+            }));
+        },
         /**
          * executes an array of asynchronous methods synchronously
          * @param  {Array<function>} methods  The array of functions to execute
@@ -51,21 +75,6 @@ define([
             }
             return deferred;
 
-        },
-        startup: function () {
-
-            var inherited = this.getInherited(arguments);
-            this.executeSync([
-                this.loadConfig,
-                this.preStartup
-            ]).then(lang.hitch(this, function () {
-                console.log(this);
-
-                // start up the mixin chain
-                inherited.apply(this);
-            }));
-
-
         },
 
         //centralized error handler

diff --git a/viewer/js/viewer/_LayoutMixin.js b/viewer/js/viewer/_LayoutMixin.js
@@ -65,7 +65,7 @@ define([
             }
         },
         collapseButtons: {},
-        preStartup: function () {
+        postConfig: function () {
             this.layoutDeferred = new Deferred();
             return this.inherited(arguments);
         },
@@ -77,7 +77,7 @@ define([
             this.addTitles();
             this.detectTouchDevices();
             this.initPanes();
-            
+
             this.mapDeferred.then(lang.hitch(this, 'createPanes'));
 
             // resolve the layout deferred

diff --git a/viewer/js/viewer/_MapMixin.js b/viewer/js/viewer/_MapMixin.js
@@ -25,7 +25,7 @@ define([
 
     return declare(null, {
 
-        preStartup: function () {
+        postConfig: function () {
             this.mapDeferred = new Deferred();
             return this.inherited(arguments);
         },

diff --git a/viewer/js/viewer/_WidgetsMixin.js b/viewer/js/viewer/_WidgetsMixin.js
@@ -38,7 +38,7 @@ define([
 
         widgets: {},
         widgetTypes: ['titlePane', 'contentPane', 'floating', 'domNode', 'invisible', 'map', 'layer', 'layout', 'loading'],
-        preStartup: function (wait) {
+        postConfig: function (wait) {
 
             var waitDeferred;
             if (wait) {