You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2019/03/08 11:59:21 UTC

[royale-asjs] branch develop updated: jewel-alert: fix closing on iOS. for some reason this line on controller fails on ios but not in main file: var dialog:HTMLDialogElement = host.element as HTMLDialogElement; 

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

carlosrovira 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 2baf24f  jewel-alert: fix closing on iOS. for some reason this line on controller fails on ios but not in main file: var dialog:HTMLDialogElement = host.element as HTMLDialogElement;
2baf24f is described below

commit 2baf24f3c8ddfbfa71f066f626aa69eb832b73e0
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Mar 8 12:59:15 2019 +0100

    jewel-alert: fix closing on iOS. for some reason this line on controller fails on ios but not in main file: var dialog:HTMLDialogElement = host.element as HTMLDialogElement;
---
 .../Jewel/src/main/royale/org/apache/royale/jewel/Alert.as |  4 ++--
 .../royale/jewel/beads/controllers/AlertController.as      |  6 ++----
 .../org/apache/royale/jewel/beads/views/AlertView.as       | 14 +++++++-------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Alert.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Alert.as
index 43dce10..940cdc8 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Alert.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Alert.as
@@ -20,8 +20,8 @@ package org.apache.royale.jewel
 {
     COMPILE::JS
     {
-        import org.apache.royale.core.WrappedHTMLElement;
-        import org.apache.royale.html.util.addElementToWrapper;
+	import org.apache.royale.core.WrappedHTMLElement;
+	import org.apache.royale.html.util.addElementToWrapper;
     }
     import org.apache.royale.core.IAlertModel;
     import org.apache.royale.core.IPopUp;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/AlertController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/AlertController.as
index db0b2eb..6baf447 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/AlertController.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/AlertController.as
@@ -20,7 +20,7 @@ package org.apache.royale.jewel.beads.controllers
 {
     COMPILE::SWF
     {
-        import flash.display.DisplayObject;
+    import flash.display.DisplayObject;
     }
 
     import org.apache.royale.core.UIBase;
@@ -96,9 +96,7 @@ package org.apache.royale.jewel.beads.controllers
 			COMPILE::JS
 			{
 			document.body.classList.remove("viewport");
-			var dialog:HTMLDialogElement = host.element as HTMLDialogElement;
-			dialog.close();
-			dialog.parentElement.removeChild(dialog);
+			host.element.parentElement.removeChild(host.element);
 			}
         }
 	}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
index 3dd2852..41f18dc 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
@@ -20,17 +20,17 @@ package org.apache.royale.jewel.beads.views
 {
     COMPILE::SWF
 	{
-        import flash.utils.setTimeout;
+	import flash.utils.setTimeout;
 
-        import org.apache.royale.core.IMeasurementBead;
-        import org.apache.royale.core.ValuesManager;
-        import org.apache.royale.html.beads.IBackgroundBead;
-        import org.apache.royale.html.beads.IBorderBead;
-        import org.apache.royale.utils.loadBeadFromValuesManager;
+	import org.apache.royale.core.IMeasurementBead;
+	import org.apache.royale.core.ValuesManager;
+	import org.apache.royale.html.beads.IBackgroundBead;
+	import org.apache.royale.html.beads.IBorderBead;
+	import org.apache.royale.utils.loadBeadFromValuesManager;
 	}
 	COMPILE::JS
 	{
-    	import org.apache.royale.jewel.ControlBar;	
+    import org.apache.royale.jewel.ControlBar;	
 	}
     import org.apache.royale.core.IAlertModel;
     import org.apache.royale.core.IBeadLayout;