Repository: flex-asjs Updated Branches: refs/heads/develop 93c980ddf -> e32fc222c
This is kind of ugly and does not yet work It could be that we should subclass KeyboardEvent and MouseEvent for JS specifcally for BrowserEevnt use so the constructor does not need initialization. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a6cecd3a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a6cecd3a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a6cecd3a Branch: refs/heads/develop Commit: a6cecd3a74c35dedc419c279eb10e679763d99ee Parents: d67871b Author: Harbs <[email protected]> Authored: Wed Jul 19 13:26:59 2017 +0300 Committer: Harbs <[email protected]> Committed: Wed Jul 19 13:26:59 2017 +0300 ---------------------------------------------------------------------- .../org/apache/flex/core/HTMLElementWrapper.as | 22 ++++++++++-- .../flex/org/apache/flex/events/BrowserEvent.as | 10 ++++-- .../org/apache/flex/events/IBrowserEvent.as | 35 ++++++++++++++++++++ .../org/apache/flex/events/KeyboardEvent.as | 16 +++++++++ .../flex/org/apache/flex/events/MouseEvent.as | 12 +++++++ 5 files changed, 89 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a6cecd3a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as index f104b83..629ffd8 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as @@ -32,6 +32,9 @@ package org.apache.flex.core import goog.events; import goog.events.EventTarget; import org.apache.flex.events.utils.EventUtils; + import org.apache.flex.events.KeyboardEvent; + import org.apache.flex.events.MouseEvent; + import goog.events.BrowserEvent; } COMPILE::SWF @@ -59,10 +62,23 @@ package org.apache.flex.core * @param eventObject The event object to pass to the listener. * @return Result of listener. */ - static public function fireListenerOverride(listener:Object, eventObject:BrowserEvent):Boolean + static public function fireListenerOverride(listener:Object, eventObject:goog.events.BrowserEvent):Boolean { - var e:BrowserEvent = new BrowserEvent(); - e.wrappedEvent = eventObject; + var e:IBrowserEvent; + switch(eventObject.event_.constructor.name) + { + case "KeyboardEvent": + e = new KeyboardEvent(); + break; + case "MouseEvent": + e = new MouseEvent(); + break; + default: + e = new org.apache.flex.events.BrowserEvent(); + break; + } + + e.wrapEvent(eventObject); return HTMLElementWrapper.googFireListener(listener, e); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a6cecd3a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/BrowserEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/BrowserEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/BrowserEvent.as index 402fc4d..d86fbd8 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/BrowserEvent.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/BrowserEvent.as @@ -57,7 +57,7 @@ package org.apache.flex.events * @productversion FlexJS 0.0 */ COMPILE::JS - public class BrowserEvent + public class BrowserEvent implements IBrowserEvent { //-------------------------------------- @@ -69,6 +69,10 @@ package org.apache.flex.events */ public var wrappedEvent:Object; + public function wrapEvent(event:goog.events.BrowserEvent):void + { + wrappedEvent = event; + } //-------------------------------------- // Function //-------------------------------------- @@ -435,8 +439,8 @@ package org.apache.flex.events */ public function stopImmediatePropagation():void { - //wrappedEvent.stopImmediatePropagation(); // not in goog.events.BrowserEvent - wrappedEvent.stopPropagation(); + wrappedEvent.event_.stopImmediatePropagation(); // not in goog.events.BrowserEvent + // wrappedEvent.stopPropagation(); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a6cecd3a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IBrowserEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IBrowserEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IBrowserEvent.as new file mode 100644 index 0000000..ca9ee6d --- /dev/null +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IBrowserEvent.as @@ -0,0 +1,35 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to You under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +//////////////////////////////////////////////////////////////////////////////// +package org.apache.flex.events +{ + COMPILE::JS + { + import goog.events.BrowserEvent; + } + + COMPILE::JS + public interface IBrowserEvent + { + function wrapEvent(event:goog.events.BrowserEvent):void; + } + COMPILE::SWF + public interface IBrowserEvent + { + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a6cecd3a/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 aba6a53..fbb4a79 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 @@ -18,6 +18,10 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.events { + COMPILE::JS + { + import goog.events.BrowserEvent; + } public class KeyboardEvent extends Event { COMPILE::SWF @@ -30,6 +34,18 @@ package org.apache.flex.events COMPILE::JS public static const KEY_UP:String = "keyup"; + /** + * @type {?goog.events.BrowserEvent} + */ + COMPILE::JS + public var wrappedEvent:Object; + + COMPILE::JS + public function wrapEvent(event:goog.events.BrowserEvent):void + { + wrappedEvent = event; + } + public function KeyboardEvent( type:String, key:String, http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a6cecd3a/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 3392d55..6414042 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 @@ -28,6 +28,7 @@ package org.apache.flex.events { import window.MouseEvent; import org.apache.flex.events.utils.EventUtils; + import goog.events.BrowserEvent; } import org.apache.flex.core.IFlexJSElement; @@ -254,6 +255,17 @@ package org.apache.flex.events this.clickCount = clickCount; } + /** + * @type {?goog.events.BrowserEvent} + */ + public var wrappedEvent:Object; + + COMPILE::JS + public function wrapEvent(event:goog.events.BrowserEvent):void + { + wrappedEvent = event; + } + private var _localX:Number; public function get localX():Number {
