revert override of clone because HTML that would force everyone to turn on swfoverride which we may do some day, but not now. But it did seem to work
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a4edb4e3 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a4edb4e3 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a4edb4e3 Branch: refs/heads/develop Commit: a4edb4e32ef4926847c82e657d635a73a5ef243d Parents: aa7d375 Author: Alex Harui <[email protected]> Authored: Mon Dec 5 09:10:59 2016 -0800 Committer: Alex Harui <[email protected]> Committed: Mon Dec 5 10:16:23 2016 -0800 ---------------------------------------------------------------------- .../flex/org/apache/flex/events/ItemAddedEvent.as | 2 +- .../org/apache/flex/events/ItemClickedEvent.as | 2 +- .../org/apache/flex/events/ItemRemovedEvent.as | 2 +- .../org/apache/flex/events/ItemRendererEvent.as | 2 +- .../flex/org/apache/flex/core/ElementWrapper.as | 2 +- .../src/main/flex/org/apache/flex/events/Event.as | 18 +++++++++++++++--- .../flex/org/apache/flex/events/IFlexJSEvent.as | 3 +-- .../flex/org/apache/flex/events/MouseEvent.as | 18 +++++++++++++++--- 8 files changed, 36 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4edb4e3/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemAddedEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemAddedEvent.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemAddedEvent.as index 794deb1..b91e5c0 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemAddedEvent.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemAddedEvent.as @@ -78,7 +78,7 @@ package org.apache.flex.events /** * @private */ - override public function clone():IFlexJSEvent + override public function cloneEvent():IFlexJSEvent { var newEvent:ItemAddedEvent = new ItemAddedEvent(type); newEvent.item = item; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4edb4e3/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemClickedEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemClickedEvent.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemClickedEvent.as index 4e4d7db..f81a215 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemClickedEvent.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemClickedEvent.as @@ -103,7 +103,7 @@ package org.apache.flex.events /** * @private */ - override public function clone():IFlexJSEvent + override public function cloneEvent():IFlexJSEvent { var newEvent:ItemClickedEvent = new ItemClickedEvent(type); newEvent.index = index; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4edb4e3/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemRemovedEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemRemovedEvent.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemRemovedEvent.as index 9c109c8..30499de 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemRemovedEvent.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemRemovedEvent.as @@ -78,7 +78,7 @@ package org.apache.flex.events /** * @private */ - override public function clone():IFlexJSEvent + override public function cloneEvent():IFlexJSEvent { var newEvent:ItemRemovedEvent = new ItemRemovedEvent(type); newEvent.item = item; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4edb4e3/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemRendererEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemRendererEvent.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemRendererEvent.as index aa5faf8..f1e35b4 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemRendererEvent.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/events/ItemRendererEvent.as @@ -80,7 +80,7 @@ package org.apache.flex.events /** * @private */ - override public function clone():IFlexJSEvent + override public function cloneEvent():IFlexJSEvent { var newEvent:ItemRendererEvent = new ItemRendererEvent(type); newEvent.itemRenderer = itemRenderer; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4edb4e3/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as index 52abc8b..dea4088 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as @@ -161,7 +161,7 @@ package org.apache.flex.core private function forwarder(event:flash.events.Event):void { if (event is IFlexJSEvent) - event = IFlexJSEvent(event).clone() as flash.events.Event; + event = IFlexJSEvent(event).cloneEvent() as flash.events.Event; dispatchEvent(event); } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4edb4e3/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as index 77525d0..00f01e4 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as @@ -83,8 +83,20 @@ package org.apache.flex.events /** * @private */ - [SWFOverride(returns="flash.events.Event")] - public override function clone():IFlexJSEvent + public override function clone():flash.events.Event + { + return cloneEvent() as flash.events.Event; + } + + /** + * Create a copy/clone of the Event object. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function cloneEvent():IFlexJSEvent { return new org.apache.flex.events.Event(type, bubbles, cancelable); } @@ -149,7 +161,7 @@ package org.apache.flex.events throw new Error("stopImmediatePropagation"); } - public function clone():IFlexJSEvent + public function cloneEvent():IFlexJSEvent { return new org.apache.flex.events.Event(type, bubbles, cancelable); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4edb4e3/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IFlexJSEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IFlexJSEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IFlexJSEvent.as index adf6ed3..f230477 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IFlexJSEvent.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IFlexJSEvent.as @@ -43,7 +43,6 @@ package org.apache.flex.events * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - [SWFOverride(returns="flash.events.Event")] - function clone():IFlexJSEvent; + function cloneEvent():IFlexJSEvent; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4edb4e3/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as index 70b4968..c135eb0 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as @@ -143,8 +143,20 @@ package org.apache.flex.events /** * @private */ - [SWFOverride(returns="flash.events.Event")] - public override function clone():IFlexJSEvent + public override function clone():flash.events.Event + { + return cloneEvent() as flash.events.Event; + } + + /** + * Create a copy/clone of the Event object. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function cloneEvent():IFlexJSEvent { var e:org.apache.flex.events.MouseEvent = new org.apache.flex.events.MouseEvent(type, bubbles, cancelable, localX, localY, relatedObject, ctrlKey, altKey, shiftKey, @@ -418,7 +430,7 @@ package org.apache.flex.events * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - override public function clone():IFlexJSEvent + override public function cloneEvent():IFlexJSEvent { return new org.apache.flex.events.MouseEvent(type, bubbles, cancelable, localX, localY, relatedObject, ctrlKey, altKey, shiftKey,
