more fixups for defineprop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/116441cd Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/116441cd Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/116441cd Branch: refs/heads/develop Commit: 116441cdae9f749be3a0474a4fd52d1c014c59cf Parents: 68c4875 Author: Alex Harui <[email protected]> Authored: Fri Mar 27 08:31:17 2015 -0700 Committer: Alex Harui <[email protected]> Committed: Fri Mar 27 08:31:17 2015 -0700 ---------------------------------------------------------------------- .../src/org/apache/flex/core/Application.js | 8 ++- .../src/org/apache/flex/core/ContainerBase.js | 7 ++- .../org/apache/flex/core/HTMLElementWrapper.js | 64 +------------------- .../org/apache/flex/core/SimpleCSSValuesImpl.js | 2 +- .../src/org/apache/flex/html/DropDownList.js | 1 + .../src/org/apache/flex/html/TextInput.js | 1 + .../TextItemRendererFactoryForArrayData.js | 2 + 7 files changed, 19 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/116441cd/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js b/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js index fdf34d4..aab8e23 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js @@ -68,12 +68,18 @@ org_apache_flex_core_Application.prototype.model = null; Object.defineProperties(org_apache_flex_core_Application.prototype, { 'valuesImpl': { /** @this {org_apache_flex_core_Application} */ - set: function() { + set: function(value) { org_apache_flex_core_ValuesManager.valuesImpl = value; if (value.init) { value.init(this); } } + }, + 'MXMLDescriptor': { + /** @this {org_apache_flex_core_Application} */ + get: function() { + return null; + } } }); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/116441cd/frameworks/js/FlexJS/src/org/apache/flex/core/ContainerBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/ContainerBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/ContainerBase.js index 77fabb7..b86f09b 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/ContainerBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/ContainerBase.js @@ -52,7 +52,12 @@ org_apache_flex_core_ContainerBase = function() { */ this.currentState_ = null; - + /** + * @private + * @type {?Array} + */ + this.mxmlDescriptor = null; + this.document = this; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/116441cd/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 f33d7c3..e1d9454 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js @@ -127,66 +127,4 @@ org_apache_flex_core_HTMLElementWrapper.prototype.removeBead = function(bead) { } return null; -}; - - -Object.defineProperties(Event.prototype, { - /** Hack to allow event.target expressions to work - * - * @expose - * @return {Object} The wrapping object. - */ - 'target': { - /** @this {Event} */ - get: function() { - var obj = this.target; - if (!obj) - return this.currentTarget; - return obj.flexjs_wrapper; - } - }, - /** - * Hack to allow event.currentTarget to work - * @return {Object} The wrapping object. - */ - 'currentTarget': { - /** @this {Event} */ - get: function() { - return this.currentTarget.flexjs_wrapper; - } - } -}); - - -Object.defineProperties(goog.events.BrowserEvent.prototype, { - /** - * Hack to allow event.target expressions to work - * - * @expose - * @return {Object} The wrapping object. - */ - 'target': { - /** @this {goog.events.BrowserEvent} */ - get: function() { - // if it is a faked event so just return the target - if (!this.event_) return this.target; - // for true browser events, get the embedded event's target - return this.event_.target; - } - }, - /** - * Hack to allow event.currentTarget expressions to work - * - * @expose - * @return {?Node|Object} The wrapping object. - */ - 'currentTarget': { - /** @this {goog.events.BrowserEvent} */ - get: function() { - // if it is a faked event so just return the currentTarget - if (!this.event_) return this.currentTarget; - // for true browser events, get the embedded event's currentTarget - return this.event_.currentTarget; - } - } -}); \ No newline at end of file +}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/116441cd/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js b/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js index f1dce9f..23c068d 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js @@ -74,7 +74,7 @@ org_apache_flex_core_SimpleCSSValuesImpl.prototype.getValue = var cName; var selectorName; - if (typeof(thisObject.hasOwnPropertY('style')) === 'function') + if (typeof(thisObject.hasOwnProperty('style')) === 'function') { var style = thisObject.style; if (style != null) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/116441cd/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js index 5ebe2e3..22668f5 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js @@ -15,6 +15,7 @@ goog.provide('org_apache_flex_html_DropDownList'); goog.require('org_apache_flex_core_ListBase'); +goog.require('org_apache_flex_html_beads_models_ArraySelectionModel'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/116441cd/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js b/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js index 5e11d7e..cae09d7 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js @@ -15,6 +15,7 @@ goog.provide('org_apache_flex_html_TextInput'); goog.require('org_apache_flex_core_UIBase'); +goog.require('org_apache_flex_events_Event'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/116441cd/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js index e88dedd..6161347 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js @@ -16,8 +16,10 @@ goog.provide('org_apache_flex_html_beads_TextItemRendererFactoryForArrayData'); goog.require('org_apache_flex_core_IDataProviderItemRendererMapper'); goog.require('org_apache_flex_core_IItemRenderer'); +goog.require('org_apache_flex_events_Event'); goog.require('org_apache_flex_events_EventDispatcher'); goog.require('org_apache_flex_html_beads_models_ArraySelectionModel'); +goog.require('org_apache_flex_html_supportClasses_StringItemRenderer');
