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 2015/01/12 19:50:53 UTC
[01/12] git commit: [flex-asjs] [refs/heads/develop] - clientXY is
more like stageXY
Repository: flex-asjs
Updated Branches:
refs/heads/develop a4b5e9753 -> 90278a176
clientXY is more like stageXY
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8b0eeb65
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8b0eeb65
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8b0eeb65
Branch: refs/heads/develop
Commit: 8b0eeb65093c8fcccacdc58f39365f025d58dbfa
Parents: a4b5e97
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 12 10:43:32 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 12 10:43:32 2015 -0800
----------------------------------------------------------------------
.../src/org/apache/flex/events/MouseEvent.as | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8b0eeb65/frameworks/as/projects/FlexJSUI/src/org/apache/flex/events/MouseEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/events/MouseEvent.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/events/MouseEvent.as
index ad54ddf..bd8baef 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/events/MouseEvent.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/events/MouseEvent.as
@@ -85,7 +85,6 @@ package org.apache.flex.events
public function set localX(value:Number):void
{
_localX = value;
- clientX = value;
_stagePoint = null;
}
@@ -97,7 +96,6 @@ package org.apache.flex.events
public function set localY(value:Number):void
{
_localY = value;
- clientY = value;
_stagePoint = null;
}
@@ -112,8 +110,22 @@ package org.apache.flex.events
public var clickCount:int;
// these map directly to JS MouseEvent fields.
- public var clientX:Number;
- public var clientY:Number;
+ public function get clientX():Number
+ {
+ return screenX;
+ }
+ public function set clientX(value:Number):void
+ {
+ localX = value;
+ }
+ public function get clientY():Number
+ {
+ return screenY;
+ }
+ public function set clientY(value:Number):void
+ {
+ localY = value;
+ }
private var _stagePoint:Point;
[03/12] git commit: [flex-asjs] [refs/heads/develop] - handle
classname changes
Posted by ah...@apache.org.
handle classname changes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f4ff1dbf
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f4ff1dbf
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f4ff1dbf
Branch: refs/heads/develop
Commit: f4ff1dbfd42b1504c8179beb736897ade0ee5d5a
Parents: 155ebec
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 12 10:44:59 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 12 10:44:59 2015 -0800
----------------------------------------------------------------------
.../FlexJSUI/src/org/apache/flex/core/CSSTextField.as | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f4ff1dbf/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/CSSTextField.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/CSSTextField.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/CSSTextField.as
index 16718c4..12248b8 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/CSSTextField.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/CSSTextField.as
@@ -23,6 +23,7 @@ package org.apache.flex.core
import flash.text.TextFormat;
import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
/**
* The CSSTextField class implements CSS text styles in a TextField.
@@ -69,7 +70,8 @@ package org.apache.flex.core
var sp:Object = parent;
if (!sp)
sp = styleParent;
-
+ sp.addEventListener("classNameChanged", updateStyles);
+
var tf: TextFormat = new TextFormat();
tf.font = ValuesManager.valuesImpl.getValue(sp, "fontFamily") as String;
tf.size = ValuesManager.valuesImpl.getValue(sp, "fontSize");
@@ -108,5 +110,11 @@ package org.apache.flex.core
defaultTextFormat = tf;
super.text = value;
}
+
+ private function updateStyles(event:Event):void
+ {
+ // force styles to be re-calculated
+ this.text = text;
+ }
}
}
\ No newline at end of file
[04/12] git commit: [flex-asjs] [refs/heads/develop] - handle
manually added views
Posted by ah...@apache.org.
handle manually added views
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1f513403
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1f513403
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1f513403
Branch: refs/heads/develop
Commit: 1f513403a9aed0032088f6481bfa5c5c0ed16242
Parents: f4ff1db
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 12 10:45:30 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 12 10:45:30 2015 -0800
----------------------------------------------------------------------
.../as/projects/FlexJSUI/src/org/apache/flex/core/UIButtonBase.as | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1f513403/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIButtonBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIButtonBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIButtonBase.as
index 561d848..6cfb32c 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIButtonBase.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIButtonBase.as
@@ -672,6 +672,8 @@ package org.apache.flex.core
strand.push(bead);
if (bead is IBeadModel)
_model = bead as IBeadModel;
+ else if (bead is IBeadView)
+ _view = bead as IBeadView;
bead.strand = this;
}
[07/12] git commit: [flex-asjs] [refs/heads/develop] - fix
ImageAndTextButton on JS
Posted by ah...@apache.org.
fix ImageAndTextButton on 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/9901c45f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9901c45f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9901c45f
Branch: refs/heads/develop
Commit: 9901c45f24d5d78dac2a17964aa771b8c0d8b365
Parents: f314c4f
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 12 10:46:54 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 12 10:46:54 2015 -0800
----------------------------------------------------------------------
.../org/apache/flex/html/ImageAndTextButton.js | 27 +++++++++++++++-----
1 file changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9901c45f/frameworks/js/FlexJS/src/org/apache/flex/html/ImageAndTextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ImageAndTextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ImageAndTextButton.js
index 0f03214..2e8d4c3 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/ImageAndTextButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ImageAndTextButton.js
@@ -25,7 +25,8 @@ goog.require('org.apache.flex.html.Button');
org.apache.flex.html.ImageAndTextButton = function() {
org.apache.flex.html.ImageAndTextButton.base(this, 'constructor');
-
+ this._text = '';
+ this._src = '';
};
goog.inherits(org.apache.flex.html.ImageAndTextButton,
org.apache.flex.html.Button);
@@ -48,8 +49,6 @@ org.apache.flex.html.ImageAndTextButton.prototype.createElement =
function() {
this.element = document.createElement('button');
this.element.setAttribute('type', 'button');
- this.img = document.createElement('img');
- this.element.appendChild(this.img);
this.positioner = this.element;
this.element.flexjs_wrapper = this;
@@ -68,7 +67,7 @@ org.apache.flex.html.ImageAndTextButton.prototype.createElement =
* @return {string} The text getter.
*/
org.apache.flex.html.ImageAndTextButton.prototype.get_text = function() {
- return this.element.innerHTML;
+ return this._text;
};
@@ -78,7 +77,8 @@ org.apache.flex.html.ImageAndTextButton.prototype.get_text = function() {
*/
org.apache.flex.html.ImageAndTextButton.prototype.set_text =
function(value) {
- this.element.innerHTML = value;
+ this._text = value;
+ this.setInnerHTML();
};
@@ -87,7 +87,7 @@ org.apache.flex.html.ImageAndTextButton.prototype.set_text =
* @return {string} The image url.
*/
org.apache.flex.html.ImageAndTextButton.prototype.get_image = function() {
- return this.img.src;
+ return this._src;
};
@@ -97,5 +97,18 @@ org.apache.flex.html.ImageAndTextButton.prototype.get_image = function() {
*/
org.apache.flex.html.ImageAndTextButton.prototype.set_image =
function(value) {
- this.img.src = value;
+ this._src = value;
+ this.setInnerHTML();
+};
+
+
+/**
+ */
+org.apache.flex.html.ImageAndTextButton.prototype.setInnerHTML = function() {
+ var inner = '';
+ if (this._src != null)
+ inner += '<img src=\'' + this._src + '\'/>';
+ inner += ' ';
+ inner += this._text;
+ this.element.innerHTML = inner;
};
[10/12] git commit: [flex-asjs] [refs/heads/develop] - fix wipe
Posted by ah...@apache.org.
fix wipe
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/637fdc36
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/637fdc36
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/637fdc36
Branch: refs/heads/develop
Commit: 637fdc3696a3e21c80dc5b78b1f9feab40759b78
Parents: 26e15fc
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 12 10:47:56 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 12 10:47:56 2015 -0800
----------------------------------------------------------------------
.../org/apache/flex/effects/PlatformWiper.js | 24 +++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/637fdc36/frameworks/js/FlexJS/src/org/apache/flex/effects/PlatformWiper.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/effects/PlatformWiper.js b/frameworks/js/FlexJS/src/org/apache/flex/effects/PlatformWiper.js
index 3b37c73..9f0e9b9 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/effects/PlatformWiper.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/effects/PlatformWiper.js
@@ -29,6 +29,13 @@ org.apache.flex.effects.PlatformWiper = function() {
*/
this.target_ = null;
+
+ /**
+ * @private
+ * @type {Object}
+ */
+ this.overflow_ = null;
+
};
@@ -49,9 +56,16 @@ org.apache.flex.effects.PlatformWiper.prototype.FLEXJS_CLASS_INFO =
*/
org.apache.flex.effects.PlatformWiper.prototype.set_target =
function(target) {
- if (target == null)
- delete this.target_.positioner.style.clip;
+ if (target == null) {
+ if (this.overflow_ == null)
+ delete this.target_.positioner.style.overflow;
+ else
+ this.target_.positioner.style.overflow = this.overflow_;
+ }
this.target_ = target;
+ if (target != null) {
+ this.overflow_ = this.target_.positioner.style.overflow;
+ }
};
@@ -62,10 +76,14 @@ org.apache.flex.effects.PlatformWiper.prototype.set_target =
*/
org.apache.flex.effects.PlatformWiper.prototype.set_visibleRect =
function(rect) {
+ /*
var styleString = 'rect(';
styleString += rect.top.toString() + 'px,';
styleString += rect.width.toString() + 'px,';
styleString += rect.height.toString() + 'px,';
- styleString += rect.left.toString() + 'px,)';
+ styleString += rect.left.toString() + 'px)';
this.target_.positioner.style.clip = styleString;
+ */
+ this.target_.positioner.style.height = rect.height.toString() + 'px';
+ this.target_.positioner.style.overflow = 'hidden';
};
[09/12] git commit: [flex-asjs] [refs/heads/develop] - handle clientX
get/set
Posted by ah...@apache.org.
handle clientX get/set
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/26e15fcc
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/26e15fcc
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/26e15fcc
Branch: refs/heads/develop
Commit: 26e15fcc60ae8254d828faf15f706c6f2926d60d
Parents: ca57b86
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 12 10:47:45 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 12 10:47:45 2015 -0800
----------------------------------------------------------------------
.../org/apache/flex/core/HTMLElementWrapper.js | 44 ++++++++++++++++++++
1 file changed, 44 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/26e15fcc/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 be0426a..c863476 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js
@@ -179,3 +179,47 @@ goog.events.BrowserEvent.prototype.get_screenX = function() {
goog.events.BrowserEvent.prototype.get_screenY = function() {
return this.screenY;
};
+
+
+/**
+ * Hack to allow event.clientX expressions to work
+ *
+ * @expose
+ * @return {number} The wrapping object.
+ */
+goog.events.BrowserEvent.prototype.get_clientX = function() {
+ return this.clientX;
+};
+
+
+/**
+ * Hack to allow event.clientY expressions to work
+ *
+ * @expose
+ * @return {number} The wrapping object.
+ */
+goog.events.BrowserEvent.prototype.get_clientY = function() {
+ return this.clientY;
+};
+
+
+/**
+ * Hack to allow event.clientX expressions to work
+ *
+ * @expose
+ * @param {number} value The value.
+ */
+goog.events.BrowserEvent.prototype.set_clientX = function(value) {
+ this.clientX = value;
+};
+
+
+/**
+ * Hack to allow event.clientY expressions to work
+ *
+ * @expose
+ * @param {number} value The value.
+ */
+goog.events.BrowserEvent.prototype.set_clientY = function(value) {
+ this.clientY = value;
+};
[02/12] git commit: [flex-asjs] [refs/heads/develop] - fix drag image
positioning
Posted by ah...@apache.org.
fix drag image positioning
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/155ebec7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/155ebec7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/155ebec7
Branch: refs/heads/develop
Commit: 155ebec70dada799dfef16fb7db9c98df99ac5ee
Parents: 8b0eeb6
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 12 10:44:02 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 12 10:44:02 2015 -0800
----------------------------------------------------------------------
.../src/productsView/ProductCatalogThumbnail.mxml | 4 +---
.../flex/html/beads/controllers/DragMouseController.as | 10 ++++++----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/155ebec7/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml b/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
index 6769706..f7a0ea4 100755
--- a/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
+++ b/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
@@ -91,9 +91,7 @@ limitations under the License.
event.target != compare &&
event.target != details)
{
- dragStartPoint = new Point(event.screenX, event.screenY);
- dragStartPoint = PointUtils.globalToLocal(dragStartPoint, this);
-
+ dragStartPoint = new Point(event.clientX, event.clientY);
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/155ebec7/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DragMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DragMouseController.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DragMouseController.as
index 7f439a5..01351b8 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DragMouseController.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DragMouseController.as
@@ -87,7 +87,7 @@ package org.apache.flex.html.beads.controllers
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public static var dragging:Boolean;
+ public static var dragging:Boolean = false;
/**
* The drag image.
@@ -216,7 +216,7 @@ package org.apache.flex.html.beads.controllers
dragging = true;
host = UIUtils.findPopUpHost(_strand as IUIBase);
host.addElement(dragImage);
- pt = PointUtils.globalToLocal(new Point(event.screenX, event.screenY), host);
+ pt = PointUtils.globalToLocal(new Point(event.clientX, event.clientY), host);
dragImage.x = pt.x + dragImageOffsetX;
dragImage.y = pt.y + dragImageOffsetY;
}
@@ -224,9 +224,11 @@ package org.apache.flex.html.beads.controllers
}
else
{
- trace("sending dragMove", event.target);
+ trace("sending dragMove " + event.target.toString());
dragEvent = DragEvent.createDragEvent("dragMove", event);
- pt = PointUtils.globalToLocal(new Point(event.screenX, event.screenY), host);
+ trace("client: " + event.clientX.toString() + " " + event.clientY.toString() + " " + event.target.toString());
+ pt = PointUtils.globalToLocal(new Point(event.clientX, event.clientY), host);
+ trace("host: " + pt.x.toString() + " " + pt.y.toString());
dragImage.x = pt.x + dragImageOffsetX;
dragImage.y = pt.y + dragImageOffsetY;
DragEvent.dispatchDragEvent(dragEvent, IEventDispatcher(event.target));
[06/12] git commit: [flex-asjs] [refs/heads/develop] - fix
ImageAndTextButton on AS
Posted by ah...@apache.org.
fix ImageAndTextButton on AS
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f314c4f7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f314c4f7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f314c4f7
Branch: refs/heads/develop
Commit: f314c4f756b1c2f1172f8714245fca14ca8a2682
Parents: 34e0800
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 12 10:46:37 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 12 10:46:37 2015 -0800
----------------------------------------------------------------------
.../flex/html/beads/ImageAndTextButtonView.as | 25 ++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f314c4f7/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageAndTextButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageAndTextButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageAndTextButtonView.as
index 64dd7a5..b0ee998 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageAndTextButtonView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageAndTextButtonView.as
@@ -28,13 +28,14 @@ package org.apache.flex.html.beads
import flash.text.TextFieldType;
import org.apache.flex.core.BeadViewBase;
- import org.apache.flex.core.CSSTextField;
+ import org.apache.flex.core.CSSTextField;
import org.apache.flex.core.IBead;
import org.apache.flex.core.IBeadView;
import org.apache.flex.core.IStrand;
- import org.apache.flex.core.IStrandWithModel;
+ import org.apache.flex.core.IStrandWithModel;
import org.apache.flex.core.ValuesManager;
- import org.apache.flex.html.beads.models.ImageAndTextModel;
+ import org.apache.flex.html.beads.models.ImageAndTextModel;
+ import org.apache.flex.utils.SolidBorderUtil;
/**
* The ImageButtonView class provides an image-only view
@@ -90,6 +91,7 @@ package org.apache.flex.html.beads
textModel = IStrandWithModel(value).model as ImageAndTextModel;
textModel.addEventListener("textChange", textChangeHandler);
textModel.addEventListener("htmlChange", htmlChangeHandler);
+ textModel.addEventListener("imageChange", imageChangeHandler);
shape = new Shape();
shape.graphics.beginFill(0xCCCCCC);
@@ -143,12 +145,20 @@ package org.apache.flex.html.beads
var url:String = backgroundImage as String;
loader.load(new URLRequest(url));
loader.contentLoaderInfo.addEventListener(flash.events.Event.COMPLETE, function (e:flash.events.Event):void {
+ var padding:int = 2;
+ var borderWidth:int = 1;
updateHitArea();
- textField.x = loader.width;
+ loader.x = padding;
+ textField.x = loader.width + padding;
+ textField.y = padding;
+ loader.y = (textField.height + padding + padding - loader.height) / 2;
sprite.graphics.clear();
sprite.graphics.beginFill(color);
sprite.graphics.drawRect(0, 0, sprite.width, sprite.height);
sprite.graphics.endFill();
+ SolidBorderUtil.drawBorder(sprite.graphics,
+ 0, 0, textField.x + textField.width + padding, textField.height + padding + padding,
+ 0x000000, color, borderWidth);
});
}
}
@@ -163,6 +173,13 @@ package org.apache.flex.html.beads
html = textModel.html;
}
+ private function imageChangeHandler(event:Event):void
+ {
+ setupBackground(upSprite, upTextField, 0xCCCCCC);
+ setupBackground(overSprite, overTextField, 0xFFCCCC, "hover");
+ setupBackground(downSprite, downTextField, 0x808080, "active");
+ }
+
/**
* The CSSTextField in the up state
*
[11/12] git commit: [flex-asjs] [refs/heads/develop] - make NS look
better in JS
Posted by ah...@apache.org.
make NS look better 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/72d08ed9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/72d08ed9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/72d08ed9
Branch: refs/heads/develop
Commit: 72d08ed91a734bf4472949b2bfbe9d4ceda790df
Parents: 637fdc3
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 12 10:48:27 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 12 10:48:27 2015 -0800
----------------------------------------------------------------------
.../src/org/apache/flex/html/NumericStepper.js | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72d08ed9/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js b/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js
index 8fd42cf..4323042 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js
@@ -55,9 +55,25 @@ org.apache.flex.html.NumericStepper.prototype.createElement =
this.input = new org.apache.flex.html.TextInput();
this.addElement(this.input);
this.input.positioner.style.display = 'inline-block';
+ this.input.positioner.style.width = '100px';
this.spinner = new org.apache.flex.html.Spinner();
+ this.spinner.positioner.style.display = 'inline-block';
+ this.spinner.positioner.style.height = '24px';
+ this.spinner.positioner.style.marginLeft = '-2px';
+ this.spinner.positioner.style.marginTop = '2px';
this.addElement(this.spinner);
+ /* TODO: ajh move to view and css */
+ this.spinner.incrementButton.positioner.style.display = 'block';
+ this.spinner.incrementButton.positioner.style.marginBottom = '-1px';
+ this.spinner.incrementButton.positioner.style.paddingTop = '1px';
+ this.spinner.incrementButton.positioner.style.paddingBottom = '1px';
+ this.spinner.incrementButton.positioner.style.fontSize = '6px';
+ this.spinner.decrementButton.positioner.style.marginTop = '0px';
+ this.spinner.decrementButton.positioner.style.display = 'block';
+ this.spinner.decrementButton.positioner.style.paddingTop = '1px';
+ this.spinner.decrementButton.positioner.style.paddingBottom = '1px';
+ this.spinner.decrementButton.positioner.style.fontSize = '6px';
this.spinner.positioner.style.display = 'inline-block';
goog.events.listen(this.spinner, 'valueChange',
goog.bind(this.spinnerChange, this));
@@ -141,6 +157,7 @@ org.apache.flex.html.NumericStepper.prototype.get_value =
org.apache.flex.html.NumericStepper.prototype.set_value =
function(newValue) {
this.model.set_value(newValue);
+ this.spinner.set_value(newValue);
};
[08/12] git commit: [flex-asjs] [refs/heads/develop] - make NS look
better
Posted by ah...@apache.org.
make NS look better
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ca57b868
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ca57b868
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ca57b868
Branch: refs/heads/develop
Commit: ca57b868147cb7b360afb7d2f7f7c3f9ae793ae5
Parents: 9901c45
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 12 10:47:15 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 12 10:47:15 2015 -0800
----------------------------------------------------------------------
.../FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ca57b868/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
index 4bd5ec9..ab099ba 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
@@ -89,7 +89,7 @@ package org.apache.flex.html.beads
spinner.addBead( UIBase(value).model );
IParent(value).addElement(spinner);
spinner.width = 17;
- input.height = spinner.height; // should be spinner.height = input.height but the spinner buttons won't get small enough
+ spinner.height = input.height;
// listen for changes to the text input field which will reset the
// value. ideally, we should either set the input to accept only
[12/12] git commit: [flex-asjs] [refs/heads/develop] - use triangle
instead of arrow
Posted by ah...@apache.org.
use triangle instead of arrow
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/90278a17
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/90278a17
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/90278a17
Branch: refs/heads/develop
Commit: 90278a176f99a5d6fde1cdd6afc6f1d639ed5313
Parents: 72d08ed
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 12 10:49:02 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 12 10:49:02 2015 -0800
----------------------------------------------------------------------
frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90278a17/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js
index 87b7007..116b120 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js
@@ -58,11 +58,11 @@ org.apache.flex.html.Spinner.prototype.createElement =
this.element.style.verticalAlign = 'middle';
this.incrementButton = new org.apache.flex.html.TextButton();
- this.incrementButton.set_text('\u2191');
+ this.incrementButton.set_text('\u25B2');
this.addElement(this.incrementButton);
this.decrementButton = new org.apache.flex.html.TextButton();
- this.decrementButton.set_text('\u2193');
+ this.decrementButton.set_text('\u25BC');
this.addElement(this.decrementButton);
this.controller = new org.apache.flex.html.
[05/12] git commit: [flex-asjs] [refs/heads/develop] - handle size
changes
Posted by ah...@apache.org.
handle size changes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/34e08009
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/34e08009
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/34e08009
Branch: refs/heads/develop
Commit: 34e0800900d29248bbcafc684c449238c89230dc
Parents: 1f51340
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 12 10:46:00 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 12 10:46:00 2015 -0800
----------------------------------------------------------------------
.../apache/flex/html/beads/DownArrowButtonView.as | 11 ++++++++++-
.../org/apache/flex/html/beads/UpArrowButtonView.as | 16 +++++++++++++---
2 files changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/34e08009/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as
index 39ce6b4..119b0c7 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as
@@ -25,6 +25,7 @@ package org.apache.flex.html.beads
import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IBeadView;
+ import org.apache.flex.events.Event;
/**
* The DownArrowButtonView class is the view for
@@ -92,11 +93,19 @@ package org.apache.flex.html.beads
SimpleButton(value).downState = downView;
SimpleButton(value).overState = overView;
SimpleButton(value).hitTestState = shape;
- }
+
+ SimpleButton(_strand).addEventListener("widthChanged",sizeChangeHandler);
+ SimpleButton(_strand).addEventListener("heightChanged",sizeChangeHandler);
+ }
private var upView:Shape;
private var downView:Shape;
private var overView:Shape;
+ private function sizeChangeHandler(event:Event):void
+ {
+ SimpleButton(_strand).scaleX = SimpleButton(_strand).width / 16;
+ SimpleButton(_strand).scaleY = SimpleButton(_strand).height / 16;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/34e08009/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as
index 10101ed..74c4ffd 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as
@@ -18,13 +18,15 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads
{
+ import flash.display.DisplayObject;
import flash.display.Graphics;
import flash.display.Shape;
import flash.display.SimpleButton;
-
- import org.apache.flex.core.BeadViewBase;
+
+ import org.apache.flex.core.BeadViewBase;
+ import org.apache.flex.core.IBeadView;
import org.apache.flex.core.IStrand;
- import org.apache.flex.core.IBeadView;
+ import org.apache.flex.events.Event;
/**
* The UpArrowButtonView class is the view for
@@ -92,11 +94,19 @@ package org.apache.flex.html.beads
SimpleButton(value).downState = downView;
SimpleButton(value).overState = overView;
SimpleButton(value).hitTestState = shape;
+
+ SimpleButton(_strand).addEventListener("widthChanged",sizeChangeHandler);
+ SimpleButton(_strand).addEventListener("heightChanged",sizeChangeHandler);
}
private var upView:Shape;
private var downView:Shape;
private var overView:Shape;
+ private function sizeChangeHandler(event:Event):void
+ {
+ SimpleButton(_strand).scaleX = SimpleButton(_strand).width / 16;
+ SimpleButton(_strand).scaleY = SimpleButton(_strand).height / 16;
+ }
}
}