Fixed fallback on target and currentTarget getters. Added setters for target and currentTarget. That should only be needed for âcustomâ MouseEvents. The necessity of this is debateable. Fixed DataBindingTestbed test
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/93ff285a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/93ff285a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/93ff285a Branch: refs/heads/develop Commit: 93ff285a796ec2b0d95e030109184bcb3aeb3f73 Parents: 33df529 Author: Harbs <ha...@in-tools.com> Authored: Mon Jul 24 13:23:14 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Jul 24 13:23:14 2017 +0300 ---------------------------------------------------------------------- .../org/apache/flex/events/KeyboardEvent.as | 23 +++++++++++++++----- .../flex/org/apache/flex/events/MouseEvent.as | 18 +++++++++++---- .../container/TextContainerManager.as | 8 ------- manualtests/DataBindingTestbed/build.xml | 5 +++-- 4 files changed, 35 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93ff285a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as index 50385d2..29761f7 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as @@ -67,7 +67,8 @@ package org.apache.flex.events _ctrlKey = ctrlKey; _metaKey = metaKey; } - + COMPILE::JS + private var _target:Object; /** * @copy org.apache.flex.events.BrowserEvent#target * @@ -77,9 +78,15 @@ package org.apache.flex.events * @productversion FlexJS 0.9 */ COMPILE::JS - override public function get target():Object + public function get target():Object + { + return wrappedEvent ? getTargetWrapper(wrappedEvent.target) : _target; + } + + COMPILE::JS + public function set target(value:Object):void { - return wrappedEvent ? getTargetWrapper(wrappedEvent.target) : super.target; + _target = value; } /** @@ -91,9 +98,15 @@ package org.apache.flex.events * @productversion FlexJS 0.9 */ COMPILE::JS - override public function get currentTarget():Object + public function get currentTarget():Object + { + return wrappedEvent ? getTargetWrapper(wrappedEvent.currentTarget) : _target; + } + + COMPILE::JS + public function set currentTarget(value:Object):void { - return wrappedEvent ? getTargetWrapper(wrappedEvent.currentTarget) : super.currentTarget; + _target = value; } private var _key:String; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93ff285a/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 674ac87..b41b10c 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 @@ -304,6 +304,8 @@ package org.apache.flex.events public var controlKey:Boolean; public var clickCount:int; + private var _target:Object; + /** * @copy org.apache.flex.events.BrowserEvent#target * @@ -312,9 +314,13 @@ package org.apache.flex.events * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - override public function get target():Object + public function get target():Object + { + return wrappedEvent ? getTargetWrapper(wrappedEvent.target) : _target; + } + public function set target(value:Object):void { - return wrappedEvent ? getTargetWrapper(wrappedEvent.target) : super.target; + _target = value; } /** @@ -325,9 +331,13 @@ package org.apache.flex.events * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - override public function get currentTarget():Object + public function get currentTarget():Object + { + return wrappedEvent ? getTargetWrapper(wrappedEvent.currentTarget) : _target; + } + public function set currentTarget(value:Object):void { - return wrappedEvent ? getTargetWrapper(wrappedEvent.currentTarget) : super.currentTarget; + _target = value; } // TODO remove this when figure out how to preserve the real target http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93ff285a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/TextContainerManager.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/TextContainerManager.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/TextContainerManager.as index 457dd88..cb27e6c 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/TextContainerManager.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/TextContainerManager.as @@ -2554,14 +2554,6 @@ class RemappedMouseEvent extends org.apache.flex.events.MouseEvent public override function get stageY():Number { return _event.stageY; } - public override function cloneEvent():IFlexJSEvent - { - var rslt:RemappedMouseEvent = new RemappedMouseEvent(_event,true); - rslt.localX = localX; - rslt.localY = localY; - return rslt; - } - COMPILE::SWF public override function updateAfterEvent():void { _event.updateAfterEvent(); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93ff285a/manualtests/DataBindingTestbed/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/DataBindingTestbed/build.xml b/manualtests/DataBindingTestbed/build.xml index 9a14448..9c4ed2d 100644 --- a/manualtests/DataBindingTestbed/build.xml +++ b/manualtests/DataBindingTestbed/build.xml @@ -20,10 +20,11 @@ <project name="databindingexample" default="main" basedir="."> - <property name="FLEXJS_HOME" location="../.."/> + <property name="FLEXJS_HOME" location="../.."/> <property name="example" value="DataBindingTestbed" /> + <property name="swf.version" value="11" /> - <property file="${FLEXJS_HOME}/env.properties"/> + <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
