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 2017/06/02 07:04:41 UTC
[1/7] git commit: [flex-asjs] [refs/heads/release0.8.0] - fixup
projectdir for cordova builds
Repository: flex-asjs
Updated Branches:
refs/heads/release0.8.0 d6cb59b17 -> f021c8f75
fixup projectdir for cordova builds
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f021c8f7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f021c8f7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f021c8f7
Branch: refs/heads/release0.8.0
Commit: f021c8f754644d9f917de858bde3360a71be1746
Parents: 34be88f
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jun 2 00:04:39 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 2 00:04:48 2017 -0700
----------------------------------------------------------------------
examples/build_example.xml | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f021c8f7/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index 90809a8..d97398a 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -385,13 +385,19 @@
<target name="compile.cordova" description="Executes the Cordova build script to run the app on a device." if="has.cordova">
<property name="mobile.platform" value="android" />
- <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="main" />
- <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="load-platform.${mobile.platform}" />
+ <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="main" >
+ <property name="projectdir" value="${basedir}" />
+ </ant>
+ <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="load-platform.${mobile.platform}" >
+ <property name="projectdir" value="${basedir}" />
+ </ant>
</target>
<target name="run.cordova" description="Executes the Cordova build script to run the app on a device." if="has.cordova">
<property name="mobile.platform" value="android" />
- <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="run.${mobile.platform}" />
+ <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="run.${mobile.platform}" >
+ <property name="projectdir" value="${basedir}" />
+ </ant>
</target>
</project>
[7/7] git commit: [flex-asjs] [refs/heads/release0.8.0] - get rid of
build errors (still two warnings)
Posted by ah...@apache.org.
get rid of build errors (still two warnings)
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d35f6ec2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d35f6ec2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d35f6ec2
Branch: refs/heads/release0.8.0
Commit: d35f6ec222013476d874f4f50a6a7c7d72c487cd
Parents: fae4a65
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 1 21:43:16 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 2 00:04:48 2017 -0700
----------------------------------------------------------------------
.../src/main/config/compile-app-config.xml | 26 ++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d35f6ec2/examples/flexjs/MobileStocks/src/main/config/compile-app-config.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileStocks/src/main/config/compile-app-config.xml b/examples/flexjs/MobileStocks/src/main/config/compile-app-config.xml
new file mode 100644
index 0000000..a165dee
--- /dev/null
+++ b/examples/flexjs/MobileStocks/src/main/config/compile-app-config.xml
@@ -0,0 +1,26 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<flex-config>
+ <remove-circulars>true</remove-circulars>
+ <compiler>
+ <js-external-library-path append="true">
+ <path-element>../../../../../../js/libs/cordova.swc</path-element>
+ </js-external-library-path>
+ </compiler>
+</flex-config>
[3/7] git commit: [flex-asjs] [refs/heads/release0.8.0] - copy assets
for JS side before cordova build copies the output
Posted by ah...@apache.org.
copy assets for JS side before cordova build copies the output
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f15f3b83
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f15f3b83
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f15f3b83
Branch: refs/heads/release0.8.0
Commit: f15f3b833b6cde5c1454fc54f9f7236ca6ea96bb
Parents: ac36224
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 1 11:48:22 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 2 00:04:48 2017 -0700
----------------------------------------------------------------------
examples/build_example.xml | 15 +++++++++++++++
examples/flexjs/MobileStocks/build.xml | 12 +-----------
2 files changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f15f3b83/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index ab2c62c..90809a8 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -334,6 +334,21 @@
</copy>
</target>
+ <target name="copy-js-resources" depends="check-resources" if="has-resources">
+ <mkdir dir="${basedir}/bin/js-debug/assets" />
+ <copy todir="${basedir}/bin/js-debug/assets" >
+ <fileset dir="${basedir}/src/main/resources/assets">
+ <include name="**" />
+ </fileset>
+ </copy>
+ <mkdir dir="${basedir}/bin/js-release/assets" />
+ <copy todir="${basedir}/bin/js-release/assets" >
+ <fileset dir="${basedir}/src/main/resources/assets">
+ <include name="**" />
+ </fileset>
+ </copy>
+ </target>
+
<target name="run.air">
<property name="profile" value="mobileDevice" />
<property name="screensize" value="640x960:640x960" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f15f3b83/examples/flexjs/MobileStocks/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileStocks/build.xml b/examples/flexjs/MobileStocks/build.xml
index 397b895..5959255 100644
--- a/examples/flexjs/MobileStocks/build.xml
+++ b/examples/flexjs/MobileStocks/build.xml
@@ -37,17 +37,7 @@
<include file="${basedir}/../../build_example.xml" />
- <target name="main" depends="clean,build_example.compile,build_example.compile.cordova" description="Clean build of ${example}">
- <copy todir="${basedir}/bin-debug" >
- <fileset dir="${basedir}">
- <include name="*-app.xml" />
- </fileset>
- </copy>
- <copy todir="${basedir}/bin-release" >
- <fileset dir="${basedir}">
- <include name="*-app.xml" />
- </fileset>
- </copy>
+ <target name="main" depends="clean,build_example.compile,build_example.copy-js-resources,build_example.compile.cordova" description="Clean build of ${example}">
</target>
<target name="clean">
[6/7] git commit: [flex-asjs] [refs/heads/release0.8.0] - clean
example
Posted by ah...@apache.org.
clean example
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/34be88fb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/34be88fb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/34be88fb
Branch: refs/heads/release0.8.0
Commit: 34be88fb7046a27edc3276cdd04b80849e2a984f
Parents: 1e6c5fa
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 1 22:33:50 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 2 00:04:48 2017 -0700
----------------------------------------------------------------------
examples/flexjs/StorageExample/build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/34be88fb/examples/flexjs/StorageExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/StorageExample/build.xml b/examples/flexjs/StorageExample/build.xml
index e990b7f..97d921d 100644
--- a/examples/flexjs/StorageExample/build.xml
+++ b/examples/flexjs/StorageExample/build.xml
@@ -67,6 +67,7 @@
</target>
<target name="clean">
+ <delete dir="${basedir}/app" failonerror="false" />
<delete dir="${basedir}/bin" failonerror="false" />
<delete dir="${basedir}/bin-debug" failonerror="false" />
<delete dir="${basedir}/bin-release" failonerror="false" />
[2/7] git commit: [flex-asjs] [refs/heads/release0.8.0] - clean up
build script
Posted by ah...@apache.org.
clean up build script
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1e6c5fa0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1e6c5fa0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1e6c5fa0
Branch: refs/heads/release0.8.0
Commit: 1e6c5fa0513b4875c07038cd6eeedfbc80ce58b7
Parents: d35f6ec
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 1 21:52:57 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 2 00:04:48 2017 -0700
----------------------------------------------------------------------
examples/flexjs/MobileTrader/build.xml | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1e6c5fa0/examples/flexjs/MobileTrader/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/build.xml b/examples/flexjs/MobileTrader/build.xml
index 8c7ab5f..0e654e6 100644
--- a/examples/flexjs/MobileTrader/build.xml
+++ b/examples/flexjs/MobileTrader/build.xml
@@ -48,28 +48,14 @@
</condition>
<property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
- <target name="main" depends="clean,build_example.compile,copyassets,build_example.compile.cordova" description="Clean build of ${example}">
- </target>
-
- <target name="copyassets">
- <mkdir dir="${basedir}/bin/js-debug/assets" />
- <copy todir="${basedir}/bin/js-debug/assets" >
- <fileset dir="${basedir}/src/main/resources/assets">
- <include name="**" />
- </fileset>
- </copy>
- <mkdir dir="${basedir}/bin/js-release/assets" />
- <copy todir="${basedir}/bin/js-release/assets" >
- <fileset dir="${basedir}/src/main/resources/assets">
- <include name="**" />
- </fileset>
- </copy>
+ <target name="main" depends="clean,build_example.compile,build_example.copy-js-resources,build_example.compile.cordova" description="Clean build of ${example}">
</target>
<target name="clean">
<delete dir="${basedir}/bin" failonerror="false" />
<delete dir="${basedir}/bin-debug" failonerror="false" />
<delete dir="${basedir}/bin-release" failonerror="false" />
+ <delete dir="${basedir}/app" failonerror="false" />
<delete dir="${basedir}/target" failonerror="false" />
</target>
[4/7] git commit: [flex-asjs] [refs/heads/release0.8.0] -
de-hyphenate in parsestyles so the lookup works in getValues
Posted by ah...@apache.org.
de-hyphenate in parsestyles so the lookup works in getValues
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ac362246
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ac362246
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ac362246
Branch: refs/heads/release0.8.0
Commit: ac36224627d339fc83efcd81b0f79dc2a73da8f5
Parents: d6cb59b
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 1 11:47:18 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 2 00:04:48 2017 -0700
----------------------------------------------------------------------
.../org/apache/flex/core/SimpleCSSValuesImpl.as | 22 ++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ac362246/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 7965712..0ab68bc 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
@@ -593,13 +593,23 @@ package org.apache.flex.core
for each (var part:String in parts)
{
var pieces:Array = StringUtil.splitAndTrim(part, ":");
+ var valueName:String = pieces[0];
+ var c:int = valueName.indexOf("-");
+ while (c != -1)
+ {
+ valueName = valueName.substr(0, c) +
+ valueName.charAt(c + 1).toUpperCase() +
+ valueName.substr(c + 2);
+ c = valueName.indexOf("-");
+ }
+
var value:String = pieces[1];
if (value == "null")
- obj[pieces[0]] = null;
+ obj[valueName] = null;
else if (value == "true")
- obj[pieces[0]] = true;
+ obj[valueName] = true;
else if (value == "false")
- obj[pieces[0]] = false;
+ obj[valueName] = false;
else
{
var n:Number = Number(value);
@@ -607,7 +617,7 @@ package org.apache.flex.core
{
if (value.charAt(0) == "#" || value.indexOf("rgb") == 0)
{
- obj[pieces[0]] = CSSUtils.toColor(value);
+ obj[valueName] = CSSUtils.toColor(value);
}
else
{
@@ -615,11 +625,11 @@ package org.apache.flex.core
value = value.substr(1, value.length - 2);
else if (value.charAt(0) == '"')
value = value.substr(1, value.length - 2);
- obj[pieces[0]] = value;
+ obj[valueName] = value;
}
}
else
- obj[pieces[0]] = n;
+ obj[valueName] = n;
}
}
return obj;
[5/7] git commit: [flex-asjs] [refs/heads/release0.8.0] - percentage
layout does not work well when in a child of flex-box container,
so we have to approximate percentages with flex-grow instead
Posted by ah...@apache.org.
percentage layout does not work well when in a child of flex-box container, so we have to approximate percentages with flex-grow instead
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fae4a658
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fae4a658
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fae4a658
Branch: refs/heads/release0.8.0
Commit: fae4a658b43a1cb77908e2a1acc10cc2259fa16b
Parents: f15f3b8
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 1 11:50:31 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 2 00:04:48 2017 -0700
----------------------------------------------------------------------
.../MobileStocks/src/main/flex/views/LaunchView.mxml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fae4a658/examples/flexjs/MobileStocks/src/main/flex/views/LaunchView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileStocks/src/main/flex/views/LaunchView.mxml b/examples/flexjs/MobileStocks/src/main/flex/views/LaunchView.mxml
index 91fecfe..541480d 100644
--- a/examples/flexjs/MobileStocks/src/main/flex/views/LaunchView.mxml
+++ b/examples/flexjs/MobileStocks/src/main/flex/views/LaunchView.mxml
@@ -122,7 +122,7 @@ limitations under the License.
</fx:Metadata>
<js:beads>
- <js:VerticalLayout />
+ <js:VerticalFlexLayout />
</js:beads>
<!--
@@ -146,8 +146,7 @@ limitations under the License.
<js:TextButton id="removeButton" text="Remove" width="80" click="removeSymbol()" className="InputChild" />
</js:Container>
- <js:Container height="45%" width="100%">
- <js:DataGrid id="assetGrid" height="100%" width="100%" rowHeight="25" change="gridSelected()" className="LaunchGrid">
+ <js:DataGrid id="assetGrid" style="flex-grow:'45'" width="100%" rowHeight="25" change="gridSelected()" className="LaunchGrid">
<js:beads>
<js:DataGridPercentageView />
<js:SimpleBinding
@@ -165,11 +164,10 @@ limitations under the License.
<js:DataGridColumn columnWidth="24" label="Total $" dataField="shares" itemRenderer="renderers.SharesTotalRenderer" />
</js:columns>
</js:DataGrid>
- </js:Container>
- <js:Spacer height="3%" />
+ <js:Spacer style="flex-grow:'3'" />
- <js:BarChart id="barChart" width="100%" height="40%" className="AllCharts">
+ <js:BarChart id="barChart" width="100%" style="flex-grow:'45'" className="AllCharts">
<js:model>
<js:ChartArrayListSelectionModel />
</js:model>