You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2017/07/31 22:31:28 UTC
[07/50] [abbrv] git commit: [flex-asjs] [refs/heads/feature/amf] -
goog.Event assumes the getter can be called on the event. Default to the
super getter if wrappedEvent is not set (yet).
goog.Event assumes the getter can be called on the event. Default to the super getter if wrappedEvent is not set (yet).
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3b2a8feb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3b2a8feb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3b2a8feb
Branch: refs/heads/feature/amf
Commit: 3b2a8feb763771d6d3e371d89b251068d0cca4fc
Parents: f53e941
Author: Harbs <ha...@in-tools.com>
Authored: Sun Jul 23 11:36:48 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Sun Jul 23 11:36:48 2017 +0300
----------------------------------------------------------------------
.../Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as | 4 ++--
.../Core/src/main/flex/org/apache/flex/events/MouseEvent.as | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3b2a8feb/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 a05240a..f60110f 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
@@ -78,7 +78,7 @@ package org.apache.flex.events
COMPILE::JS
public function get target():Object
{
- return getTargetWrapper(wrappedEvent.target);
+ return wrappedEvent ? getTargetWrapper(wrappedEvent.target) : super.target;
}
/**
@@ -92,7 +92,7 @@ package org.apache.flex.events
COMPILE::JS
public function get currentTarget():Object
{
- return getTargetWrapper(wrappedEvent.currentTarget);
+ return wrappedEvent ? getTargetWrapper(wrappedEvent.currentTarget) : super.currentTarget;
}
private var _key:String;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3b2a8feb/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 bef5531..1296065 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
@@ -337,7 +337,7 @@ package org.apache.flex.events
*/
public function get target():Object
{
- return getTargetWrapper(wrappedEvent.target);
+ return wrappedEvent ? getTargetWrapper(wrappedEvent.target) : super.target;
}
/**
@@ -350,7 +350,7 @@ package org.apache.flex.events
*/
public function get currentTarget():Object
{
- return getTargetWrapper(wrappedEvent.currentTarget);
+ return wrappedEvent ? getTargetWrapper(wrappedEvent.currentTarget) : super.currentTarget;
}
// TODO remove this when figure out how to preserve the real target