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/09/15 05:40:55 UTC
[1/2] git commit: [flex-asjs] [refs/heads/develop] - add reminder to
update JIRA
Repository: flex-asjs
Updated Branches:
refs/heads/develop c9b2a020e -> 8226d2fc7
add reminder to update JIRA
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/773987e1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/773987e1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/773987e1
Branch: refs/heads/develop
Commit: 773987e1e3987eff2081493bd680da05be8cbd9e
Parents: c9b2a02
Author: Alex Harui <ah...@apache.org>
Authored: Tue Sep 13 08:03:06 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Sep 14 14:19:59 2016 -0700
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/773987e1/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 997fb8d..f5ab8c5 100644
--- a/build.xml
+++ b/build.xml
@@ -972,6 +972,7 @@
value="<versionNumber>${new-version}</versionNumber>" >
<include name="**/*-app.xml"/>
</replace>
+ <echo>Don't forget to update JIRA to indicate current version is released and add new version</echo>
</target>
<!--
[2/2] git commit: [flex-asjs] [refs/heads/develop] - change JS CSS
encoding
Posted by ah...@apache.org.
change JS CSS encoding
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8226d2fc
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8226d2fc
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8226d2fc
Branch: refs/heads/develop
Commit: 8226d2fc7c28022de9ca5eede142723744db6689
Parents: 773987e
Author: Alex Harui <ah...@apache.org>
Authored: Wed Sep 14 17:17:29 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Sep 14 17:17:29 2016 -0700
----------------------------------------------------------------------
.../org/apache/flex/core/SimpleCSSValuesImpl.as | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8226d2fc/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
index 7afd2ff..29ba5e9 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
@@ -125,21 +125,20 @@ package org.apache.flex.core
i += numMQ;
}
var numSel:int = cssData[i++];
- var props:Object = {};
+ var propFn:Function = cssData[i + numSel];
+ var props:Object;
for (var j:int = 0; j < numSel; j++)
{
var selName:String = cssData[i++];
if (values[selName])
+ {
props = values[selName];
- values[selName] = props;
- }
- var numProps:int = cssData[i++];
- for (j = 0; j < numProps; j++)
- {
- var propName:String = cssData[i++];
- var propValue:Object = cssData[i++];
- props[propName] = propValue;
+ propFn.prototype = props;
+ }
+ values[selName] = new propFn();
}
+ // skip the propFn
+ props = cssData[i++];
}
}