Updated Branches: refs/heads/develop 355fdd698 -> 2ecfb7b39
fix event handling for FalconJX output Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2ecfb7b3 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2ecfb7b3 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2ecfb7b3 Branch: refs/heads/develop Commit: 2ecfb7b39ddddd4313157712eb3e901707d17672 Parents: 51ddf0c Author: Alex Harui <[email protected]> Authored: Tue Apr 2 21:24:52 2013 -0700 Committer: Alex Harui <[email protected]> Committed: Tue Apr 2 21:25:12 2013 -0700 ---------------------------------------------------------------------- .../src/org/apache/flex/core/HTMLElementWrapper.js | 9 +++++++- .../src/org/apache/flex/events/CustomEvent.js | 14 +++++++----- .../js/FlexJS/src/org/apache/flex/events/Event.js | 17 ++++++++------ 3 files changed, 26 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2ecfb7b3/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js b/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js index ed123dc..95157d8 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js @@ -55,7 +55,14 @@ org.apache.flex.core.HTMLElementWrapper.prototype.addEventListener = org.apache.flex.core.HTMLElementWrapper.prototype.dispatchEvent = function(evt) { if (this.element.addEventListener) - this.element.dispatchEvent(evt); + { + try { + this.element.dispatchEvent(evt); + } catch (e) { + var domevt = this.createEvent(evt.type); + this.element.dispatchEvent(domevt); + } + } else if (this.element.attachEvent || !this.element.dispatchEvent) org.apache.flex.utils.IE8Utils.dispatchEvent(this, this.element, evt) }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2ecfb7b3/frameworks/js/FlexJS/src/org/apache/flex/events/CustomEvent.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/events/CustomEvent.js b/frameworks/js/FlexJS/src/org/apache/flex/events/CustomEvent.js index 97c64e2..a218459 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/events/CustomEvent.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/events/CustomEvent.js @@ -17,12 +17,8 @@ goog.provide('org.apache.flex.events.CustomEvent'); /** * @constructor */ -org.apache.flex.events.CustomEvent = function() { - /** - * @private - * @type {string} - */ - this.type_; +org.apache.flex.events.CustomEvent = function(type) { + this.type = type; }; /** @@ -32,3 +28,9 @@ org.apache.flex.events.CustomEvent = function() { org.apache.flex.events.CustomEvent.prototype.init = function(type) { this.type_ = type; }; + +/** + * @expose + * @type {string} type The event type. + */ +org.apache.flex.events.CustomEvent.prototype.type; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2ecfb7b3/frameworks/js/FlexJS/src/org/apache/flex/events/Event.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/events/Event.js b/frameworks/js/FlexJS/src/org/apache/flex/events/Event.js index 9b824bc..3c0e20c 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/events/Event.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/events/Event.js @@ -17,12 +17,8 @@ goog.provide('org.apache.flex.events.Event'); /** * @constructor */ -org.apache.flex.events.Event = function() { - /** - * @private - * @type {string} - */ - this.type_; +org.apache.flex.events.Event = function(type) { + this.type = type; }; /** @@ -30,5 +26,12 @@ org.apache.flex.events.Event = function() { * @param {string} type The event type. */ org.apache.flex.events.Event.prototype.init = function(type) { - this.type_ = type; + this.type = type; }; + +/** + * @expose + * @type {string} type The event type. + */ +org.apache.flex.events.Event.prototype.type; +
