[royale-typedefs] branch develop updated: adjust typedefs to eliminate conflicting definitions

[ah...@apache.org]

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

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-typedefs.git


The following commit(s) were added to refs/heads/develop by this push:
     new 067c089  adjust typedefs to eliminate conflicting definitions
067c089 is described below

commit 067c0897946d9447a51ba7b9642eed0ec9e50a66
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Oct 29 00:19:56 2018 -0700

    adjust typedefs to eliminate conflicting definitions
---
 GCL/src/main/royale/goog/events/Event.as  | 24 +++++++++++++++++++++---
 jquery/src/main/config/externc-config.xml |  1 +
 js/src/main/config/externc-config.xml     | 28 ++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/GCL/src/main/royale/goog/events/Event.as b/GCL/src/main/royale/goog/events/Event.as
index d8064ce..ec04192 100644
--- a/GCL/src/main/royale/goog/events/Event.as
+++ b/GCL/src/main/royale/goog/events/Event.as
@@ -35,9 +35,27 @@ public class Event {
     }
 
     public var type:String;
-    public var target:Object;
-    public var currentTarget:Object;
-    public var defaultPrevented:Boolean;
+    public function get target():Object
+    {
+        return null;
+    }
+    public function set target(value:Object):void
+    {
+    }
+    public function get currentTarget():Object
+    {
+        return null;
+    }
+    public function set currentTarget(value:Object):void
+    {
+    }
+    public function get defaultPrevented():Boolean
+    {
+        return null;
+    }
+    public function set defaultPrevented(value:Boolean):void
+    {
+    }
 
     public function stopPropagation():void {}
     public function preventDefault():void {}
diff --git a/jquery/src/main/config/externc-config.xml b/jquery/src/main/config/externc-config.xml
index 7e8fe3f..a0c5a16 100644
--- a/jquery/src/main/config/externc-config.xml
+++ b/jquery/src/main/config/externc-config.xml
@@ -43,6 +43,7 @@
     <exclude><class>jQuery</class><name>post</name></exclude>
     <exclude><class>jQuery</class><name>getScript</name></exclude>
     <exclude><class>jQuery</class><name>Callbacks</name></exclude>
+    <exclude><class>jQuery.jqXHR</class><name>onreadystatechange</name></exclude>
 
     <class-exclude><class>Deferred</class></class-exclude>
     <class-exclude><class>jQuery.deferred</class></class-exclude>
diff --git a/js/src/main/config/externc-config.xml b/js/src/main/config/externc-config.xml
index f959087..1a57c5c 100644
--- a/js/src/main/config/externc-config.xml
+++ b/js/src/main/config/externc-config.xml
@@ -168,6 +168,34 @@
         <class>DataTransferItem</class>
         <name>webkitGetAsEntry</name>
     </exclude>
+    <exclude>
+        <class>Document</class>
+        <name>loadXML</name>
+    </exclude>
+    <exclude>
+        <class>Event</class>
+        <name>initUIEvent</name>
+    </exclude>
+    <exclude>
+        <class>Event</class>
+        <name>initMessageEvent</name>
+    </exclude>
+    <exclude>
+        <class>Element</class>
+        <name>load</name>
+    </exclude>
+    <exclude>
+        <class>Document</class>
+        <name>open</name>
+    </exclude>
+    <exclude>
+        <class>Document</class>
+        <name>close</name>
+    </exclude>
+    <exclude>
+        <class>Document</class>
+        <name>createTreeWalker</name>
+    </exclude>
     <!-- SVG -->
     <exclude><class>SVGStylable</class><name>className</name></exclude>
     <exclude><class>SVGStylable</class><name>style</name></exclude>