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 fe0e4485d4 Alert fix: Cancel Button, if specified, should appear after
any Yes or No buttons, not just after any OK button.
new 9c670e4e3c Merge branch 'develop' of
https://github.com/apache/royale-asjs into develop
fe0e4485d4 is described below
commit fe0e4485d491ff0c9aac946cba6a1be856a7e2e6
Author: greg-dove <[email protected]>
AuthorDate: Wed Oct 12 15:20:26 2022 +1300
Alert fix: Cancel Button, if specified, should appear after any Yes or No
buttons, not just after any OK button.
---
.../org/apache/royale/html/beads/AlertView.as | 34 +++++++++++-----------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/AlertView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/AlertView.as
index baf9ad8c6c..699ea9244a 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/AlertView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/AlertView.as
@@ -203,23 +203,6 @@ package org.apache.royale.html.beads
style["margin-right"] = "2px";
}
}
- if( flags & Alert.CANCEL )
- {
- cancelButton = new TextButton();
- cancelButton.className = "AlertButton";
- cancelButton.text = alertModel.cancelLabel;
-
cancelButton.addEventListener("click",handleCancel);
-
- controlBar.addElement(cancelButton);
-
- COMPILE::JS
- {
- style = getStyle(cancelButton);
- style["height"] = "intrinsic";
- style["margin-left"] = "2px";
- style["margin-right"] = "2px";
- }
- }
if( flags & Alert.YES )
{
yesButton = new TextButton();
@@ -254,6 +237,23 @@ package org.apache.royale.html.beads
style["margin-right"] = "2px";
}
}
+ if( flags & Alert.CANCEL )
+ {
+ cancelButton = new TextButton();
+ cancelButton.className = "AlertButton";
+ cancelButton.text = alertModel.cancelLabel;
+
cancelButton.addEventListener("click",handleCancel);
+
+ controlBar.addElement(cancelButton);
+
+ COMPILE::JS
+ {
+ style = getStyle(cancelButton);
+ style["height"] = "intrinsic";
+ style["margin-left"] = "2px";
+ style["margin-right"] = "2px";
+ }
+ }
}
/**
