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 7f37b57 Fix Jewel for reafctor of popups
7f37b57 is described below
commit 7f37b57deffd2e0a445e4cea9b0d00b88d25ed27
Author: Carlos Rovira <[email protected]>
AuthorDate: Fri Sep 28 11:06:23 2018 +0200
Fix Jewel for reafctor of popups
---
.../src/main/royale/org/apache/royale/jewel/Application.as | 11 +++++++++--
.../org/apache/royale/jewel/ApplicationResponsiveView.as | 13 +++++++++++--
.../Jewel/src/main/royale/org/apache/royale/jewel/Form.as | 14 +++++++++++---
3 files changed, 31 insertions(+), 7 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
index 78a1aa5..2b4afe2 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
@@ -20,6 +20,7 @@ package org.apache.royale.jewel
{
import org.apache.royale.core.ApplicationBase;
import org.apache.royale.core.IParent;
+ import org.apache.royale.core.IPopUpHostParent;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.utils.MXMLDataInterpreter;
@@ -123,7 +124,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class Application extends ApplicationBase implements IStrand,
IParent, IEventDispatcher, IInitialViewApplication, IPopUpHost, IRenderedObject
+ public class Application extends ApplicationBase implements IStrand,
IParent, IEventDispatcher, IInitialViewApplication, IPopUpHost,
IPopUpHostParent, IRenderedObject
{
/**
* Constructor.
@@ -349,7 +350,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public function get popUpParent():IParent
+ public function get popUpParent():IPopUpHostParent
{
return this;
}
@@ -743,5 +744,11 @@ package org.apache.royale.jewel
// Setting this directly doesn't do anything
}
+ /**
+ */
+ public function get popUpHost():IPopUpHost
+ {
+ return this;
+ }
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationResponsiveView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationResponsiveView.as
index 405d17c..c15ea88 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationResponsiveView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationResponsiveView.as
@@ -20,6 +20,7 @@ package org.apache.royale.jewel
{
import org.apache.royale.core.IApplicationView;
import org.apache.royale.core.IParent;
+ import org.apache.royale.core.IPopUpHostParent;
import org.apache.royale.core.IPopUpHost;
import org.apache.royale.events.Event;
// import org.apache.royale.jewel.beads.layouts.VerticalLayout;
@@ -40,7 +41,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class ApplicationResponsiveView extends Group implements
IPopUpHost, IApplicationView
+ public class ApplicationResponsiveView extends Group implements
IPopUpHost, IPopUpHostParent, IApplicationView
{
/**
* constructor.
@@ -92,9 +93,17 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public function get popUpParent():IParent
+ public function get popUpParent():IPopUpHostParent
{
return this;
}
+
+ /**
+ */
+ public function get popUpHost():IPopUpHost
+ {
+ return this;
+ }
+
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Form.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Form.as
index 5152420..e1d75f7 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Form.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Form.as
@@ -20,6 +20,7 @@ package org.apache.royale.jewel
{
import org.apache.royale.core.IParent;
import org.apache.royale.core.IPopUpHost;
+ import org.apache.royale.core.IPopUpHostParent;
/**
* Dispatched when the form validation succeeds.
@@ -51,7 +52,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class Form extends Group implements IPopUpHost {
+ public class Form extends Group implements IPopUpHost, IPopUpHostParent {
/**
* constructor.
@@ -74,9 +75,16 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public function get popUpParent():IParent
+ public function get popUpParent():IPopUpHostParent
{
- return this as IParent;
+ return this;
+ }
+
+ /**
+ */
+ public function get popUpHost():IPopUpHost
+ {
+ return this;
}
}
}
\ No newline at end of file
