Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 505742005E6 for ; Sun, 30 Jul 2017 22:51:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4EC51164028; Sun, 30 Jul 2017 20:51:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9527916402D for ; Sun, 30 Jul 2017 22:51:00 +0200 (CEST) Received: (qmail 41101 invoked by uid 500); 30 Jul 2017 20:50:59 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 41026 invoked by uid 99); 30 Jul 2017 20:50:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 30 Jul 2017 20:50:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C7435F32F7; Sun, 30 Jul 2017 20:50:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: harbs@apache.org To: commits@flex.apache.org Date: Sun, 30 Jul 2017 20:51:06 -0000 Message-Id: In-Reply-To: <36fe60c5e5fd4bde96ac67cd49bef318@git.apache.org> References: <36fe60c5e5fd4bde96ac67cd49bef318@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/23] git commit: [flex-asjs] [refs/heads/develop] - goog.Event assumes the getter can be called on the event. Default to the super getter if wrappedEvent is not set (yet). archived-at: Sun, 30 Jul 2017 20:51:01 -0000 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/develop Commit: 3b2a8feb763771d6d3e371d89b251068d0cca4fc Parents: f53e941 Author: Harbs Authored: Sun Jul 23 11:36:48 2017 +0300 Committer: Harbs 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