[royale-asjs] branch develop updated: ElementWrapper: fix issue where missing @export would cause MouseEventConverter and KeyboardEventConverter to break due to Closure compiler renaming (references #641)

[joshtynjala]

This is an automated email from the ASF dual-hosted git repository.

joshtynjala 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 e02af03  ElementWrapper: fix issue where missing @export would cause 
MouseEventConverter and KeyboardEventConverter to break due to Closure compiler 
renaming (references #641)
e02af03 is described below

commit e02af03cb0a6474429daf629c01a6c36409c6224
Author: Josh Tynjala <joshtynj...@apache.org>
AuthorDate: Wed Jan 15 13:28:57 2020 -0800

    ElementWrapper: fix issue where missing @export would cause 
MouseEventConverter and KeyboardEventConverter to break due to Closure compiler 
renaming (references #641)
---
 .../Core/src/main/royale/org/apache/royale/core/ElementWrapper.as   | 4 ++--
 .../Core/src/main/royale/org/apache/royale/events/KeyboardEvent.as  | 2 +-
 .../Core/src/main/royale/org/apache/royale/events/MouseEvent.as     | 2 +-
 frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as | 6 +++---
 .../SparkRoyale/src/main/royale/spark/components/Application.as     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as
 
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as
index d5649ef..fe9de76 100644
--- 
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as
+++ 
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as
@@ -190,9 +190,9 @@ package org.apache.royale.core
                {
             var e:IBrowserEvent;
             var nativeEvent:Object = eventObject.getBrowserEvent();
-            var converter:Object = converterMap[nativeEvent.constructor.name];
+            var converter:Function = 
converterMap[nativeEvent.constructor.name];
             if (converter)
-                e = converter["convert"](nativeEvent,eventObject);
+                e = converter(nativeEvent,eventObject);
             else
             {
                 e = new org.apache.royale.events.BrowserEvent();
diff --git 
a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/KeyboardEvent.as
 
b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/KeyboardEvent.as
index a2436e7..4fa0f51 100644
--- 
a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/KeyboardEvent.as
+++ 
b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/KeyboardEvent.as
@@ -358,7 +358,7 @@ package org.apache.royale.events
         COMPILE::JS
         public static function setupConverter():Boolean
         {
-            ElementWrapper.converterMap["KeyboardEvent"] = 
KeyboardEventConverter;
+            ElementWrapper.converterMap["KeyboardEvent"] = 
KeyboardEventConverter.convert;
             return true;
         }
         
diff --git 
a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/MouseEvent.as
 
b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/MouseEvent.as
index d285aa0..6fbd371 100644
--- 
a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/MouseEvent.as
+++ 
b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/MouseEvent.as
@@ -825,7 +825,7 @@ package org.apache.royale.events
         
         public static function setupConverter():Boolean
         {
-            ElementWrapper.converterMap["MouseEvent"] = MouseEventConverter;
+            ElementWrapper.converterMap["MouseEvent"] = 
MouseEventConverter.convert;
             _useNativeConstructor = typeof window.MouseEvent == 'function';
             return true;
         }
diff --git 
a/frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as 
b/frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as
index 525bed2..ce2874b 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as
@@ -632,9 +632,9 @@ public class Application extends Container implements 
IStrand, IParent, IEventDi
        COMPILE::JS
        public function initializeApplication():void
        {
-        ElementWrapper.converterMap["MouseEvent"] = MouseEventConverter;
-        ElementWrapper.converterMap["KeyboardEvent"] = KeyboardEventConverter;
-        ElementWrapper.converterMap["FocusEvent"] = FocusEventConverter;
+        ElementWrapper.converterMap["MouseEvent"] = 
MouseEventConverter.convert;
+        ElementWrapper.converterMap["KeyboardEvent"] = 
KeyboardEventConverter.convert;
+        ElementWrapper.converterMap["FocusEvent"] = 
FocusEventConverter.convert;
         addEventListener(KeyboardEvent.KEY_DOWN, keyDownForCapsLockHandler);
         
         initManagers();
diff --git 
a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/Application.as
 
b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/Application.as
index 0a85538..186fccd 100644
--- 
a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/Application.as
+++ 
b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/Application.as
@@ -324,7 +324,7 @@ public class Application extends SkinnableContainer 
implements IStrand, IParent,
         
         COMPILE::JS
         {
-            ElementWrapper.converterMap["MouseEvent"] = MouseEventConverter;
+            ElementWrapper.converterMap["MouseEvent"] = 
MouseEventConverter.convert;
         }
     }