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/10 08:46:07 UTC
[01/10] git commit: [flex-asjs] [refs/heads/develop] - change border
color on rollover
Repository: flex-asjs
Updated Branches:
refs/heads/develop b08c58731 -> a4b5e9753
change border color on rollover
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/99d85c33
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/99d85c33
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/99d85c33
Branch: refs/heads/develop
Commit: 99d85c33fa8065c1fdaa98b2650d6f324947a721
Parents: 3f4ed92
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jan 9 23:39:22 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jan 9 23:45:57 2015 -0800
----------------------------------------------------------------------
.../productsView/ProductCatalogThumbnail.mxml | 21 ++++++++------------
1 file changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/99d85c33/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml b/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
index 85d24fd..6769706 100755
--- a/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
+++ b/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
@@ -35,11 +35,11 @@ limitations under the License.
<!-- automationName="{product.name}" -->
<basic:beads>
<basic:ContainerDataBinding />
- <basic:LayoutChangeNotifier watchedProperty="{details.height}" />
+ <basic:LayoutChangeNotifier watchedProperty="{borderStyles.borderColor}" initialValue="#FFFFFF" />
</basic:beads>
<basic:style>
- <basic:SimpleCSSStyles borderStyle="solid"
- borderColor="#FFFFFF" />
+ <basic:BindableCSSStyles id="borderStyles" borderStyle="solid"
+ borderColor="#FFFFFF" backgroundColor="#FFFFFF"/>
</basic:style>
<fx:Metadata>
[Event(name="purchase", type="samples.flexstore.ProductThumbEvent")]
@@ -71,14 +71,14 @@ limitations under the License.
private function rollOverHandler(event:MouseEvent):void
{
- style["borderColor"] = "#CCCCCC";
+ borderStyles.borderColor = "#CCCCCC";
//style["dropShadowEnabled"] = true;
buttons.visible = true;
}
private function rollOutHandler(event:MouseEvent):void
{
- style["borderColor"] = "#FFFFFF";
+ borderStyles.borderColor = "#FFFFFF";
//style["dropShadowEnabled"] = false;
buttons.visible = false;
}
@@ -158,9 +158,9 @@ limitations under the License.
<basic:VContainer id="descr" height="100%" >
<basic:style>
- <basic:SimpleCSSStyles paddingTop="0" left="50" right="0" /> <!-- gap="0" -->
+ <basic:SimpleCSSStyles paddingTop="0" right="0" /> <!-- gap="0" -->
</basic:style>
- <basic:Label text="{product.featureString}" width="80" height="48" />
+ <basic:Label text="{product.featureString}" width="60" height="48" />
<basic:Label text="{cf.format(product.price)}" style="fontWeight:bold"/>
<basic:Spacer height="4"/>
<basic:Label text="{product.highlight1}" style="color:#EE8D0C" includeIn="x3cols, x2cols"/>
@@ -182,15 +182,10 @@ limitations under the License.
</basic:VContainer>
- <basic:VContainer id="buttons" visible="false">
+ <basic:VContainer id="buttons" visible="false" width="30">
<basic:style>
<basic:SimpleCSSStyles paddingRight="8" right="8" top="12" /> <!-- gap="4" -->
</basic:style>
- <basic:beads>
- <basic:LayoutChangeNotifier watchedProperty="{purchase.height}" initialValue="0" />
- <basic:LayoutChangeNotifier watchedProperty="{compare.height}" initialValue="0" />
- <basic:LayoutChangeNotifier watchedProperty="{details.height}" initialValue="0" />
- </basic:beads>
<basic:ImageButton id="purchase" backgroundImage="assets/button_cart_empty.png" className="hoverButton"
click="dispatchEvent(new ProductThumbEvent(ProductThumbEvent.PURCHASE, product))"
width="30">
[10/10] git commit: [flex-asjs] [refs/heads/develop] - redraw on
layout
Posted by ah...@apache.org.
redraw on layout
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/64906f94
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/64906f94
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/64906f94
Branch: refs/heads/develop
Commit: 64906f947d1d59e7b57e0cf9e5dd796801a434e4
Parents: 639ba6f
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jan 9 23:40:48 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jan 9 23:45:58 2015 -0800
----------------------------------------------------------------------
.../src/org/apache/flex/html/beads/SingleLineBorderBead.as | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/64906f94/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as
index 095c696..bd933df 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as
@@ -63,6 +63,7 @@ package org.apache.flex.html.beads
public function set strand(value:IStrand):void
{
_strand = value;
+ IEventDispatcher(value).addEventListener("layoutNeeded", changeHandler);
IEventDispatcher(value).addEventListener("heightChanged", changeHandler);
IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
IEventDispatcher(value).addEventListener("sizeChanged", changeHandler);
@@ -72,6 +73,11 @@ package org.apache.flex.html.beads
private function changeHandler(event:Event):void
{
var styleObject:* = ValuesManager.valuesImpl.getValue(_strand,"border-color");
+ if (styleObject is String)
+ {
+ if (styleObject.charAt(0) == "#")
+ styleObject = styleObject.replace("#", "0x");
+ }
var borderColor:Number = Number(styleObject);
if( isNaN(borderColor) ) borderColor = 0x000000;
styleObject = ValuesManager.valuesImpl.getValue(_strand,"border-width");
[07/10] git commit: [flex-asjs] [refs/heads/develop] - support
bordercolor
Posted by ah...@apache.org.
support bordercolor
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b3c31338
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b3c31338
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b3c31338
Branch: refs/heads/develop
Commit: b3c31338d92d4a7f7a32175471d7664661fe5552
Parents: 64906f9
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jan 9 23:41:19 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jan 9 23:45:58 2015 -0800
----------------------------------------------------------------------
.../js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b3c31338/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 68ead66..7d9e92a 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js
@@ -285,6 +285,7 @@ org.apache.flex.core.SimpleCSSValuesImpl.perInstanceStyles = {
*/
org.apache.flex.core.SimpleCSSValuesImpl.colorStyles = {
backgroundColor: 1,
+ borderColor: 1,
color: 1
};
[09/10] git commit: [flex-asjs] [refs/heads/develop] - watch for
style changes
Posted by ah...@apache.org.
watch for style 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/b4a0cfed
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b4a0cfed
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b4a0cfed
Branch: refs/heads/develop
Commit: b4a0cfed6d8ce997fa38825ac1236b577346180a
Parents: b3c3133
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jan 9 23:42:09 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jan 9 23:45:58 2015 -0800
----------------------------------------------------------------------
.../js/FlexJS/src/org/apache/flex/core/UIBase.js | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b4a0cfed/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 3916d4e..dfb2323 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
@@ -24,6 +24,7 @@ goog.require('org.apache.flex.core.IParentIUIBase');
goog.require('org.apache.flex.core.IStyleableObject');
goog.require('org.apache.flex.core.IUIBase');
goog.require('org.apache.flex.core.ValuesManager');
+goog.require('org.apache.flex.events.ValueChangeEvent');
@@ -781,6 +782,9 @@ org.apache.flex.core.UIBase.prototype.set_style = function(value) {
if (typeof(value) == 'string')
value = org.apache.flex.core.ValuesManager.valuesImpl.parseStyles(value);
this.style_ = value;
+ if (value.addEventListener)
+ value.addEventListener(org.apache.flex.events.ValueChangeEvent.VALUE_CHANGE,
+ goog.bind(this.styleChangeHandler, this));
this.dispatchEvent('stylesChanged');
}
};
@@ -788,6 +792,17 @@ org.apache.flex.core.UIBase.prototype.set_style = function(value) {
/**
* @expose
+ * @param {org.apache.flex.events.ValueChangeEvent} value The new style properties.
+ */
+org.apache.flex.core.UIBase.prototype.styleChangeHandler = function(value) {
+ var newStyle = {};
+ newStyle[value.propertyName] = value.newValue;
+ org.apache.flex.core.ValuesManager.valuesImpl.applyStyles(this, newStyle);
+};
+
+
+/**
+ * @expose
* @return {boolean} True if visible.
*/
org.apache.flex.core.UIBase.prototype.get_visible = function() {
[03/10] git commit: [flex-asjs] [refs/heads/develop] - handle
non-resizing
Posted by ah...@apache.org.
handle non-resizing
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bf1faefb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bf1faefb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bf1faefb
Branch: refs/heads/develop
Commit: bf1faefb420f3364b909f7df3363847def364d9e
Parents: d698204
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jan 9 13:48:55 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jan 9 23:45:57 2015 -0800
----------------------------------------------------------------------
.../flex/html/beads/layouts/NonVirtualBasicLayout.js | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bf1faefb/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js
index 814394e..56b6f39 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js
@@ -61,9 +61,14 @@ org.apache.flex.html.beads.layouts.NonVirtualBasicLayout.
goog.bind(this.changeHandler, this));
this.strand_.addEventListener('sizeChanged',
goog.bind(this.sizeChangeHandler, this));
- if (!isNaN(this.strand_.get_explicitWidth()) &&
- !isNaN(this.strand_.get_explicitHeight()))
- this.addOtherListeners();
+
+ // in JS, we won't always get size/width/height change
+ // events because we let the browser layout based on
+ // %'s and don't convert to pixels, so listen to the
+ // other events anyway.
+ /* if (!isNaN(this.strand_.get_explicitWidth()) &&
+ !isNaN(this.strand_.get_explicitHeight()))*/
+ this.addOtherListeners();
}
}
};
[05/10] git commit: [flex-asjs] [refs/heads/develop] - fix button
sizes
Posted by ah...@apache.org.
fix button 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/d698204b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d698204b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d698204b
Branch: refs/heads/develop
Commit: d698204bad1f23e485c7a2a258147c56c1c2d3c4
Parents: e145a2d
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jan 9 13:48:16 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jan 9 23:45:57 2015 -0800
----------------------------------------------------------------------
examples/FlexJSStore/src/main.css | 7 ++++++-
.../FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml | 6 +++---
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d698204b/examples/FlexJSStore/src/main.css
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore/src/main.css b/examples/FlexJSStore/src/main.css
index e092b58..938413e 100755
--- a/examples/FlexJSStore/src/main.css
+++ b/examples/FlexJSStore/src/main.css
@@ -92,4 +92,9 @@ basic|Container
{
cornerRadius: 4;
borderStyle: "solid";
-}
\ No newline at end of file
+}
+
+.hoverButton
+{
+ height: 20px;
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d698204b/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml b/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
index 0989fb5..85d24fd 100755
--- a/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
+++ b/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
@@ -191,21 +191,21 @@ limitations under the License.
<basic:LayoutChangeNotifier watchedProperty="{compare.height}" initialValue="0" />
<basic:LayoutChangeNotifier watchedProperty="{details.height}" initialValue="0" />
</basic:beads>
- <basic:ImageButton id="purchase" backgroundImage="assets/button_cart_empty.png"
+ <basic:ImageButton id="purchase" backgroundImage="assets/button_cart_empty.png" className="hoverButton"
click="dispatchEvent(new ProductThumbEvent(ProductThumbEvent.PURCHASE, product))"
width="30">
<basic:beads>
<basic:ToolTipBead toolTip="Add to cart"/>
</basic:beads>
</basic:ImageButton>
- <basic:ImageButton id="compare" backgroundImage="assets/button_compare.png"
+ <basic:ImageButton id="compare" backgroundImage="assets/button_compare.png" className="hoverButton"
click="dispatchEvent(new ProductThumbEvent(ProductThumbEvent.COMPARE, product))"
width="30">
<basic:beads>
<basic:ToolTipBead toolTip="Add to compare list"/>
</basic:beads>
</basic:ImageButton>
- <basic:ImageButton id="details" backgroundImage="assets/button_details.png"
+ <basic:ImageButton id="details" backgroundImage="assets/button_details.png" className="hoverButton"
click="dispatchEvent(new ProductThumbEvent(ProductThumbEvent.DETAILS, product))"
width="30">
<basic:beads>
[04/10] git commit: [flex-asjs] [refs/heads/develop] - add typename
on the as side so it will work in js when cross-compiled
Posted by ah...@apache.org.
add typename on the as side so it will work in js when cross-compiled
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e145a2dc
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e145a2dc
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e145a2dc
Branch: refs/heads/develop
Commit: e145a2dc50f565724f7c12388861d0768031c6e6
Parents: b08c587
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jan 9 13:47:05 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jan 9 23:45:57 2015 -0800
----------------------------------------------------------------------
.../FlexJSJX/src/org/apache/flex/html/ImageButton.as | 1 +
frameworks/as/projects/FlexJSUI/defaults.css | 5 +++++
.../projects/FlexJSUI/src/org/apache/flex/core/UIBase.as | 11 +++++++++++
.../FlexJSUI/src/org/apache/flex/core/UIButtonBase.as | 11 +++++++++++
4 files changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e145a2dc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/ImageButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/ImageButton.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/ImageButton.as
index 6db46d0..dd92019 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/ImageButton.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/ImageButton.as
@@ -42,6 +42,7 @@ package org.apache.flex.html
public function ImageButton()
{
super();
+ typeNames = "ImageButton";
}
public function get backgroundImage():String
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e145a2dc/frameworks/as/projects/FlexJSUI/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/defaults.css b/frameworks/as/projects/FlexJSUI/defaults.css
index c92fead..10c70db 100644
--- a/frameworks/as/projects/FlexJSUI/defaults.css
+++ b/frameworks/as/projects/FlexJSUI/defaults.css
@@ -108,6 +108,11 @@ HContainer
IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout");
}
+ImageButton
+{
+ border-style: none;
+}
+
VContainer
{
IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e145a2dc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIBase.as
index c4a7c4f..ad23c52 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIBase.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIBase.as
@@ -625,6 +625,17 @@ package org.apache.flex.core
}
}
+ /**
+ * A list of type names. Often used for CSS
+ * type selector lookups.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public var typeNames:String;
+
private var _className:String;
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e145a2dc/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 34b750c..561d848 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
@@ -594,6 +594,17 @@ package org.apache.flex.core
_styles = JSON.parse("{" + value + "}");
}
+ /**
+ * A list of type names. Often used for CSS
+ * type selector lookups.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public var typeNames:String;
+
private var _className:String;
/**
[02/10] git commit: [flex-asjs] [refs/heads/develop] - fix
databinding if backing var not named after the property
Posted by ah...@apache.org.
fix databinding if backing var not named after the 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/3f4ed92c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3f4ed92c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3f4ed92c
Branch: refs/heads/develop
Commit: 3f4ed92cbcc71f22797bee3d1863f27bb566519c
Parents: bf1faef
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jan 9 13:49:35 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jan 9 23:45:57 2015 -0800
----------------------------------------------------------------------
.../src/org/apache/flex/core/ApplicationDataBinding.as | 2 +-
.../FlexJSJX/src/org/apache/flex/core/ContainerDataBinding.as | 6 +++---
.../js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3f4ed92c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/ApplicationDataBinding.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/ApplicationDataBinding.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/ApplicationDataBinding.as
index 9a14e0e..27aef17 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/ApplicationDataBinding.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/ApplicationDataBinding.as
@@ -97,7 +97,7 @@ package org.apache.flex.core
binding = bindings[i];
if (binding.source is Array)
{
- if (binding.source[0] in _strand)
+ if (hasProperty(_strand, binding.source[0]))
{
if (binding.source.length == 2 && binding.destination.length == 2)
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3f4ed92c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/ContainerDataBinding.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/ContainerDataBinding.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/ContainerDataBinding.as
index 00a0a35..28e6c59 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/ContainerDataBinding.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/ContainerDataBinding.as
@@ -98,7 +98,7 @@ package org.apache.flex.core
binding = bindings[i];
if (binding.source is Array)
{
- if (binding.source[0] in _strand)
+ if (hasProperty(_strand, binding.source[0]))
{
if (binding.source.length == 2 && binding.destination.length == 2)
{
@@ -353,9 +353,9 @@ package org.apache.flex.core
{
for (var p:String in deferredBindings)
{
- if (_strand[p] != null)
+ if (getProperty(_strand, p) != null)
{
- var destination:IStrand = _strand[p] as IStrand;
+ var destination:IStrand = getProperty(_strand, p) as IStrand;
destination.addBead(deferredBindings[p]);
delete deferredBindings[p];
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3f4ed92c/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 de3ef28..d19c4fc 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js
@@ -67,6 +67,8 @@ org.apache.flex.binding.SimpleBinding.prototype.changeHandler = function() {
org.apache.flex.binding.SimpleBinding.prototype.set_strand = function(value) {
org.apache.flex.binding.SimpleBinding.base(this, 'set_strand', value);
+ if (!this.source)
+ return;
this.source.addEventListener(this.eventName,
goog.bind(this.changeHandler, this));
[06/10] git commit: [flex-asjs] [refs/heads/develop] - get a
background on tooltips
Posted by ah...@apache.org.
get a background on tooltips
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a4b5e975
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a4b5e975
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a4b5e975
Branch: refs/heads/develop
Commit: a4b5e9753e9b0ad4707800f0a80f7df5d2c390f9
Parents: b4a0cfe
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jan 9 23:43:02 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jan 9 23:45:58 2015 -0800
----------------------------------------------------------------------
frameworks/as/projects/FlexJSUI/basic-manifest.xml | 1 +
frameworks/as/projects/FlexJSUI/defaults.css | 5 +++++
frameworks/js/FlexJS/src/org/apache/flex/html/ToolTip.js | 1 +
3 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b5e975/frameworks/as/projects/FlexJSUI/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/basic-manifest.xml b/frameworks/as/projects/FlexJSUI/basic-manifest.xml
index 069eaef..e96f6c4 100644
--- a/frameworks/as/projects/FlexJSUI/basic-manifest.xml
+++ b/frameworks/as/projects/FlexJSUI/basic-manifest.xml
@@ -61,6 +61,7 @@
<component id="ControlBar" class="org.apache.flex.html.ControlBar"/>
<component id="TitleBar" class="org.apache.flex.html.TitleBar"/>
<component id="TitleBarModel" class="org.apache.flex.html.beads.models.TitleBarModel"/>
+ <component id="ToolTip" class="org.apache.flex.html.ToolTip"/>
<component id="NonVirtualBasicLayout" class="org.apache.flex.html.beads.layouts.NonVirtualBasicLayout"/>
<component id="NonVirtualBasicScrollingLayout" class="org.apache.flex.html.beads.layouts.NonVirtualBasicScrollingLayout"/>
<component id="NonVirtualVerticalLayout" class="org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b5e975/frameworks/as/projects/FlexJSUI/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/defaults.css b/frameworks/as/projects/FlexJSUI/defaults.css
index 10c70db..e59fb94 100644
--- a/frameworks/as/projects/FlexJSUI/defaults.css
+++ b/frameworks/as/projects/FlexJSUI/defaults.css
@@ -185,6 +185,11 @@ TitleBar
background-color: #FFFFFF;
}
+ToolTip
+{
+ background-color: #FFFFCC;
+}
+
/* Global Style Declaration */
global
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b5e975/frameworks/js/FlexJS/src/org/apache/flex/html/ToolTip.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ToolTip.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ToolTip.js
index a3670df..b3f5b07 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/ToolTip.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ToolTip.js
@@ -24,6 +24,7 @@ goog.require('org.apache.flex.html.Label');
*/
org.apache.flex.html.ToolTip = function() {
org.apache.flex.html.ToolTip.base(this, 'constructor');
+ this.element.className = 'ToolTip';
};
goog.inherits(org.apache.flex.html.ToolTip,
org.apache.flex.html.Label);
[08/10] git commit: [flex-asjs] [refs/heads/develop] - support solid
backgroundcolor
Posted by ah...@apache.org.
support solid backgroundcolor
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/639ba6fb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/639ba6fb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/639ba6fb
Branch: refs/heads/develop
Commit: 639ba6fb32df938ac4b464e3c0db6be3aa802262
Parents: 99d85c3
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jan 9 23:40:12 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jan 9 23:45:58 2015 -0800
----------------------------------------------------------------------
.../FlexJSUI/src/org/apache/flex/core/CSSTextField.as | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/639ba6fb/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 fa23ccd..16718c4 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
@@ -19,7 +19,7 @@
package org.apache.flex.core
{
import flash.text.TextField;
- import flash.text.TextFieldAutoSize;
+ import flash.text.TextFieldAutoSize;
import flash.text.TextFormat;
import org.apache.flex.core.ValuesManager;
@@ -94,7 +94,17 @@ package org.apache.flex.core
tf.align = "right";
autoSize = TextFieldAutoSize.NONE;
}
-
+ var backgroundColor:Object = ValuesManager.valuesImpl.getValue(sp, "background-color");
+ if (backgroundColor != null)
+ {
+ this.background = true;
+ if (backgroundColor is String)
+ {
+ backgroundColor = backgroundColor.replace("#", "0x");
+ backgroundColor = uint(backgroundColor);
+ }
+ this.backgroundColor = backgroundColor as uint;
+ }
defaultTextFormat = tf;
super.text = value;
}