You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2019/01/04 09:19:38 UTC
[royale-asjs] branch develop updated: Revert "refactor how
converters get added so it is PAYG and extensible (a future GestureEvent
could bring in its own converter,
same for FocusEvents). This also saves 14K off HelloWorld in js-release"
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 0379859 Revert "refactor how converters get added so it is PAYG and extensible (a future GestureEvent could bring in its own converter, same for FocusEvents). This also saves 14K off HelloWorld in js-release"
0379859 is described below
commit 0379859d6bf703402abac2cf45bd785e496ed4cb
Author: Alex Harui <ah...@apache.org>
AuthorDate: Fri Jan 4 01:19:08 2019 -0800
Revert "refactor how converters get added so it is PAYG and extensible (a future GestureEvent could bring in its own converter, same for FocusEvents). This also saves 14K off HelloWorld in js-release"
This reverts commit 41899ef9b30d842d489d0766847facff1efc591d.
---
.../royale/org/apache/royale/core/HTMLElementWrapper.as | 8 +++++++-
.../main/royale/org/apache/royale/events/KeyboardEvent.as | 13 -------------
.../src/main/royale/org/apache/royale/events/MouseEvent.as | 13 +------------
3 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as
index 4ebff5a..7d00bc7 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as
@@ -33,9 +33,13 @@ package org.apache.royale.core
import org.apache.royale.events.ElementEvents;
import org.apache.royale.events.EventDispatcher;
import goog.events;
- import goog.events.BrowserEvent;
import goog.events.EventTarget;
import org.apache.royale.events.utils.EventUtils;
+ import org.apache.royale.events.KeyboardEvent;
+ import org.apache.royale.events.MouseEvent;
+ import goog.events.BrowserEvent;
+ import org.apache.royale.events.utils.KeyboardEventConverter;
+ import org.apache.royale.events.utils.MouseEventConverter;
}
COMPILE::SWF
@@ -89,6 +93,8 @@ package org.apache.royale.core
{
HTMLElementWrapper.googFireListener = goog.events.fireListener;
goog.events.fireListener = HTMLElementWrapper.fireListenerOverride;
+ converterMap["KeyboardEvent"] = KeyboardEventConverter;
+ converterMap["MouseEvent"] = MouseEventConverter;
return true;
}
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 ac29ba3..95a0e3e 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
@@ -21,9 +21,7 @@ package org.apache.royale.events
COMPILE::JS
{
import goog.events.BrowserEvent;
- import org.apache.royale.core.HTMLElementWrapper;
import org.apache.royale.events.Event;
- import org.apache.royale.events.utils.KeyboardEventConverter;
}
import org.apache.royale.events.IBrowserEvent;
@@ -283,16 +281,5 @@ package org.apache.royale.events
{
return new KeyboardEvent(type, key, code, shiftKey, altKey, ctrlKey, metaKey, bubbles, cancelable);
}
-
- COMPILE::JS
- public static function setupConverter():Boolean
- {
- HTMLElementWrapper.converterMap["KeyboardEvent"] = KeyboardEventConverter;
- return true;
- }
-
- COMPILE::JS
- public static var initialized:Boolean = setupConverter();
-
}
}
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 ff1976e..e34a1ed 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
@@ -28,16 +28,14 @@ package org.apache.royale.events
{
import window.MouseEvent;
import goog.events.BrowserEvent;
- import org.apache.royale.core.HTMLElementWrapper;
import org.apache.royale.events.Event;
import org.apache.royale.events.utils.EventUtils;
- import org.apache.royale.events.utils.MouseEventConverter;
}
import org.apache.royale.core.IRoyaleElement;
- import org.apache.royale.events.IBrowserEvent;
import org.apache.royale.geom.Point;
import org.apache.royale.utils.PointUtils;
+ import org.apache.royale.events.IBrowserEvent;
/**
@@ -732,14 +730,5 @@ package org.apache.royale.events
wrappedEvent.stopPropagation();
}
- COMPILE::JS
- public static function setupConverter():Boolean
- {
- HTMLElementWrapper.converterMap["MouseEvent"] = MouseEventConverter;
- return true;
- }
-
- COMPILE::JS
- public static var initialized:Boolean = setupConverter();
}
}