flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [2/2] git commit: [flex-sdk] [refs/heads/develop] - even better fix for FLEX-34454
Date Fri, 21 Nov 2014 17:41:58 GMT
even better fix for FLEX-34454


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

Branch: refs/heads/develop
Commit: 1f4b752224ac60d6015afd048564d512240d254e
Parents: 4ade4cc
Author: Alex Harui <aharui@apache.org>
Authored: Fri Nov 21 09:40:47 2014 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Nov 21 09:41:34 2014 -0800

----------------------------------------------------------------------
 .../projects/framework/src/mx/managers/PopUpManagerImpl.as       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1f4b7522/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as b/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as
index a3f1766..55a40d2 100644
--- a/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as
+++ b/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as
@@ -1047,7 +1047,6 @@ public class PopUpManagerImpl extends EventDispatcher implements IPopUpManager
             // don't remove blur unless this is the first modal window to put up the blur
             if (blurOwners[sm] != null && blurOwners[sm] == o.owner)
             {
-                blurOwners[sm] = null;
                 // Blur effect on the application
                 const blurAmount:Number = popUpStyleClient.getStyle("modalTransparencyBlur");
                 
@@ -1279,6 +1278,8 @@ public class PopUpManagerImpl extends EventDispatcher implements IPopUpManager
     				awm.numModalWindows--;
                 }
 
+                if (blurOwners[sm] == o.owner)
+                    blurOwners[sm] = null;
                 popupInfo.splice(i, 1);
                 break;
             }
@@ -1337,7 +1338,6 @@ public class PopUpManagerImpl extends EventDispatcher implements IPopUpManager
 			if (obj.parent)	// Mustella can already take you off stage
 				obj.parent.removeChild(obj);
 		}
-		
     }
     
     /**


Mime
View raw message