Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5242F1769B for ; Wed, 7 Jan 2015 12:30:31 +0000 (UTC) Received: (qmail 56206 invoked by uid 500); 7 Jan 2015 12:30:32 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 56172 invoked by uid 500); 7 Jan 2015 12:30:32 -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 56161 invoked by uid 99); 7 Jan 2015 12:30:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2015 12:30:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 199C9A26399; Wed, 7 Jan 2015 12:30:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pent@apache.org To: commits@flex.apache.org Date: Wed, 07 Jan 2015 12:30:32 -0000 Message-Id: <5141c7420e2e4b80935b89e270db2af9@git.apache.org> In-Reply-To: <1e8d3bfc50764688bebea4c246e00d7f@git.apache.org> References: <1e8d3bfc50764688bebea4c246e00d7f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: [flex-asjs] [refs/heads/develop] - Adjust ActionScript and JavaScript versions to produce like results. Adjust ActionScript and JavaScript versions to produce like results. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e845c6e5 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e845c6e5 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e845c6e5 Branch: refs/heads/develop Commit: e845c6e57460252b3315b6b9ec43ec9cc83cb532 Parents: c59a990 Author: Peter Ent Authored: Wed Jan 7 07:29:52 2015 -0500 Committer: Peter Ent Committed: Wed Jan 7 07:29:52 2015 -0500 ---------------------------------------------------------------------- .../org/apache/flex/events/utils/MouseUtils.as | 26 ++++++++++++++++++++ .../org/apache/flex/events/utils/MouseUtils.js | 20 ++++++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e845c6e5/frameworks/as/projects/FlexJSUI/src/org/apache/flex/events/utils/MouseUtils.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/events/utils/MouseUtils.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/events/utils/MouseUtils.as index de2add3..f22d91c 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/events/utils/MouseUtils.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/events/utils/MouseUtils.as @@ -73,5 +73,31 @@ package org.apache.flex.events.utils { return event.localY; } + + /** + * Returns the globel X value. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + static public function globalX(event:MouseEvent):Number + { + return event.stageX; + } + + /** + * Returns the global Y value. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + static public function globalY(event:MouseEvent):Number + { + return event.stageY; + } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e845c6e5/frameworks/js/FlexJS/src/org/apache/flex/events/utils/MouseUtils.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/events/utils/MouseUtils.js b/frameworks/js/FlexJS/src/org/apache/flex/events/utils/MouseUtils.js index 9ec27eb..4d8048d 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/events/utils/MouseUtils.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/events/utils/MouseUtils.js @@ -31,7 +31,7 @@ org.apache.flex.events.utils.MouseUtils.eventTarget = function(event) { * @return {number} The x position of the mouse with respect to its parent. */ org.apache.flex.events.utils.MouseUtils.localX = function(event) { - return event.clientX; + return event.offsetX; }; @@ -40,5 +40,23 @@ org.apache.flex.events.utils.MouseUtils.localX = function(event) { * @return {number} The y position of the mouse with respect to its parent. */ org.apache.flex.events.utils.MouseUtils.localY = function(event) { + return event.offsetY; +}; + + +/** + * @param {Object} event The event. + * @return {number} The x position of the mouse with respect to the screen. + */ +org.apache.flex.events.utils.MouseUtils.globalX = function(event) { + return event.clientX; +}; + + +/** + * @param {Object} event The event. + * @return {number} The y position of the mouse with respect to the screen. + */ +org.apache.flex.events.utils.MouseUtils.globalY = function(event) { return event.clientY; };