use page object to store/use staticAppConfig

YahooArchive · Apr 2, 2013 · 47218d0 · 47218d0
1 parent c43503c
commit 47218d0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/lib/app/autoload/action-context.common.js b/lib/app/autoload/action-context.common.js
@@ -308,7 +308,7 @@ YUI.add('mojito-action-context', function(Y, NAME) {
         this._adapter = opts.adapter;
 
         // pathToRoot, viewEngine, amoung others will be available through this.
-        this.staticAppConfig = store.getStaticAppConfig();
+        this.staticAppConfig = (this._adapter.page && this._adapter.page.staticAppConfig) || store.getStaticAppConfig();
 
         // Create a function which will properly delegate to the dispatcher to
         // perform the actual processing.

diff --git a/lib/app/autoload/mojito-client.client.js b/lib/app/autoload/mojito-client.client.js
@@ -338,6 +338,9 @@ YUI.add('mojito-client', function(Y, NAME) {
                     // pass globalHookhandler to addons that may want to use hooks
                     globalHookHandler: globalHookHandler
                 };
+
+            this.page.staticAppConfig = config.appConfig;
+
             fireLifecycle('pre-init', forwardConfig);
             // if we didn't originaly have hooks enabled, copy back from config object.
             // This is the case where an add-on module wants to turn on hooks and

diff --git a/lib/mojito.js b/lib/mojito.js
@@ -340,6 +340,8 @@ MojitoServer.prototype._configureAppInstance = function(app, options) {
             log: Y.log
         });
 
+        outputHandler.page.staticAppConfig = store.getStaticAppConfig();
+
         // HookSystem::StartBlock
         // enabling perf group
         if (appConfig.perf) {