This is an automated email from the ASF dual-hosted git repository.

gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new 1cc1ae9  Fix for possible inappropriate modal blocker persistence. The 
order in which popups are removed is not always the reverse of how they are 
added if there are more than one.
1cc1ae9 is described below

commit 1cc1ae92885a80357d8989ea09ac7bfc18b959b1
Author: greg-dove <greg.d...@gmail.com>
AuthorDate: Sun Jan 24 19:29:39 2021 +1300

    Fix for possible inappropriate modal blocker persistence.
    The order in which popups are removed is not always the reverse of how they 
are added if there are more than one.
---
 .../MXRoyale/src/main/royale/mx/managers/PopUpManager.as       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/PopUpManager.as 
b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/PopUpManager.as
index 4c41ff2..2dd8003 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/PopUpManager.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/PopUpManager.as
@@ -258,11 +258,11 @@ public class PopUpManager
                {
                var popUpHost:IUIBase = (popUp.parent as 
IPopUpHostParent).popUpHost as IUIBase;
                        UIUtils.removePopUp(popUp as IChild);
-               if (modalWindows.length > 0 && modalWindows[modalWindows.length 
- 1] == popUp)
-               {
-                   PopUpManagerModal.remove(popUpHost);
-                   modalWindows.pop();
-               }
+            var modalIndex:int = modalWindows.indexOf(popUp);
+            if (modalIndex != -1) {
+                PopUpManagerModal.remove(popUpHost);
+                modalWindows.splice(modalIndex,1);
+            }
                }
     }
 } // class

Reply via email to