resource store honors yui.config during preload

YahooArchive · May 16, 2013 · 9fb3e07 · 9fb3e07
1 parent 2ad2f2c
commit 9fb3e07
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/app/autoload/store.server.js b/lib/app/autoload/store.server.js
@@ -1927,7 +1927,7 @@ YUI.add('mojito-resource-store', function(Y, NAME) {
                         if (versions[res.id][priority].source.fs.fullPath !== res.source.fs.fullPath) {
                             Y.log('Resource version collision for ' + res.id +
                                 '\nchoosing: ' + versions[res.id][priority].source.fs.fullPath +
-                                '\nskipping: ' + res.source.fs.fullPath, 'warn', NAME);
+                                '\nskipping: ' + res.source.fs.fullPath, 'info', NAME);
                         }
                     } else {
                         versions[res.id][priority] = res;

diff --git a/lib/store.js b/lib/store.js
@@ -41,6 +41,7 @@ Store.createStore = function(options) {
 
     var store,
         YUI,
+        appConfig,
         Y;
 
     if (!options) {
@@ -61,7 +62,6 @@ Store.createStore = function(options) {
     // of the ResourceStore instance.
     YUI = YUIFactory.getYUI();
 
-
     // Configure the prerequisites and load the resource store impl code.
     Y = YUI({
         useSync: true,
@@ -85,6 +85,9 @@ Store.createStore = function(options) {
         appConfig: options.appConfig
     });
 
+    appConfig = store.getStaticAppConfig();
+    Y.applyConfig((appConfig && appConfig.yui && appConfig.yui.config) || {});
+
     if ('initial' === options.preload) {
         store.preloadInitial();
     } else if ('skip' !== options.preload) {