You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2015/04/15 21:05:18 UTC
git commit: [flex-asjs] [refs/heads/develop] - Added missing
setter/getter define properties;
removed unnecessary width and height setters from mobile TabBar.
Repository: flex-asjs
Updated Branches:
refs/heads/develop 783b8438c -> 1a7aa8ae0
Added missing setter/getter define properties; removed unnecessary width and height setters from mobile TabBar.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1a7aa8ae
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1a7aa8ae
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1a7aa8ae
Branch: refs/heads/develop
Commit: 1a7aa8ae051fe5e77720d0cc18c4d4223434fd76
Parents: 783b843
Author: Peter Ent <pe...@apache.org>
Authored: Wed Apr 15 15:05:15 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Wed Apr 15 15:05:15 2015 -0400
----------------------------------------------------------------------
.../src/org/apache/flex/mobile/chrome/TabBar.as | 30 --------------------
.../src/org/apache/flex/events/BrowserEvent.js | 14 +++++++++
.../html/supportClasses/StringItemRenderer.js | 4 +++
.../src/org/apache/flex/mobile/ManagerBase.js | 23 +++++++++------
4 files changed, 32 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a7aa8ae/frameworks/as/projects/FlexJSJX/src/org/apache/flex/mobile/chrome/TabBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/mobile/chrome/TabBar.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/mobile/chrome/TabBar.as
index 7ab2047..6e54326 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/mobile/chrome/TabBar.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/mobile/chrome/TabBar.as
@@ -46,35 +46,5 @@ package org.apache.flex.mobile.chrome
className = "TabBar";
}
-
- /**
- * Sets the width of the TabBar.
- *
- * @param value The new width in pixels.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- override public function set width(value:Number):void
- {
- super.width = value;
- }
-
- /**
- * Sets the height of the TabBar.
- *
- * @param value The new height in pixels.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- override public function set height(value:Number):void
- {
- super.height = value;
- }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a7aa8ae/frameworks/js/FlexJS/src/org/apache/flex/events/BrowserEvent.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/events/BrowserEvent.js b/frameworks/js/FlexJS/src/org/apache/flex/events/BrowserEvent.js
index 7f80b0a..b2f7f91 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/events/BrowserEvent.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/events/BrowserEvent.js
@@ -53,6 +53,20 @@ org_apache_flex_events_BrowserEvent.prototype.preventDefault = function() {
};
+/**
+ */
+org_apache_flex_events_BrowserEvent.prototype.stopPropagation = function() {
+ this.wrappedEvent.stopPropagation();
+};
+
+
+/**
+ */
+org_apache_flex_events_BrowserEvent.prototype.stopImmediatePropagation = function() {
+ this.wrappedEvent.stopImmediatePropagation();
+};
+
+
Object.defineProperties(org_apache_flex_events_BrowserEvent.prototype, {
/** @expose */
currentTarget: {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a7aa8ae/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js
index 3e977dc..35bc6ba 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js
@@ -99,6 +99,10 @@ Object.defineProperties(org_apache_flex_html_supportClasses_StringItemRenderer.p
/** @this {org_apache_flex_html_supportClasses_StringItemRenderer} */
set: function(value) {
this.index_ = value;
+ },
+ /** @this {org_apache_flex_html_supportClasses_StringItemRenderer} */
+ get: function() {
+ return this.index_;
}
},
/** @expose */
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a7aa8ae/frameworks/js/FlexJS/src/org/apache/flex/mobile/ManagerBase.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/mobile/ManagerBase.js b/frameworks/js/FlexJS/src/org/apache/flex/mobile/ManagerBase.js
index 0c705e6..9e9557a 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/mobile/ManagerBase.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/mobile/ManagerBase.js
@@ -47,14 +47,19 @@ org_apache_flex_mobile_ManagerBase.prototype.FLEXJS_CLASS_INFO =
org_apache_flex_mobile_ManagerBase.prototype._contentArea = null;
-/**
- * @expose
- * @return {Object} The content area for this manager.
- */
-org_apache_flex_mobile_ManagerBase.prototype.get_contentArea =
- function() {
- return this._contentArea;
-};
+Object.defineProperties(org_apache_flex_mobile_ManagerBase.prototype, {
+ /** @expose */
+ contentArea: {
+ /** @this {org_apache_flex_core_UIBase} */
+ get: function() {
+ return this._contentArea;
+ },
+ /** @this {org_apache_flex_core_UIBase} */
+ set: function(value) {
+ this._contentArea = value;
+ }
+ }
+});
/**
@@ -121,7 +126,7 @@ org_apache_flex_mobile_ManagerBase.prototype.createElement =
this.element.flexjs_wrapper = this;
this._contentArea = new org_apache_flex_core_UIBase();
- this._contentArea.set_className('ContentArea');
+ this._contentArea.className = 'ContentArea';
org_apache_flex_core_UIBase.prototype.addElement.call(this, this._contentArea);
return this.element;