You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2019/12/24 08:02:34 UTC
[royale-asjs] branch develop updated (92b7304 -> 6797f7f)
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 92b7304 Fixed asconfig
new dd4126f Cleaned up Crux
new 5fb9d20 Fixed typo
new 6797f7f Enable bubbling for Royale EventDispatchers
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/royale/org/apache/royale/core/ElementWrapper.as | 4 ++--
.../main/royale/org/apache/royale/events/EventDispatcher.as | 12 ++++++++++--
.../Crux/src/main/royale/org/apache/royale/crux/Crux.as | 2 --
.../royale/org/apache/royale/crux/beads/JSStageEvents.as | 7 ++++---
.../org/apache/royale/crux/utils/view/applicationContains.as | 6 +++---
.../org/apache/royale/crux/utils/view/containerContains.as | 4 +---
6 files changed, 20 insertions(+), 15 deletions(-)
[royale-asjs] 02/03: Fixed typo
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 5fb9d20b3c48de82b0e58575b6f9a1cfd20eb5c6
Author: Harbs <ha...@in-tools.com>
AuthorDate: Tue Dec 24 10:01:49 2019 +0200
Fixed typo
---
.../Core/src/main/royale/org/apache/royale/core/ElementWrapper.as | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as
index ec7ab71..1a06ce7 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as
@@ -353,7 +353,7 @@ package org.apache.royale.core
eventType = e as String;
if (e == "change")
{
- e = EventUtils.createEvent(eventType, e.bubbles);
+ e = EventUtils.createEvent(eventType, e["bubbles"]);
}
}
else
@@ -361,7 +361,7 @@ package org.apache.royale.core
eventType = e.type;
if (ElementEvents.elementEvents[eventType])
{
- e = EventUtils.createEvent(eventType), e.bubbles;
+ e = EventUtils.createEvent(eventType, e["bubbles"]);
}
}
var source:Object = this.getActualDispatcher_(eventType);
[royale-asjs] 03/03: Enable bubbling for Royale EventDispatchers
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 6797f7ff0d51a976862ae80e922e6029d1579c08
Author: Harbs <ha...@in-tools.com>
AuthorDate: Tue Dec 24 10:02:19 2019 +0200
Enable bubbling for Royale EventDispatchers
---
.../main/royale/org/apache/royale/events/EventDispatcher.as | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/EventDispatcher.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/EventDispatcher.as
index b981c4e..b57f934 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/EventDispatcher.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/EventDispatcher.as
@@ -20,14 +20,15 @@ package org.apache.royale.events
{
COMPILE::JS
{
- import goog.events;
+ import goog.events;
import goog.events.EventTarget;
+ import org.apache.royale.core.IChild;
}
COMPILE::SWF
{
import flash.events.EventDispatcher;
- import flash.events.IEventDispatcher;
+ import flash.events.IEventDispatcher;
}
/**
@@ -99,6 +100,13 @@ package org.apache.royale.events
}
return false;
}
+ /**
+ * @royaleignorecoercion org.apache.royale.core.IChild
+ * @royaleignorecoercion goog.events.EventTarget
+ */
+ override public function getParentEventTarget():goog.events.EventTarget{
+ return (this as IChild).parent as goog.events.EventTarget;
+ }
public function toString():String
{
[royale-asjs] 01/03: Cleaned up Crux
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit dd4126f310a8ab247bfa517f58ecad4b18ae34ab
Author: Harbs <ha...@in-tools.com>
AuthorDate: Tue Dec 24 10:01:34 2019 +0200
Cleaned up Crux
---
.../projects/Crux/src/main/royale/org/apache/royale/crux/Crux.as | 2 --
.../src/main/royale/org/apache/royale/crux/beads/JSStageEvents.as | 7 ++++---
.../org/apache/royale/crux/utils/view/applicationContains.as | 6 +++---
.../royale/org/apache/royale/crux/utils/view/containerContains.as | 4 +---
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/Crux.as b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/Crux.as
index 1e19c72..0836fa4 100644
--- a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/Crux.as
+++ b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/Crux.as
@@ -25,7 +25,6 @@ package org.apache.royale.crux
import org.apache.royale.reflection.ExtraData;
COMPILE::JS {
- import org.apache.royale.core.HTMLElementWrapper;
import org.apache.royale.core.WrappedHTMLElement;
}
@@ -76,7 +75,6 @@ package org.apache.royale.crux
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
- * @royaleignorecoercion org.apache.royale.core.HTMLElementWrapper
* @royaleignorecoercion org.apache.royale.events.IEventDispatcher
*/
public function set strand(value:IStrand):void
diff --git a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/beads/JSStageEvents.as b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/beads/JSStageEvents.as
index 9ab96f0..5418d86 100644
--- a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/beads/JSStageEvents.as
+++ b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/beads/JSStageEvents.as
@@ -30,7 +30,7 @@ package org.apache.royale.crux.beads
import org.apache.royale.core.UIBase;
COMPILE::JS {
- import org.apache.royale.core.HTMLElementWrapper;
+ import org.apache.royale.core.ElementWrapper;
import org.apache.royale.core.WrappedHTMLElement;
import goog.events.EventTarget;
}
@@ -95,7 +95,8 @@ package org.apache.royale.crux.beads
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*
- * @royaleignorecoercion org.apache.royale.core.HTMLElementWrapper
+ * @royaleignorecoercion org.apache.royale.core.ElementWrapper
+ * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
*/
public function set strand(value:IStrand):void
{
@@ -108,7 +109,7 @@ package org.apache.royale.crux.beads
_activeInstance = this;
if (!_dispatcher) _dispatcher = value as IEventDispatcher;
var observer:MutationObserver = new MutationObserver(mutationDetected);
- observer.observe(HTMLElementWrapper(value).element, {'childList': true, 'subtree': true});
+ observer.observe((value as ElementWrapper).element, {'childList': true, 'subtree': true});
trace('Activating JSStageEvents')
}
}
diff --git a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/applicationContains.as b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/applicationContains.as
index 73b5cc1..446a29f 100644
--- a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/applicationContains.as
+++ b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/applicationContains.as
@@ -31,7 +31,7 @@ package org.apache.royale.crux.utils.view {
}
COMPILE::JS{
- import org.apache.royale.core.HTMLElementWrapper;
+ import org.apache.royale.core.ElementWrapper;
}
@@ -42,7 +42,7 @@ package org.apache.royale.crux.utils.view {
* @param content
* @return true if the content is present in the child hierarchy of the container
*
- * @royaleignorecoercion org.apache.royale.core.HTMLElementWrapper
+ * @royaleignorecoercion org.apache.royale.core.ElementWrapper
*/
public function applicationContains(container:IFlexInfo, content:UIBase):Boolean {
if (!content) return false;
@@ -52,7 +52,7 @@ package org.apache.royale.crux.utils.view {
}
COMPILE::JS{
- return HTMLElementWrapper(container).element.contains(content.element)
+ return (container as ElementWrapper).element.contains(content.element)
}
}
diff --git a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/containerContains.as b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/containerContains.as
index 283c53b..67a1de1 100644
--- a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/containerContains.as
+++ b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/containerContains.as
@@ -31,7 +31,6 @@ package org.apache.royale.crux.utils.view {
}
COMPILE::JS{
- import org.apache.royale.core.HTMLElementWrapper;
}
/**
@@ -41,7 +40,6 @@ package org.apache.royale.crux.utils.view {
* @param content
* @return true if the content is present in the child hierarchy of the container
*
- * @royaleignorecoercion org.apache.royale.core.HTMLElementWrapper
*/
public function containerContains(container:ContainerBase, content:UIBase):Boolean {
if (!content) return false;
@@ -51,7 +49,7 @@ package org.apache.royale.crux.utils.view {
}
COMPILE::JS{
- return HTMLElementWrapper(container).element.contains(HTMLElementWrapper(content).element);
+ return container.element.contains(content.element);
}
}