You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ca...@apache.org on 2013/05/03 01:55:30 UTC
[01/13] git commit: [flex-asjs]
[refs/heads/feature/createjs-checkbox] - fix event dispatch,
add missing getter
Updated Branches:
refs/heads/feature/createjs-checkbox 671e059ea -> a528433fa
fix event dispatch, add missing getter
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bd1b987b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bd1b987b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bd1b987b
Branch: refs/heads/feature/createjs-checkbox
Commit: bd1b987b6eff57b4866291273b35492ac9c41eee
Parents: 80e4bb7
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 1 11:17:51 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 1 11:18:25 2013 -0700
----------------------------------------------------------------------
.../js/FlexJS/src/org/apache/flex/core/ViewBase.js | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bd1b987b/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js
index f0c4ade..22eee24 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js
@@ -63,4 +63,15 @@ org.apache.flex.core.ViewBase.prototype.initUI = function(model) {
this.get_MXMLProperties());
org.apache.flex.utils.MXMLDataInterpreter.generateMXMLInstances(this,
this, this.get_MXMLDescriptor());
+ this.dispatchEvent(new org.apache.flex.events.Event('initComplete'));
};
+
+/**
+ * @expose
+ * @this {org.apache.flex.core.ViewBase}
+ * @return {Object} The application model.
+ */
+org.apache.flex.core.UIBase.prototype.get_applicationModel = function() {
+ return this.applicationModel;
+};
+
[02/13] git commit: [flex-asjs]
[refs/heads/feature/createjs-checkbox] - implement visible property in JS
Posted by ca...@apache.org.
implement visible property in JS
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/80e4bb7a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/80e4bb7a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/80e4bb7a
Branch: refs/heads/feature/createjs-checkbox
Commit: 80e4bb7a0a13bd8d7b681b0cb28d697eff43c71a
Parents: b75fc5d
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 1 11:17:06 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 1 11:18:25 2013 -0700
----------------------------------------------------------------------
.../js/FlexJS/src/org/apache/flex/core/UIBase.js | 40 +++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e4bb7a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
index dedbb0d..41e5e6d 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
@@ -30,6 +30,12 @@ org.apache.flex.core.UIBase = function() {
*/
this.positioner;
+ /**
+ * @private
+ * @type {string}
+ */
+ this.lastDisplay;
+
};
goog.inherits(org.apache.flex.core.UIBase,
org.apache.flex.core.HTMLElementWrapper);
@@ -170,3 +176,37 @@ org.apache.flex.core.UIBase.prototype.set_model = function(value) {
}
};
+/**
+ * @expose
+ * @this {org.apache.flex.core.UIBase}
+ * @return {object} True if visible.
+ */
+org.apache.flex.core.UIBase.prototype.get_visible = function() {
+ return this.element.style.display != 'none';
+};
+
+/**
+ * @expose
+ * @this {org.apache.flex.core.UIBase}
+ * @param {object} value The new model.
+ */
+org.apache.flex.core.UIBase.prototype.set_visible = function(value) {
+ var oldValue = this.element.style.display != 'none';
+ if (value != oldValue)
+ {
+ if (!value)
+ {
+ this.lastDisplay = this.element.style.display;
+ this.element.style.display = 'none';
+ this.dispatchEvent(new org.apache.flex.events.Event('hide'));
+ }
+ else
+ {
+ if (this.lastDisplay)
+ this.element.style.display = this.lastDisplay;
+ else
+ this.element.style.display = 'block';
+ this.dispatchEvent(new org.apache.flex.events.Event('show'));
+ }
+ }
+};
[09/13] git commit: [flex-asjs]
[refs/heads/feature/createjs-checkbox] - fix checkbox prototype varaibles
Posted by ca...@apache.org.
fix checkbox prototype varaibles
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/cd458ecd
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/cd458ecd
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/cd458ecd
Branch: refs/heads/feature/createjs-checkbox
Commit: cd458ecd6614300fcf60a9a724dc64458e380b8c
Parents: 0080d0f
Author: Carlos Rovira <ca...@apache.org>
Authored: Thu May 2 16:33:37 2013 +0200
Committer: Carlos Rovira <ca...@apache.org>
Committed: Thu May 2 16:33:37 2013 +0200
----------------------------------------------------------------------
.../flex/createjs/staticControls/CheckBox.js | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cd458ecd/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js
index 65c3c19..f460541 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js
@@ -27,10 +27,10 @@ goog.inherits(
org.apache.flex.createjs.staticControls.CheckBox, org.apache.flex.createjs.core.UIBase
);
-org.apache.flex.createjs.staticControls.TextButton.prototype.checkMark = null;
-org.apache.flex.createjs.staticControls.TextButton.prototype.checkMarkBackground = null;
-org.apache.flex.createjs.staticControls.TextButton.prototype.checkBoxLabel = null;
-org.apache.flex.createjs.staticControls.TextButton.prototype.selected = false;
+org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMark = null;
+org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMarkBackground = null;
+org.apache.flex.createjs.staticControls.CheckBox.prototype.checkBoxLabel = null;
+org.apache.flex.createjs.staticControls.CheckBox.prototype.selected = false;
/**
* @override
[05/13] git commit: [flex-asjs]
[refs/heads/feature/createjs-checkbox] - use getters otherwise it won't work
when minified
Posted by ca...@apache.org.
use getters otherwise it won't work when minified
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/af7677eb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/af7677eb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/af7677eb
Branch: refs/heads/feature/createjs-checkbox
Commit: af7677eb7aa7655fa2703e990002be943e051366
Parents: f861b2c
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 1 12:24:31 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 1 12:24:31 2013 -0700
----------------------------------------------------------------------
.../src/org/apache/flex/binding/ConstantBinding.js | 2 +-
.../src/org/apache/flex/binding/SimpleBinding.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af7677eb/frameworks/js/FlexJS/src/org/apache/flex/binding/ConstantBinding.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/binding/ConstantBinding.js b/frameworks/js/FlexJS/src/org/apache/flex/binding/ConstantBinding.js
index 241337e..d5c8a60 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/binding/ConstantBinding.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/binding/ConstantBinding.js
@@ -58,7 +58,7 @@ org.apache.flex.binding.ConstantBinding.prototype.sourcePropertyName = '';
*/
org.apache.flex.binding.ConstantBinding.prototype.set_strand = function(value) {
this.destination = value;
- this.source = this.document[this.sourceID];
+ this.source = this.document['get_' + this.sourceID]();
this.destination['set_' + this.destinationPropertyName](
this.source['get_' + this.sourcePropertyName]()
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af7677eb/frameworks/js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js b/frameworks/js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js
index 822b1ac..88ef987 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js
@@ -86,7 +86,7 @@ org.apache.flex.binding.SimpleBinding.prototype.changeHandler = function() {
*/
org.apache.flex.binding.SimpleBinding.prototype.set_strand = function(value) {
this.destination = value;
- this.source = this.document[this.sourceID];
+ this.source = this.document['get_' + this.sourceID]();
this.source.addEventListener(
this.eventName, org.apache.flex.FlexGlobal.createProxy(
this, this.changeHandler
[03/13] git commit: [flex-asjs]
[refs/heads/feature/createjs-checkbox] - add missing event metadata,
otherwise compiler will use flash.events.Event
Posted by ca...@apache.org.
add missing event metadata, otherwise compiler will use flash.events.Event
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b75fc5d7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b75fc5d7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b75fc5d7
Branch: refs/heads/feature/createjs-checkbox
Commit: b75fc5d7732ba33e96e3430c881a07be4a168dc7
Parents: 138cf91
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 1 11:16:35 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 1 11:18:25 2013 -0700
----------------------------------------------------------------------
.../apache/flex/html/staticControls/CheckBox.as | 2 ++
.../apache/flex/html/staticControls/RadioButton.as | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b75fc5d7/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as b/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as
index ad8ee7c..d61015a 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as
@@ -32,6 +32,8 @@ package org.apache.flex.html.staticControls
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
+ [Event(name="change", type="org.apache.flex.events.Event")]
+
public class CheckBox extends SimpleButton implements IStrand, IInitSkin, IInitModel
{
public function CheckBox(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null)
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b75fc5d7/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as b/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as
index 8df7478..0aee02b 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as
@@ -33,6 +33,8 @@ package org.apache.flex.html.staticControls
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
+ [Event(name="change", type="org.apache.flex.events.Event")]
+
public class RadioButton extends SimpleButton implements IStrand, IInitSkin, IInitModel
{
public function RadioButton(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null)
[12/13] git commit: [flex-asjs]
[refs/heads/feature/createjs-checkbox] - Merge branch 'develop' into
feature/createjs-checkbox
Posted by ca...@apache.org.
Merge branch 'develop' into feature/createjs-checkbox
* develop:
fix undefined getter (falback to property)
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/44e73e52
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/44e73e52
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/44e73e52
Branch: refs/heads/feature/createjs-checkbox
Commit: 44e73e5220036ce95c565b68f3420ea6066b55de
Parents: 6832c37 91f330b
Author: Carlos Rovira <ca...@apache.org>
Authored: Thu May 2 23:30:31 2013 +0200
Committer: Carlos Rovira <ca...@apache.org>
Committed: Thu May 2 23:30:31 2013 +0200
----------------------------------------------------------------------
.../src/org/apache/flex/binding/SimpleBinding.js | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
[10/13] git commit: [flex-asjs]
[refs/heads/feature/createjs-checkbox] - Merge branch 'develop' into
feature/createjs-checkbox
Posted by ca...@apache.org.
Merge branch 'develop' into feature/createjs-checkbox
# By Alex Harui
# Via Alex Harui
* develop:
tweak some colors
improve css and default sizes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6832c37b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6832c37b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6832c37b
Branch: refs/heads/feature/createjs-checkbox
Commit: 6832c37bcff35ece3ce94fbf094b5478159d9580
Parents: cd458ec 2b7ee0a
Author: Carlos Rovira <ca...@apache.org>
Authored: Thu May 2 16:34:58 2013 +0200
Committer: Carlos Rovira <ca...@apache.org>
Committed: Thu May 2 16:34:58 2013 +0200
----------------------------------------------------------------------
frameworks/as/defaults.css | 8 ++++++++
.../as/src/org/apache/flex/core/CSSTextField.as | 11 ++++++-----
frameworks/as/src/org/apache/flex/core/UIBase.as | 8 ++++++--
.../html/staticControls/beads/DropDownListBead.as | 8 ++++----
.../html/staticControls/beads/TextFieldBeadBase.as | 10 ++++++++++
.../supportClasses/TextFieldItemRenderer.as | 6 +++---
6 files changed, 37 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6832c37b/frameworks/as/defaults.css
----------------------------------------------------------------------
[08/13] git commit: [flex-asjs]
[refs/heads/feature/createjs-checkbox] - tweak some colors
Posted by ca...@apache.org.
tweak some colors
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2b7ee0a6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2b7ee0a6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2b7ee0a6
Branch: refs/heads/feature/createjs-checkbox
Commit: 2b7ee0a61eda480ad1aad33b265c4309214b46ca
Parents: a077336
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 1 21:31:51 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 1 21:31:51 2013 -0700
----------------------------------------------------------------------
.../html/staticControls/beads/DropDownListBead.as | 8 ++++----
.../supportClasses/TextFieldItemRenderer.as | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b7ee0a6/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as
index 8ad9ff1..4020053 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as
@@ -57,9 +57,9 @@ package org.apache.flex.html.staticControls.beads
upTextField.borderColor = 0;
downTextField.borderColor = 0;
overTextField.borderColor = 0;
- upTextField.backgroundColor = 0xCCCCCC;
+ upTextField.backgroundColor = 0xEEEEEE;
downTextField.backgroundColor = 0x808080;
- overTextField.backgroundColor = 0xFFCCCC;
+ overTextField.backgroundColor = 0xFFFFFF;
upTextField.selectable = false;
upTextField.type = TextFieldType.DYNAMIC;
downTextField.selectable = false;
@@ -76,8 +76,8 @@ package org.apache.flex.html.staticControls.beads
upSprite.addChild(upArrows);
overSprite.addChild(overArrows);
downSprite.addChild(downArrows);
- drawArrows(upArrows, 0xCCCCCC);
- drawArrows(overArrows, 0xFFCCCC);
+ drawArrows(upArrows, 0xEEEEEE);
+ drawArrows(overArrows, 0xFFFFFF);
drawArrows(downArrows, 0x808080);
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b7ee0a6/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as b/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
index 3ca451a..dd26e9f 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
@@ -34,9 +34,9 @@ package org.apache.flex.html.staticControls.supportClasses
selectable = false;
}
- public var highlightColor:uint = 0xFF0000;
- public var selectedColor:uint = 0x00FF00;
- public var downColor:uint = 0x0000FF;
+ public var highlightColor:uint = 0xCEDBEF;
+ public var selectedColor:uint = 0xA8C6EE;
+ public var downColor:uint = 0x808080;
public function get data():Object
{
[07/13] git commit: [flex-asjs]
[refs/heads/feature/createjs-checkbox] - improve css and default sizes
Posted by ca...@apache.org.
improve css and default sizes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a077336a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a077336a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a077336a
Branch: refs/heads/feature/createjs-checkbox
Commit: a077336ad37668151d2d425dec633205779e9788
Parents: af7677e
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 1 15:01:26 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 1 15:01:26 2013 -0700
----------------------------------------------------------------------
frameworks/as/defaults.css | 8 ++++++++
.../as/src/org/apache/flex/core/CSSTextField.as | 11 ++++++-----
frameworks/as/src/org/apache/flex/core/UIBase.as | 8 ++++++--
.../html/staticControls/beads/TextFieldBeadBase.as | 10 ++++++++++
4 files changed, 30 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a077336a/frameworks/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/as/defaults.css b/frameworks/as/defaults.css
index 64caf16..b503dd5 100644
--- a/frameworks/as/defaults.css
+++ b/frameworks/as/defaults.css
@@ -85,6 +85,12 @@ DropDownListList
ISelectionModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
}
+Label
+{
+ width: 95;
+ height: 18;
+}
+
List
{
ISelectionModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
@@ -104,6 +110,8 @@ TextButton
TextInput
{
ITextInputBead: ClassReference("org.apache.flex.html.staticControls.beads.TextInputWithBorderBead");
+ width: 135;
+ height: 20;
}
/* HTML5 */
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a077336a/frameworks/as/src/org/apache/flex/core/CSSTextField.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/CSSTextField.as b/frameworks/as/src/org/apache/flex/core/CSSTextField.as
index 7ffa12b..eb2cc21 100644
--- a/frameworks/as/src/org/apache/flex/core/CSSTextField.as
+++ b/frameworks/as/src/org/apache/flex/core/CSSTextField.as
@@ -29,14 +29,15 @@ package org.apache.flex.core
{
super();
}
-
+
override public function set text(value:String):void
{
var tf: TextFormat = new TextFormat();
- tf.font = ValuesManager.valuesImpl.getValue(this, "fontFamily") as String;
- tf.size = ValuesManager.valuesImpl.getValue(this, "fontSize");
- tf.color = ValuesManager.valuesImpl.getValue(this, "color");
- var padding:Object = ValuesManager.valuesImpl.getValue(this, "padding");
+ tf.font = ValuesManager.valuesImpl.getValue(parent, "fontFamily") as String;
+ tf.size = ValuesManager.valuesImpl.getValue(parent, "fontSize");
+ tf.bold = ValuesManager.valuesImpl.getValue(parent, "fontWeight") == "bold";
+ tf.color = ValuesManager.valuesImpl.getValue(parent, "color");
+ var padding:Object = ValuesManager.valuesImpl.getValue(parent, "padding");
if (padding != null)
{
tf.leftMargin = padding;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a077336a/frameworks/as/src/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/UIBase.as b/frameworks/as/src/org/apache/flex/core/UIBase.as
index 0d93b94..a624eca 100644
--- a/frameworks/as/src/org/apache/flex/core/UIBase.as
+++ b/frameworks/as/src/org/apache/flex/core/UIBase.as
@@ -30,9 +30,11 @@ package org.apache.flex.core
super();
}
- private var _width:Number = 0;
+ private var _width:Number;
override public function get width():Number
{
+ if (isNaN(_width))
+ _width = Number(ValuesManager.valuesImpl.getValue(this, "width"));
return _width;
}
override public function set width(value:Number):void
@@ -48,9 +50,11 @@ package org.apache.flex.core
return super.width;
}
- private var _height:Number = 0;
+ private var _height:Number;
override public function get height():Number
{
+ if (isNaN(_height))
+ _height = Number(ValuesManager.valuesImpl.getValue(this, "height"));
return _height;
}
override public function set height(value:Number):void
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a077336a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as
index 4f1c26d..1c4fb0a 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as
@@ -18,6 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.staticControls.beads
{
+ import flash.display.DisplayObject;
import flash.display.DisplayObjectContainer;
import org.apache.flex.core.CSSTextField;
@@ -56,7 +57,10 @@ package org.apache.flex.html.staticControls.beads
_textModel = value.getBeadByType(ITextModel) as ITextModel;
textModel.addEventListener("textChange", textChangeHandler);
textModel.addEventListener("htmlChange", htmlChangeHandler);
+ textModel.addEventListener("widthChanged", sizeChangeHandler);
+ textModel.addEventListener("heightChanged", sizeChangeHandler);
DisplayObjectContainer(value).addChild(_textField);
+ sizeChangeHandler(null);
if (textModel.text !== null)
text = textModel.text;
if (textModel.html !== null)
@@ -96,5 +100,11 @@ package org.apache.flex.html.staticControls.beads
{
html = textModel.html;
}
+
+ private function sizeChangeHandler(event:Event):void
+ {
+ textField.width = DisplayObject(_strand).width;
+ textField.height = DisplayObject(_strand).height;
+ }
}
}
\ No newline at end of file
[04/13] git commit: [flex-asjs]
[refs/heads/feature/createjs-checkbox] - add missing value and selectedValue
properties to JS side
Posted by ca...@apache.org.
add missing value and selectedValue properties to JS side
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f861b2c6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f861b2c6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f861b2c6
Branch: refs/heads/feature/createjs-checkbox
Commit: f861b2c61443c3e2996c14084387650f567f2dc0
Parents: bd1b987
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 1 11:18:13 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 1 11:18:26 2013 -0700
----------------------------------------------------------------------
.../apache/flex/html/staticControls/RadioButton.js | 54 +++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f861b2c6/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/RadioButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/RadioButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/RadioButton.js
index 8953ce9..27ab22e 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/RadioButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/RadioButton.js
@@ -101,3 +101,57 @@ org.apache.flex.html.staticControls.RadioButton.prototype.get_selected = functio
org.apache.flex.html.staticControls.RadioButton.prototype.set_selected = function(value) {
this.element.childNodes.item(0).checked = value;
};
+
+/**
+ * @expose
+ * @this {org.apache.flex.html.staticControls.RadioButton}
+ * @return {Object} The value getter.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.get_value = function() {
+ return this.element.childNodes.item(0).value;
+};
+
+/**
+ * @expose
+ * @this {org.apache.flex.html.staticControls.RadioButton}
+ * @param {Object} value The value setter.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.set_value = function(value) {
+ this.element.childNodes.item(0).value = value;
+};
+
+/**
+ * @expose
+ * @this {org.apache.flex.html.staticControls.RadioButton}
+ * @return {Object} The value of the selected RadioButton.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.get_selectedValue = function() {
+ var groupName = this.element.childNodes.item(0).name;
+ var buttons = document.getElementsByName(groupName);
+ var n = buttons.length;
+ for (var i = 0; i < n; i++)
+ {
+ if (buttons[i].checked)
+ return buttons[i].value;
+ }
+ return null;
+};
+
+/**
+ * @expose
+ * @this {org.apache.flex.html.staticControls.RadioButton}
+ * @param {Object} value The value of the selected RadioButton.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.set_selectedValue = function(value) {
+ var groupName = this.element.childNodes.item(0).name;
+ var buttons = document.getElementsByName(groupName);
+ var n = buttons.length;
+ for (var i = 0; i < n; i++)
+ {
+ if (buttons[i].value == value)
+ {
+ buttons[i].checked = true;
+ break;
+ }
+ }
+};
[06/13] git commit: [flex-asjs]
[refs/heads/feature/createjs-checkbox] - Merge branch 'develop' into
feature/createjs-checkbox
Posted by ca...@apache.org.
Merge branch 'develop' into feature/createjs-checkbox
# By Alex Harui
# Via Alex Harui
* develop:
use getters otherwise it won't work when minified
add missing value and selectedValue properties to JS side
fix event dispatch, add missing getter
implement visible property in JS
add missing event metadata, otherwise compiler will use flash.events.Event
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0080d0f3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0080d0f3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0080d0f3
Branch: refs/heads/feature/createjs-checkbox
Commit: 0080d0f35e0ccabec8efcf35fe18d062379ee190
Parents: 671e059 af7677e
Author: Carlos Rovira <ca...@apache.org>
Authored: Wed May 1 23:57:54 2013 +0200
Committer: Carlos Rovira <ca...@apache.org>
Committed: Wed May 1 23:57:54 2013 +0200
----------------------------------------------------------------------
.../apache/flex/html/staticControls/CheckBox.as | 2 +
.../apache/flex/html/staticControls/RadioButton.as | 2 +
.../src/org/apache/flex/binding/ConstantBinding.js | 2 +-
.../src/org/apache/flex/binding/SimpleBinding.js | 2 +-
.../js/FlexJS/src/org/apache/flex/core/UIBase.js | 40 +++++++++++
.../js/FlexJS/src/org/apache/flex/core/ViewBase.js | 11 +++
.../apache/flex/html/staticControls/RadioButton.js | 54 +++++++++++++++
7 files changed, 111 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[13/13] git commit: [flex-asjs]
[refs/heads/feature/createjs-checkbox] - fix createjs checkbox,
now working properly
Posted by ca...@apache.org.
fix createjs checkbox, now working properly
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a528433f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a528433f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a528433f
Branch: refs/heads/feature/createjs-checkbox
Commit: a528433fac7328f1559ca9bb2ce6a22d20e40524
Parents: 44e73e5
Author: Carlos Rovira <ca...@apache.org>
Authored: Fri May 3 01:54:53 2013 +0200
Committer: Carlos Rovira <ca...@apache.org>
Committed: Fri May 3 01:54:53 2013 +0200
----------------------------------------------------------------------
.../flex/createjs/staticControls/CheckBox.js | 20 ++++++++++++--
1 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a528433f/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js
index f460541..5a2ae5c 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js
@@ -30,7 +30,6 @@ goog.inherits(
org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMark = null;
org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMarkBackground = null;
org.apache.flex.createjs.staticControls.CheckBox.prototype.checkBoxLabel = null;
-org.apache.flex.createjs.staticControls.CheckBox.prototype.selected = false;
/**
* @override
@@ -42,7 +41,11 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.addToParent = functio
this.checkMarkBackground = new createjs.Shape();
this.checkMarkBackground.name = "checkmarkbackground";
this.checkMarkBackground.graphics.beginFill("red").drawRoundRect(0, 0, 40, 40, 8);
-
+ //this.checkMarkBackground.graphics.setStrokeStyle( 0 ).beginStroke( '#000' ).drawRect( 0, 0, this.width, this.height);
+ //var hit = new createjs.Shape();
+ //hit.graphics.beginFill("#000").drawRect(0, 0, this.width, this.height);
+ //this.checkMarkBackground.hitArea = hit;
+
this.checkMark = new createjs.Shape();
this.checkMark.name = "checkmark";
this.checkMark.graphics.beginFill("white").drawRoundRect(0, 0, 32, 32, 6);
@@ -56,10 +59,13 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.addToParent = functio
this.checkBoxLabel.textBaseline = "middle";
this.checkBoxLabel.x = 45;
this.checkBoxLabel.y = 40/2;
-
+
this.element = new createjs.Container();
this.element.name = "checkbox";
this.element.addChild(this.checkMarkBackground, this.checkBoxLabel, this.checkMark);
+ // use bind(this) to avoid loose scope
+ this.element.onClick = this.clickHandler.bind(this);
+
p.addChild(this.element);
this.positioner = this.element;
@@ -101,3 +107,11 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.set_selected = functi
this.checkMark.visible = this.selected = value;
this.element.getStage().update();
};
+
+/**
+ * @expose
+ * @this {org.apache.flex.createjs.staticControls.CheckBox}
+ */
+org.apache.flex.createjs.staticControls.CheckBox.prototype.clickHandler = function(event) {
+ this.set_selected(!this.get_selected());
+};
[11/13] git commit: [flex-asjs]
[refs/heads/feature/createjs-checkbox] - fix undefined getter (falback to
property)
Posted by ca...@apache.org.
fix undefined getter (falback to property)
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/91f330b3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/91f330b3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/91f330b3
Branch: refs/heads/feature/createjs-checkbox
Commit: 91f330b3a0cf8abb4f740c91398452a29719e882
Parents: 2b7ee0a
Author: Carlos Rovira <ca...@apache.org>
Authored: Thu May 2 23:30:01 2013 +0200
Committer: Carlos Rovira <ca...@apache.org>
Committed: Thu May 2 23:30:01 2013 +0200
----------------------------------------------------------------------
.../src/org/apache/flex/binding/SimpleBinding.js | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/91f330b3/frameworks/js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js b/frameworks/js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js
index 88ef987..5716599 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js
@@ -86,7 +86,14 @@ org.apache.flex.binding.SimpleBinding.prototype.changeHandler = function() {
*/
org.apache.flex.binding.SimpleBinding.prototype.set_strand = function(value) {
this.destination = value;
- this.source = this.document['get_' + this.sourceID]();
+ if(this.document['get_' + this.sourceID] != undefined)
+ {
+ this.source = this.document['get_' + this.sourceID]();
+ }
+ else
+ {
+ this.source = this.document[this.sourceID];
+ }
this.source.addEventListener(
this.eventName, org.apache.flex.FlexGlobal.createProxy(
this, this.changeHandler