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/develop] - FLEX-34131 allow resource fetch attempts in frame 1
Date Sat, 07 Jun 2014 14:17:33 GMT
Repository: flex-sdk
Updated Branches:
  refs/heads/develop 8ab074753 -> 6b0e18296


FLEX-34131 allow resource fetch attempts in frame 1


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

Branch: refs/heads/develop
Commit: c0f0e66d5eb52f48fc972f01d8a552fee1361b28
Parents: 8ab0747
Author: Alex Harui <aharui@apache.org>
Authored: Mon May 19 20:38:41 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Sat Jun 7 07:17:23 2014 -0700

----------------------------------------------------------------------
 .../framework/src/mx/resources/ResourceManagerImpl.as   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c0f0e66d/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 b4bf97b..3e9c6fa 100644
--- a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
+++ b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
@@ -131,6 +131,7 @@ public class ResourceManagerImpl extends EventDispatcher implements IResourceMan
             if (SystemManagerGlobals.topLevelSystemManagers[0].currentFrame == 1)
             {
                 ignoreMissingBundles = true;
+				inFrame1 = true;
                 SystemManagerGlobals.topLevelSystemManagers[0].
                     addEventListener(Event.ENTER_FRAME, enterFrameHandler);
             }
@@ -140,7 +141,8 @@ public class ResourceManagerImpl extends EventDispatcher implements IResourceMan
 		// Falcon injects this property and it is always false
 		// We ignore missing bundles because Falcon doesn't
 		// generate fallback bundles like MXMLC;
-		ignoreMissingBundles = info && info.hasOwnProperty("isMXMLC");
+		if (!inFrame1)
+			ignoreMissingBundles = info && info.hasOwnProperty("isMXMLC");
 		
         if (info)
             processInfo(info, false);
@@ -158,6 +160,13 @@ public class ResourceManagerImpl extends EventDispatcher implements IResourceMan
     //
     //--------------------------------------------------------------------------
 
+	/**
+	 *  @private
+	 * 
+	 *  Whether or ignoreMissingBundles was set in frame 1
+	 */
+	private var inFrame1:Boolean = false;
+	
     /**
      *  @private
      * 
@@ -1171,6 +1180,7 @@ public class ResourceManagerImpl extends EventDispatcher implements
IResourceMan
         {
             if (SystemManagerGlobals.topLevelSystemManagers[0].currentFrame == 2)
             {
+				inFrame1 = false;
                 SystemManagerGlobals.topLevelSystemManagers[0].
                     removeEventListener(Event.ENTER_FRAME, enterFrameHandler);
             }


Mime
View raw message