flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [1/2] git commit: [flex-sdk] [refs/heads/release4.10.0] - Fix FLEX-33632. Moved initialization of locale chain to after bundle modules are installed
Date Mon, 29 Jul 2013 15:38:05 GMT
Updated Branches:
  refs/heads/release4.10.0 97bedf755 -> 31d79802d


Fix FLEX-33632.  Moved initialization of locale chain to after bundle modules are installed


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/fd4451cf
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/fd4451cf
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/fd4451cf

Branch: refs/heads/release4.10.0
Commit: fd4451cf06f810d5015e37d0e3cf3376162a0496
Parents: 97bedf7
Author: Alex Harui <aharui@apache.org>
Authored: Thu Jul 25 15:26:20 2013 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Thu Jul 25 15:31:25 2013 -0700

----------------------------------------------------------------------
 .../framework/src/mx/preloaders/Preloader.as    | 22 ++++++++++++++++++++
 .../src/mx/resources/ResourceManagerImpl.as     |  8 -------
 2 files changed, 22 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fd4451cf/frameworks/projects/framework/src/mx/preloaders/Preloader.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/preloaders/Preloader.as b/frameworks/projects/framework/src/mx/preloaders/Preloader.as
index b00e2af..37316fb 100644
--- a/frameworks/projects/framework/src/mx/preloaders/Preloader.as
+++ b/frameworks/projects/framework/src/mx/preloaders/Preloader.as
@@ -39,6 +39,8 @@ import mx.core.ResourceModuleRSLItem;
 import mx.core.mx_internal;
 import mx.events.FlexEvent;
 import mx.events.RSLEvent;
+import mx.managers.SystemManagerGlobals;
+import mx.resources.IResourceManager;
 
 use namespace mx_internal;
 
@@ -541,6 +543,26 @@ public class Preloader extends Sprite
                 }
             }
 
+            if (resourceModuleListLoader)
+            {
+                var resourceManager:IResourceManager;
+                // do this to prevent dependency on ResourceManager
+                if (applicationDomain.hasDefinition("mx.resources::ResourceManager"))
+                {
+                    var resourceManagerClass:Class = 
+                        Class(applicationDomain.getDefinition("mx.resources::ResourceManager"));
+                    resourceManager = 
+                        IResourceManager(resourceManagerClass["getInstance"]());
+                }
+                // The FlashVars of the SWF's HTML wrapper,
+                // or the query parameters of the SWF URL,
+                // can specify the ResourceManager's localeChain.
+                var localeChainList:String =  
+                    SystemManagerGlobals.parameters["localeChain"];
+                if (localeChainList != null && localeChainList != "")
+                    resourceManager.localeChain = localeChainList.split(",");
+            }            
+
             timer.removeEventListener(TimerEvent.TIMER, timerHandler);
             
             // Stop the timer.

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fd4451cf/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
index ef01ea6..a51fdba 100644
--- a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
+++ b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
@@ -449,14 +449,6 @@ public class ResourceManagerImpl extends EventDispatcher implements IResourceMan
 			compiledLocales[0] :
 			"en_US";
 
-		// The FlashVars of the SWF's HTML wrapper,
-		// or the query parameters of the SWF URL,
-		// can specify the ResourceManager's localeChain.
-		var localeChainList:String =  
-			SystemManagerGlobals.parameters["localeChain"];
-		if (localeChainList != null && localeChainList != "")
-			localeChain = localeChainList.split(",");
-
 		var applicationDomain:ApplicationDomain = info["currentDomain"];
 
 		var compiledResourceBundleNames:Array /* of String */ =


Mime
View raw message