flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [1/8] git commit: [flex-sdk] [refs/heads/develop] - add different handling of missing resource bundles for Falcon SWFs (at least for now). MXMLC makes an en_US bundle provide the bundles for other en_XX locales, Falcon doesn't do that so you fall throug
Date Tue, 05 Nov 2013 20:58:00 GMT
Updated Branches:
  refs/heads/develop 0b6fa00f2 -> 27694bb4c


add different handling of missing resource bundles for Falcon SWFs (at least for now).  MXMLC
makes an en_US bundle provide the bundles for other en_XX locales, Falcon doesn't do that
so you fall through to the next locale.


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

Branch: refs/heads/develop
Commit: 126c448161cc2897b56822cd2388cdba0c5adb36
Parents: 0b6fa00
Author: Alex Harui <aharui@apache.org>
Authored: Tue Nov 5 00:06:11 2013 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Nov 5 12:56:48 2013 -0800

----------------------------------------------------------------------
 .../framework/src/mx/resources/ResourceManagerImpl.as       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/126c4481/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 a51fdba..7cc8ab8 100644
--- a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
+++ b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
@@ -137,10 +137,15 @@ public class ResourceManagerImpl extends EventDispatcher implements
IResourceMan
         }
         
         var info:Object = SystemManagerGlobals.info;
+		// Falcon injects this property and it is always false
+		// We ignore missing bundles because Falcon doesn't
+		// generate fallback bundles like MXMLC;
+		ignoreMissingBundles = info.hasOwnProperty("isMXMLC");
+		
         if (info)
             processInfo(info, false);
 
-        ignoreMissingBundles = false;
+        ignoreMissingBundles = info.hasOwnProperty("isMXMLC");
         
         if (SystemManagerGlobals.topLevelSystemManagers.length)
 		    SystemManagerGlobals.topLevelSystemManagers[0].
@@ -158,7 +163,7 @@ public class ResourceManagerImpl extends EventDispatcher implements IResourceMan
      * 
      *  Whether or not to throw an error.
      */
-    private var ignoreMissingBundles:Boolean;
+    private var ignoreMissingBundles:Boolean = false;
     
     /**
      *  @private


Mime
View raw message