You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/08/02 19:03:17 UTC
[10/10] git commit: [flex-asjs] [refs/heads/refactor-sprite] - get
DataBindingExample to show up. Events don't work yet though
get DataBindingExample to show up. Events don't work yet though
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5e60e10c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5e60e10c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5e60e10c
Branch: refs/heads/refactor-sprite
Commit: 5e60e10c09a665be12b21d1763b024fb4958d712
Parents: 25e9990
Author: Alex Harui <ah...@apache.org>
Authored: Tue Aug 2 12:02:52 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Aug 2 12:02:52 2016 -0700
----------------------------------------------------------------------
.../flex/org/apache/flex/core/CSSTextField.as | 2 +-
.../flex/org/apache/flex/core/UIButtonBase.as | 1 +
.../apache/flex/core/UIHTMLElementWrapper.as | 7 ++++--
.../org/apache/flex/html/beads/CheckBoxView.as | 23 +++++++++--------
.../apache/flex/html/beads/DropDownListView.as | 26 +++++++++-----------
.../apache/flex/html/beads/RadioButtonView.as | 25 ++++++++++---------
6 files changed, 46 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5e60e10c/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as
index 87dfafd..f50a2c6 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as
@@ -147,7 +147,7 @@ package org.apache.flex.core
}
}
defaultTextFormat = tf;
- text = value;
+ super.text = value;
}
private function updateStyles(event:Event):void
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5e60e10c/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as
index c37ee77..bd38d7f 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as
@@ -75,6 +75,7 @@ package org.apache.flex.core
// mouseChildren = true;
// mouseEnabled = true;
MouseEventConverter.setupInstanceConverters(this);
+ createElement();
}
protected function createElement():IFlexJSElement
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5e60e10c/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as
index 5f82f4a..22b90d1 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as
@@ -101,7 +101,7 @@ COMPILE::SWF
/**
* allow access from overrides
*/
- protected var _model:IBeadModel;
+ protected var _model:Object;
/**
* @flexjsignorecoercion Class
@@ -125,7 +125,10 @@ COMPILE::SWF
{
if (_model != value)
{
- addBead(value as IBead);
+ if (value is IBead)
+ addBead(value as IBead);
+ else
+ _model = value;
dispatchEvent(new org.apache.flex.events.Event("modelChanged"));
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5e60e10c/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CheckBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CheckBoxView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CheckBoxView.as
index a04f2bf..6268e0d 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CheckBoxView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CheckBoxView.as
@@ -27,6 +27,7 @@ package org.apache.flex.html.beads
import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.CSSTextField;
import org.apache.flex.core.IBeadView;
+ import org.apache.flex.core.IChild;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IToggleButtonModel;
import org.apache.flex.events.Event;
@@ -123,10 +124,11 @@ package org.apache.flex.html.beads
hitArea.graphics.drawRect(0,0,upSprite.width, upSprite.height);
hitArea.graphics.endFill();
- SimpleButton(value).upState = upSprite;
- SimpleButton(value).downState = downSprite;
- SimpleButton(value).overState = overSprite;
- SimpleButton(value).hitTestState = hitArea;
+ var button:SimpleButton = IChild(value).$displayObject as SimpleButton;
+ button.upState = upSprite;
+ button.downState = downSprite;
+ button.overState = overSprite;
+ button.hitTestState = hitArea;
if (toggleButtonModel.text !== null)
text = toggleButtonModel.text;
@@ -224,15 +226,16 @@ package org.apache.flex.html.beads
layoutControl();
+ var button:SimpleButton = IChild(value).$displayObject as SimpleButton;
if( value ) {
- SimpleButton(_strand).upState = upAndSelectedSprite;
- SimpleButton(_strand).downState = downAndSelectedSprite;
- SimpleButton(_strand).overState = overAndSelectedSprite;
+ button.upState = upAndSelectedSprite;
+ button.downState = downAndSelectedSprite;
+ button.overState = overAndSelectedSprite;
} else {
- SimpleButton(_strand).upState = upSprite;
- SimpleButton(_strand).downState = downSprite;
- SimpleButton(_strand).overState = overSprite;
+ button.upState = upSprite;
+ button.downState = downSprite;
+ button.overState = overSprite;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5e60e10c/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as
index 198e787..22938b9 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as
@@ -18,7 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads
{
- import flash.display.DisplayObject;
import flash.display.DisplayObjectContainer;
import flash.display.Graphics;
import flash.display.Shape;
@@ -29,16 +28,16 @@ package org.apache.flex.html.beads
import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.CSSTextField;
import org.apache.flex.core.IBeadView;
- import org.apache.flex.core.IChild;
+ import org.apache.flex.core.IChild;
import org.apache.flex.core.IPopUpHost;
import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.IStrand;
- import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.IUIBase;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.utils.SolidBorderUtil;
- import org.apache.flex.utils.UIUtils;
+ import org.apache.flex.utils.SolidBorderUtil;
+ import org.apache.flex.utils.UIUtils;
/**
* The DropDownListView class is the default view for
@@ -114,7 +113,7 @@ package org.apache.flex.html.beads
*/
override public function set strand(value:IStrand):void
{
- super.strand = value;;
+ super.strand = value;
selectionModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
selectionModel.addEventListener("selectedIndexChanged", selectionChangeHandler);
selectionModel.addEventListener("dataProviderChanged", selectionChangeHandler);
@@ -122,10 +121,11 @@ package org.apache.flex.html.beads
shape.graphics.beginFill(0xCCCCCC);
shape.graphics.drawRect(0, 0, 10, 10);
shape.graphics.endFill();
- SimpleButton(value).upState = upSprite;
- SimpleButton(value).downState = downSprite;
- SimpleButton(value).overState = overSprite;
- SimpleButton(value).hitTestState = shape;
+ var button:SimpleButton = IChild(value).$displayObject as SimpleButton;
+ button.upState = upSprite;
+ button.downState = downSprite;
+ button.overState = overSprite;
+ button.hitTestState = shape;
if (selectionModel.selectedIndex !== -1)
text = selectionModel.selectedItem.toString();
else
@@ -153,8 +153,8 @@ package org.apache.flex.html.beads
private function changeHandler(event:Event):void
{
- var ww:Number = DisplayObject(_strand).width;
- var hh:Number = DisplayObject(_strand).height;
+ var ww:Number = IUIBase(_strand).width;
+ var hh:Number = IUIBase(_strand).height;
upArrows.x = ww - upArrows.width - 6;
overArrows.x = ww - overArrows.width - 6;
@@ -232,8 +232,6 @@ package org.apache.flex.html.beads
*/
public function set text(value:String):void
{
- var ww:Number = DisplayObject(_strand).width;
- var hh:Number = DisplayObject(_strand).height;
upTextField.text = value;
downTextField.text = value;
overTextField.text = value;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5e60e10c/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as
index 245c3d3..34fcaae 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as
@@ -24,9 +24,10 @@ package org.apache.flex.html.beads
import flash.text.TextFieldAutoSize;
import flash.text.TextFieldType;
- import org.apache.flex.core.BeadViewBase;
+ import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.CSSTextField;
import org.apache.flex.core.IBeadView;
+ import org.apache.flex.core.IChild;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IValueToggleButtonModel;
import org.apache.flex.events.Event;
@@ -123,10 +124,11 @@ package org.apache.flex.html.beads
hitArea.graphics.drawRect(0,0,upSprite.width, upSprite.height);
hitArea.graphics.endFill();
- SimpleButton(value).upState = upSprite;
- SimpleButton(value).downState = downSprite;
- SimpleButton(value).overState = overSprite;
- SimpleButton(value).hitTestState = hitArea;
+ var button:SimpleButton = IChild(value).$displayObject as SimpleButton;
+ button.upState = upSprite;
+ button.downState = downSprite;
+ button.overState = overSprite;
+ button.hitTestState = hitArea;
if (toggleButtonModel.text !== null)
text = toggleButtonModel.text;
@@ -215,15 +217,16 @@ package org.apache.flex.html.beads
{
_selected = value;
+ var button:SimpleButton = IChild(_strand).$displayObject as SimpleButton;
if( value ) {
- SimpleButton(_strand).upState = upAndSelectedSprite;
- SimpleButton(_strand).downState = downAndSelectedSprite;
- SimpleButton(_strand).overState = overAndSelectedSprite;
+ button.upState = upAndSelectedSprite;
+ button.downState = downAndSelectedSprite;
+ button.overState = overAndSelectedSprite;
} else {
- SimpleButton(_strand).upState = upSprite;
- SimpleButton(_strand).downState = downSprite;
- SimpleButton(_strand).overState = overSprite;
+ button.upState = upSprite;
+ button.downState = downSprite;
+ button.overState = overSprite;
}
layoutControl();