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/09/04 03:25:06 UTC
[3/3] git commit: [flex-asjs] [refs/heads/develop] - fix picking up
style changes
fix picking up 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/47034f5e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/47034f5e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/47034f5e
Branch: refs/heads/develop
Commit: 47034f5ec57230a3f7bc4cc3210db096a937f958
Parents: a357158
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 3 18:23:31 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 3 18:23:31 2015 -0700
----------------------------------------------------------------------
.../org/apache/flex/core/BindableCSSStyles.as | 29 ++++++++++++++++++++
.../src/org/apache/flex/core/SimpleCSSStyles.as | 29 ++++++++++++++++++++
.../org/apache/flex/core/SimpleCSSValuesImpl.js | 5 +++-
3 files changed, 62 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/47034f5e/frameworks/projects/Core/asjs/src/org/apache/flex/core/BindableCSSStyles.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/asjs/src/org/apache/flex/core/BindableCSSStyles.as b/frameworks/projects/Core/asjs/src/org/apache/flex/core/BindableCSSStyles.as
index 9f8ac05..399fd0b 100644
--- a/frameworks/projects/Core/asjs/src/org/apache/flex/core/BindableCSSStyles.as
+++ b/frameworks/projects/Core/asjs/src/org/apache/flex/core/BindableCSSStyles.as
@@ -46,6 +46,35 @@ package org.apache.flex.core
super();
}
+ public var styleList:Object = {
+ "top": 1,
+ "bottom": 1,
+ "left": 1,
+ "right": 1,
+ "padding": 1,
+ "paddingLeft": 1,
+ "paddingRight": 1,
+ "paddingTop": 1,
+ "paddingBottom": 1,
+ "margin": 1,
+ "marginLeft": 1,
+ "marginRight": 1,
+ "marginTop": 1,
+ "marginBottom": 1,
+ "verticalAlign": 1,
+ "fontFamily": 1,
+ "fontSize": 1,
+ "color": 1,
+ "fontWeight": 1,
+ "fontStyle": 1,
+ "backgroundAlpha": 1,
+ "backgroundColor": 1,
+ "backgroundImage": 1,
+ "borderColor": 1,
+ "borderStyle": 1,
+ "borderRadius": 1,
+ "borderWidth": 1
+ };
[Bindable]
public var top:*;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/47034f5e/frameworks/projects/Core/asjs/src/org/apache/flex/core/SimpleCSSStyles.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/asjs/src/org/apache/flex/core/SimpleCSSStyles.as b/frameworks/projects/Core/asjs/src/org/apache/flex/core/SimpleCSSStyles.as
index b9bfef0..3b156e3 100644
--- a/frameworks/projects/Core/asjs/src/org/apache/flex/core/SimpleCSSStyles.as
+++ b/frameworks/projects/Core/asjs/src/org/apache/flex/core/SimpleCSSStyles.as
@@ -45,6 +45,35 @@ package org.apache.flex.core
super();
}
+ public var styleList:Object = {
+ "top": 1,
+ "bottom": 1,
+ "left": 1,
+ "right": 1,
+ "padding": 1,
+ "paddingLeft": 1,
+ "paddingRight": 1,
+ "paddingTop": 1,
+ "paddingBottom": 1,
+ "margin": 1,
+ "marginLeft": 1,
+ "marginRight": 1,
+ "marginTop": 1,
+ "marginBottom": 1,
+ "verticalAlign": 1,
+ "fontFamily": 1,
+ "fontSize": 1,
+ "color": 1,
+ "fontWeight": 1,
+ "fontStyle": 1,
+ "backgroundAlpha": 1,
+ "backgroundColor": 1,
+ "backgroundImage": 1,
+ "borderColor": 1,
+ "borderStyle": 1,
+ "borderRadius": 1,
+ "borderWidth": 1
+ };
public var top:*;
public var bottom:*;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/47034f5e/frameworks/projects/Core/js/src/org/apache/flex/core/SimpleCSSValuesImpl.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/SimpleCSSValuesImpl.js b/frameworks/projects/Core/js/src/org/apache/flex/core/SimpleCSSValuesImpl.js
index 6f5013a..8eca079 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/SimpleCSSValuesImpl.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/SimpleCSSValuesImpl.js
@@ -336,7 +336,10 @@ org.apache.flex.core.SimpleCSSValuesImpl.prototype.applyStyles =
var styleList = org.apache.flex.core.SimpleCSSValuesImpl.perInstanceStyles;
var colorStyles = org.apache.flex.core.SimpleCSSValuesImpl.colorStyles;
var skipStyles = org.apache.flex.core.SimpleCSSValuesImpl.skipStyles;
- for (var p in styles) {
+ var listObj = styles;
+ if (styles.styleList)
+ listObj = styles.styleList;
+ for (var p in listObj) {
//if (styleList[p])
if (skipStyles[p])
continue;