You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2019/12/21 17:41:03 UTC
[royale-asjs] branch develop updated: temporary fix for bad typedef
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 1b0e9b5 temporary fix for bad typedef
1b0e9b5 is described below
commit 1b0e9b56140baceba3a6f42b2d67b10dfd380e6d
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sat Dec 21 19:40:46 2019 +0200
temporary fix for bad typedef
---
.../org/apache/royale/events/utils/KeyboardEventConverter.as | 7 ++++++-
.../royale/org/apache/royale/events/utils/MouseEventConverter.as | 8 +++++++-
.../src/main/royale/mx/events/utils/KeyboardEventConverter.as | 7 ++++++-
.../src/main/royale/mx/events/utils/MouseEventConverter.as | 8 +++++++-
4 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/utils/KeyboardEventConverter.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/utils/KeyboardEventConverter.as
index 54ac6ee..33b5d29 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/utils/KeyboardEventConverter.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/utils/KeyboardEventConverter.as
@@ -28,6 +28,7 @@ package org.apache.royale.events.utils
COMPILE::JS
{
import goog.events.BrowserEvent;
+ import goog.events.Event;
}
/**
@@ -74,6 +75,10 @@ package org.apache.royale.events.utils
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.8
+ * @royaleignorecoercion Event
+ * @royaleignorecoercion goog.events.Event
+ * We're lying to the compiler for now because it thinks it's supposed to accept a goog.events.Event.
+ * We need to fix this in typedefs
*/
COMPILE::JS
public static function convert(nativeEvent:Object,browserEvent:goog.events.BrowserEvent=null):KeyboardEvent
@@ -90,7 +95,7 @@ package org.apache.royale.events.utils
var newEvent:KeyboardEvent = new KeyboardEvent(type, key, code, nativeEvent["shiftKey"]);
if(!browserEvent)
{
- browserEvent = new goog.events.BrowserEvent(nativeEvent,nativeEvent["currentTarget"]);
+ browserEvent = new goog.events.BrowserEvent(nativeEvent as goog.events.Event,nativeEvent["currentTarget"]);
}
newEvent.wrapEvent(browserEvent);
return newEvent;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/utils/MouseEventConverter.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/utils/MouseEventConverter.as
index 4cdbc3f..fd61676 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/utils/MouseEventConverter.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/utils/MouseEventConverter.as
@@ -26,6 +26,7 @@ package org.apache.royale.events.utils
COMPILE::JS
{
import goog.events.BrowserEvent;
+ import goog.events.Event;
}
import org.apache.royale.events.MouseEvent;
@@ -182,12 +183,17 @@ package org.apache.royale.events.utils
COMPILE::JS
public class MouseEventConverter
{
+ /**
+ * @royaleignorecoercion goog.events.Event
+ * We're lying to the compiler for now because it thinks it's supposed to accept a goog.events.Event.
+ * We need to fix this in typedefs
+ */
public static function convert(nativeEvent:Object,browserEvent:goog.events.BrowserEvent=null):MouseEvent
{
var event:MouseEvent = new MouseEvent(nativeEvent["type"], nativeEvent["bubbles"], nativeEvent["cancelable"]);
if(!browserEvent)
{
- browserEvent = new goog.events.BrowserEvent(nativeEvent,nativeEvent["currentTarget"]);
+ browserEvent = new goog.events.BrowserEvent(nativeEvent as goog.events.Event,nativeEvent["currentTarget"]);
}
event.wrapEvent(browserEvent);
return event;
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/events/utils/KeyboardEventConverter.as b/frameworks/projects/MXRoyale/src/main/royale/mx/events/utils/KeyboardEventConverter.as
index 533322b..f734c27 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/events/utils/KeyboardEventConverter.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/events/utils/KeyboardEventConverter.as
@@ -31,6 +31,7 @@ package mx.events.utils
COMPILE::JS
{
import goog.events.BrowserEvent;
+ import goog.events.Event;
}
/**
@@ -73,6 +74,10 @@ package mx.events.utils
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.8
+ * @royaleignorecoercion Event
+ * @royaleignorecoercion goog.events.Event
+ * We're lying to the compiler for now because it thinks it's supposed to accept a goog.events.Event.
+ * We need to fix this in typedefs
*/
COMPILE::JS
public static function convert(nativeEvent:Object,browserEvent:goog.events.BrowserEvent=null):KeyboardEvent
@@ -95,7 +100,7 @@ package mx.events.utils
var newEvent:KeyboardEvent = new KeyboardEvent(type, key, code, nativeEvent["shiftKey"]);
if(!browserEvent)
{
- browserEvent = new goog.events.BrowserEvent(nativeEvent,nativeEvent["currentTarget"]);
+ browserEvent = new goog.events.BrowserEvent(nativeEvent as goog.events.Event,nativeEvent["currentTarget"]);
}
newEvent.wrapEvent(browserEvent);
return newEvent;
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/events/utils/MouseEventConverter.as b/frameworks/projects/MXRoyale/src/main/royale/mx/events/utils/MouseEventConverter.as
index 5a22034..aa4c831 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/events/utils/MouseEventConverter.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/events/utils/MouseEventConverter.as
@@ -27,6 +27,7 @@ package mx.events.utils
COMPILE::JS
{
import goog.events.BrowserEvent;
+ import goog.events.Event;
}
import mx.core.Keyboard;
@@ -184,6 +185,11 @@ package mx.events.utils
COMPILE::JS
public class MouseEventConverter
{
+ /**
+ * @royaleignorecoercion goog.events.Event
+ * We're lying to the compiler for now because it thinks it's supposed to accept a goog.events.Event.
+ * We need to fix this in typedefs
+ */
public static function convert(nativeEvent:Object,browserEvent:goog.events.BrowserEvent=null):mx.events.MouseEvent
{
if (nativeEvent.hasOwnProperty("getModifierState"))
@@ -193,7 +199,7 @@ package mx.events.utils
var event:mx.events.MouseEvent = new mx.events.MouseEvent(nativeEvent["type"], nativeEvent["bubbles"], nativeEvent["cancelable"]);
if(!browserEvent)
{
- browserEvent = new goog.events.BrowserEvent(nativeEvent,nativeEvent["currentTarget"]);
+ browserEvent = new goog.events.BrowserEvent(nativeEvent as goog.events.Event,nativeEvent["currentTarget"]);
}
event.wrapEvent(browserEvent);
return event;