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/05/19 16:58:20 UTC
[1/4] git commit: [flex-asjs] [refs/heads/release0.8.0] - don't
differentiate between sizedToContent in host dimensions
Repository: flex-asjs
Updated Branches:
refs/heads/release0.8.0 9fb9294bf -> a9ae1452a
don't differentiate between sizedToContent in host dimensions
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/23590376
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/23590376
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/23590376
Branch: refs/heads/release0.8.0
Commit: 2359037693a833e8719cea41100c2ba062ada735
Parents: 9fb9294
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 19 09:55:13 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 19 09:55:13 2017 -0700
----------------------------------------------------------------------
.../FlexibleFirstChildHorizontalLayout.as | 18 ++++-----
.../html/beads/layouts/HorizontalFlexLayout.as | 4 +-
.../flex/html/beads/layouts/HorizontalLayout.as | 28 ++++++-------
.../layouts/OneFlexibleChildHorizontalLayout.as | 42 +++++++++-----------
.../layouts/OneFlexibleChildVerticalLayout.as | 42 +++++++++-----------
.../html/beads/layouts/VerticalFlexLayout.as | 4 +-
.../flex/html/beads/layouts/VerticalLayout.as | 31 +++++++--------
7 files changed, 76 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23590376/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
index f276074..c1e6d27 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
@@ -132,8 +132,8 @@ package org.apache.flex.html.beads.layouts
var maxWidth:Number = 0;
var maxHeight:Number = 0;
var hostSizedToContent:Boolean = host.isHeightSizedToContent();
- var hostWidth:Number = contentView.width;
- var hostHeight:Number = hostSizedToContent ? 0 : contentView.height;
+ var hostWidth:Number = host.width;
+ var hostHeight:Number = host.height;
var ilc:ILayoutChild;
var data:Object;
@@ -162,15 +162,13 @@ package org.apache.flex.html.beads.layouts
var childYpos:Number = ypos + margins.top; // default y position
- if (!hostSizedToContent) {
- var childHeight:Number = child.height;
- if (ilc != null && !isNaN(ilc.percentHeight)) {
- childHeight = hostHeight * ilc.percentHeight/100.0;
- ilc.setHeight(childHeight);
- }
- // the following code middle-aligns the child
- childYpos = hostHeight/2 - childHeight/2;
+ var childHeight:Number = child.height;
+ if (ilc != null && !isNaN(ilc.percentHeight)) {
+ childHeight = hostHeight * ilc.percentHeight/100.0;
+ ilc.setHeight(childHeight);
}
+ // the following code middle-aligns the child
+ childYpos = hostHeight/2 - childHeight/2;
if (ilc) {
if (!isNaN(ilc.percentWidth)) {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23590376/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
index 9c8f1ce..65404ea 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
@@ -118,8 +118,8 @@ package org.apache.flex.html.beads.layouts
var childData:Array = [];
var hostWidthSizedToContent:Boolean = host.isWidthSizedToContent();
var hostHeightSizedToContent:Boolean = host.isHeightSizedToContent();
- var hostWidth:Number = hostWidthSizedToContent ? host.width : contentView.width;
- var hostHeight:Number = hostHeightSizedToContent ? host.height : contentView.height;
+ var hostWidth:Number = host.width;
+ var hostHeight:Number = host.height;
var ilc:ILayoutChild;
var data:Object;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23590376/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as
index 89aab6e..ef4e118 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as
@@ -109,8 +109,8 @@ package org.apache.flex.html.beads.layouts
var maxHeight:Number = 0;
var hostWidthSizedToContent:Boolean = host.isWidthSizedToContent();
var hostHeightSizedToContent:Boolean = host.isHeightSizedToContent();
- var hostWidth:Number = hostWidthSizedToContent ? 0 : contentView.width;
- var hostHeight:Number = hostHeightSizedToContent ? 0 : contentView.height;
+ var hostWidth:Number = host.width;
+ var hostHeight:Number = host.height;
var ilc:ILayoutChild;
var data:Object;
@@ -141,24 +141,22 @@ package org.apache.flex.html.beads.layouts
var childYpos:Number = ypos + margins.top; // default y position
- if (!hostHeightSizedToContent) {
- var childHeight:Number = child.height;
- if (ilc != null && !isNaN(ilc.percentHeight)) {
- childHeight = hostHeight * ilc.percentHeight/100.0;
- ilc.setHeight(childHeight);
- }
- var valign:Object = ValuesManager.valuesImpl.getValue(child, "vertical-align");
- if (valign == "middle")
- {
- childYpos = hostHeight/2 - (childHeight + margins.top + margins.bottom)/2;
- }
+ var childHeight:Number = child.height;
+ if (ilc != null && !isNaN(ilc.percentHeight)) {
+ childHeight = hostHeight * ilc.percentHeight/100.0;
+ ilc.setHeight(childHeight);
}
-
+ var valign:Object = ValuesManager.valuesImpl.getValue(child, "vertical-align");
+ if (valign == "middle")
+ {
+ childYpos = hostHeight/2 - (childHeight + margins.top + margins.bottom)/2;
+ }
+
if (ilc) {
ilc.setX(xpos);
ilc.setY(childYpos);
- if (!hostWidthSizedToContent && !isNaN(ilc.percentWidth)) {
+ if (!isNaN(ilc.percentWidth)) {
var newWidth:Number = hostWidth * ilc.percentWidth / 100;
ilc.setWidth(newWidth);
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23590376/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
index c90f223..17fb651 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
@@ -185,8 +185,8 @@ package org.apache.flex.html.beads.layouts
var maxWidth:Number = 0;
var maxHeight:Number = 0;
var hostSizedToContent:Boolean = host.isHeightSizedToContent();
- var hostWidth:Number = contentView.width;
- var hostHeight:Number = hostSizedToContent ? 0 : contentView.height;
+ var hostWidth:Number = host.width;
+ var hostHeight:Number = host.height;
var ilc:ILayoutChild;
var data:Object;
@@ -224,15 +224,13 @@ package org.apache.flex.html.beads.layouts
childYpos = ypos + margins.top; // default y position
- if (!hostSizedToContent) {
- childHeight = child.height;
- if (ilc != null && !isNaN(ilc.percentHeight)) {
- childHeight = host.height * ilc.percentHeight/100.0;
- ilc.setHeight(childHeight);
- }
- // the following code middle-aligns the child
- childYpos = hostHeight/2 - childHeight/2 + ypos;
+ childHeight = child.height;
+ if (ilc != null && !isNaN(ilc.percentHeight)) {
+ childHeight = host.height * ilc.percentHeight/100.0;
+ ilc.setHeight(childHeight);
}
+ // the following code middle-aligns the child
+ childYpos = hostHeight/2 - childHeight/2 + ypos;
if (ilc) {
ilc.setX(xpos);
@@ -265,15 +263,13 @@ package org.apache.flex.html.beads.layouts
childYpos = ypos + margins.top; // default y position
- if (!hostSizedToContent) {
- childHeight = child.height;
- if (ilc != null && !isNaN(ilc.percentHeight)) {
- childHeight = hostHeight * ilc.percentHeight/100.0;
- ilc.setHeight(childHeight);
- }
- // the following code middle-aligns the child
- childYpos = hostHeight/2 - childHeight/2 + ypos;
+ childHeight = child.height;
+ if (ilc != null && !isNaN(ilc.percentHeight)) {
+ childHeight = hostHeight * ilc.percentHeight/100.0;
+ ilc.setHeight(childHeight);
}
+ // the following code middle-aligns the child
+ childYpos = hostHeight/2 - childHeight/2 + ypos;
if (ilc) {
if (!isNaN(ilc.percentWidth)) {
@@ -299,12 +295,10 @@ package org.apache.flex.html.beads.layouts
if (actualChild != null) {
margins = childMargins(actualChild, hostWidth, hostHeight);
ilc = actualChild as ILayoutChild;
- if (!hostSizedToContent) {
- childHeight = actualChild.height;
- if (ilc != null && !isNaN(ilc.percentHeight)) {
- childHeight = hostHeight * ilc.percentHeight/100.0;
- ilc.setHeight(childHeight);
- }
+ childHeight = actualChild.height;
+ if (ilc != null && !isNaN(ilc.percentHeight)) {
+ childHeight = hostHeight * ilc.percentHeight/100.0;
+ ilc.setHeight(childHeight);
}
childYpos = ypos + margins.top;
if (!hostSizedToContent) {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23590376/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
index 9242d91..f80bafe 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
@@ -186,8 +186,8 @@ package org.apache.flex.html.beads.layouts
var maxWidth:Number = 0;
var maxHeight:Number = 0;
var hostSizedToContent:Boolean = host.isWidthSizedToContent();
- var hostWidth:Number = hostSizedToContent ? 0 : contentView.width;
- var hostHeight:Number = contentView.height;
+ var hostWidth:Number = host.width;
+ var hostHeight:Number = host.height;
var ilc:ILayoutChild;
var data:Object;
@@ -225,15 +225,13 @@ package org.apache.flex.html.beads.layouts
childXpos = xpos + margins.left; // default x position
- if (!hostSizedToContent) {
- childWidth = child.width;
- if (ilc != null && !isNaN(ilc.percentWidth)) {
- childWidth = hostWidth * ilc.percentWidth/100.0;
- ilc.setWidth(childWidth);
- }
- // the following code middle-aligns the child
- childXpos = hostWidth/2 - childWidth/2 + xpos;
+ childWidth = child.width;
+ if (ilc != null && !isNaN(ilc.percentWidth)) {
+ childWidth = hostWidth * ilc.percentWidth/100.0;
+ ilc.setWidth(childWidth);
}
+ // the following code middle-aligns the child
+ childXpos = hostWidth/2 - childWidth/2 + xpos;
if (ilc) {
ilc.setX(childXpos);
@@ -266,15 +264,13 @@ package org.apache.flex.html.beads.layouts
childXpos = xpos + margins.left; // default x position
- if (!hostSizedToContent) {
- childWidth = child.width;
- if (ilc != null && !isNaN(ilc.percentWidth)) {
- childWidth = hostWidth * ilc.percentWidth/100.0;
- ilc.setWidth(childWidth);
- }
- // the following code middle-aligns the child
- childXpos = hostWidth/2 - childWidth/2 + xpos;
+ childWidth = child.width;
+ if (ilc != null && !isNaN(ilc.percentWidth)) {
+ childWidth = hostWidth * ilc.percentWidth/100.0;
+ ilc.setWidth(childWidth);
}
+ // the following code middle-aligns the child
+ childXpos = hostWidth/2 - childWidth/2 + xpos;
if (ilc) {
if (!isNaN(ilc.percentHeight)) {
@@ -300,12 +296,10 @@ package org.apache.flex.html.beads.layouts
if (actualChild != null) {
margins = childMargins(actualChild, hostWidth, hostHeight);
ilc = actualChild as ILayoutChild;
- if (!hostSizedToContent) {
- childWidth = actualChild.width;
- if (ilc != null && !isNaN(ilc.percentWidth)) {
- childWidth = hostWidth * ilc.percentWidth/100.0;
- ilc.setWidth(childWidth);
- }
+ childWidth = actualChild.width;
+ if (ilc != null && !isNaN(ilc.percentWidth)) {
+ childWidth = hostWidth * ilc.percentWidth/100.0;
+ ilc.setWidth(childWidth);
}
childXpos = xpos + margins.left;
if (!hostSizedToContent) {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23590376/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as
index 6afc299..6dd6a3c 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as
@@ -116,8 +116,8 @@ package org.apache.flex.html.beads.layouts
var childData:Array = [];
var hostWidthSizedToContent:Boolean = host.isWidthSizedToContent();
var hostHeightSizedToContent:Boolean = host.isHeightSizedToContent();
- var hostWidth:Number = hostWidthSizedToContent ? host.width : contentView.width;
- var hostHeight:Number = hostHeightSizedToContent ? host.height : contentView.height;
+ var hostWidth:Number = host.width;
+ var hostHeight:Number = host.height;
var ilc:ILayoutChild;
var data:Object;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23590376/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as
index 00afeb6..d751997 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as
@@ -89,8 +89,8 @@ package org.apache.flex.html.beads.layouts
var maxHeight:Number = 0;
var hostWidthSizedToContent:Boolean = host.isWidthSizedToContent();
var hostHeightSizedToContent:Boolean = host.isHeightSizedToContent();
- var hostWidth:Number = hostWidthSizedToContent ? 0 : contentView.width;
- var hostHeight:Number = hostHeightSizedToContent ? 0 : contentView.height;
+ var hostWidth:Number = host.width;
+ var hostHeight:Number = host.height;
var ilc:ILayoutChild;
var data:Object;
@@ -121,25 +121,24 @@ package org.apache.flex.html.beads.layouts
var childXpos:Number = xpos + margins.left; // default x position
- if (!hostWidthSizedToContent) {
- var childWidth:Number = child.width;
- if (ilc != null && !isNaN(ilc.percentWidth)) {
- childWidth = hostWidth * ilc.percentWidth/100.0;
- ilc.setWidth(childWidth);
- }
- else if (ilc.isWidthSizedToContent() && !margins.auto)
- {
- childWidth = hostWidth;
- ilc.setWidth(childWidth);
- }
- if (margins.auto)
- childXpos = (hostWidth - childWidth) / 2;
+ var childWidth:Number = child.width;
+ if (ilc != null && !isNaN(ilc.percentWidth)) {
+ childWidth = hostWidth * ilc.percentWidth/100.0;
+ ilc.setWidth(childWidth);
+ }
+ else if (ilc.isWidthSizedToContent() && !margins.auto)
+ {
+ childWidth = hostWidth;
+ ilc.setWidth(childWidth);
}
+ if (margins.auto)
+ childXpos = (hostWidth - childWidth) / 2;
+
if (ilc) {
ilc.setX(childXpos);
ilc.setY(ypos);
- if (!hostHeightSizedToContent && !isNaN(ilc.percentHeight)) {
+ if (!isNaN(ilc.percentHeight)) {
var newHeight:Number = hostHeight * ilc.percentHeight / 100;
ilc.setHeight(newHeight);
}
[4/4] git commit: [flex-asjs] [refs/heads/release0.8.0] - fix up
examine targets
Posted by ah...@apache.org.
fix up examine targets
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a9ae1452
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a9ae1452
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a9ae1452
Branch: refs/heads/release0.8.0
Commit: a9ae1452a922648e8c4cb907cfe3d915ae5ec619
Parents: b3b3cd6
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 19 09:57:56 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 19 09:57:56 2017 -0700
----------------------------------------------------------------------
examples/build_example.xml | 16 ++++++++++++++++
examples/flexjs/ASDoc/build.xml | 7 ++++++-
examples/flexjs/DesktopMap/build.xml | 4 +++-
examples/flexjs/MapSearch/build.xml | 8 +++++---
examples/flexjs/MobileMap/build.xml | 3 ++-
examples/flexjs/MobileStocks/build.xml | 18 +-----------------
examples/flexjs/MobileTrader/build.xml | 4 +++-
examples/flexjs/StorageExample/build.xml | 2 +-
8 files changed, 37 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index 178c262..65c4149 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -92,6 +92,22 @@
</and>
</condition>
+ <condition property="adl" value="adl.exe">
+ <os family="windows"/>
+ </condition>
+
+ <condition property="adl" value="adl">
+ <os family="mac"/>
+ </condition>
+
+ <condition property="runtime" value="win">
+ <os family="windows"/>
+ </condition>
+
+ <condition property="runtime" value="mac">
+ <os family="mac"/>
+ </condition>
+
<target name="get.browser" >
<condition property="browser" value="${env.ProgramFiles}/Mozilla Firefox/firefox.exe">
<and>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/ASDoc/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ASDoc/build.xml b/examples/flexjs/ASDoc/build.xml
index 1976bfb..37cb92d 100644
--- a/examples/flexjs/ASDoc/build.xml
+++ b/examples/flexjs/ASDoc/build.xml
@@ -28,6 +28,11 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+ <condition property="config.path" value=""${basedir}/src/main/config/asdoc-config.xml"">
+ <os family="windows" />
+ </condition>
+ <property name="config.path" value="${basedir}/src/main/config/asdoc-config.xml"/>
+
<include file="${basedir}/../../build_example.xml" />
<target name="main" depends="build_example.compile" description="Clean build of ${example}">
@@ -54,7 +59,7 @@
<arg value="-external-library-path=${env.AIR_HOME}/frameworks/libs/air/airglobal.swc" />
<arg value="-external-library-path+=${FLEXJS_HOME}/js/libs/google_maps.swc" />
<arg value="+frameworks_dir=${FLEXJS_HOME}/frameworks" />
- <arg value="-load-config="${basedir}/src/main/config/asdoc-config.xml"" />
+ <arg value="-load-config=${config.path}" />
<arg value="-debug=true" />
<arg value="-output=${basedir}/bin-debug" />
<arg value="-window-title=Apache FlexJS API Reference" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/DesktopMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/build.xml b/examples/flexjs/DesktopMap/build.xml
index f34d591..ea73725 100644
--- a/examples/flexjs/DesktopMap/build.xml
+++ b/examples/flexjs/DesktopMap/build.xml
@@ -80,7 +80,9 @@
<property name="which" value="debug" />
<echo message="View map."/>
<antcall target="build_example.run.air.desktop" />
- <antcall target="build_example.run.cordova" />
+ <exec executable="${browser}" dir="${basedir}/bin/js-${which}" failonerror="true">
+ <arg value="${basedir}/bin/js-${which}/index.html"/>
+ </exec>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/MapSearch/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/build.xml b/examples/flexjs/MapSearch/build.xml
index f8e985d..2722bee 100644
--- a/examples/flexjs/MapSearch/build.xml
+++ b/examples/flexjs/MapSearch/build.xml
@@ -64,14 +64,16 @@
</target>
<target name="run">
- <antcall target="build_example.run.air" />
+ <antcall target="build_example.run.air.desktop" />
</target>
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
<echo message="View map."/>
- <antcall target="build_example.run.air" />
- <antcall target="build_example.run.cordova" />
+ <antcall target="build_example.run.air.desktop" />
+ <exec executable="${browser}" dir="${basedir}/bin/js-${which}" failonerror="true">
+ <arg value="${basedir}/bin/js-${which}/index.html"/>
+ </exec>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/MobileMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileMap/build.xml b/examples/flexjs/MobileMap/build.xml
index a1e9d07..f50c4b7 100644
--- a/examples/flexjs/MobileMap/build.xml
+++ b/examples/flexjs/MobileMap/build.xml
@@ -30,6 +30,7 @@
<property file="${FLEXJS_HOME}/local.properties"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+ <property name="AIR_HOME" value="${env.AIR_HOME}"/>
<property name="config_arg" value="air" />
<include file="${basedir}/../../build_example.xml" />
@@ -59,7 +60,7 @@
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
<echo message="View map."/>
- <antcall target="build_example.run.air" />
+ <antcall target="build_example.run.air.desktop" />
<antcall target="build_example.run.cordova" />
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/MobileStocks/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileStocks/build.xml b/examples/flexjs/MobileStocks/build.xml
index 39264c4..831e25d 100644
--- a/examples/flexjs/MobileStocks/build.xml
+++ b/examples/flexjs/MobileStocks/build.xml
@@ -35,22 +35,6 @@
<property name="AIR_HOME" value="${env.AIR_HOME}"/>
<property name="config_arg" value="air"/>
- <condition property="adl" value="adl.exe">
- <os family="windows"/>
- </condition>
-
- <condition property="adl" value="adl">
- <os family="mac"/>
- </condition>
-
- <condition property="runtime" value="win">
- <os family="windows"/>
- </condition>
-
- <condition property="runtime" value="mac">
- <os family="mac"/>
- </condition>
-
<include file="${basedir}/../../build_example.xml" />
<target name="main" depends="clean,build_example.compile,build_example.compile.cordova" description="Clean build of ${example}">
@@ -80,7 +64,7 @@
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
<echo message="Click on Products tab. Hover over person to see buttons with tooltips. DragDrop a person to compare box. Click on Support tab."/>
- <antcall target="build_example.run.air" />
+ <antcall target="build_example.run.air.desktop" />
<antcall target="build_example.run.cordova" />
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/MobileTrader/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/build.xml b/examples/flexjs/MobileTrader/build.xml
index d1483b0..8c7ab5f 100644
--- a/examples/flexjs/MobileTrader/build.xml
+++ b/examples/flexjs/MobileTrader/build.xml
@@ -76,7 +76,9 @@
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
<echo message="View example"/>
- <antcall target="build_example.run.air" />
+ <exec executable="${browser}" dir="${basedir}/bin-${which}" failonerror="true">
+ <arg value="${basedir}/bin-${which}/${example}.html"/>
+ </exec>
<antcall target="build_example.run.cordova" />
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/StorageExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/StorageExample/build.xml b/examples/flexjs/StorageExample/build.xml
index 9e908ab..5e6d1a2 100644
--- a/examples/flexjs/StorageExample/build.xml
+++ b/examples/flexjs/StorageExample/build.xml
@@ -80,7 +80,7 @@
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
<echo message="See if Storage works."/>
- <antcall target="build_example.run.air" />
+ <antcall target="build_example.run.air.desktop" />
<antcall target="build_example.run.cordova" />
</target>
[2/4] git commit: [flex-asjs] [refs/heads/release0.8.0] - fix express
Posted by ah...@apache.org.
fix express
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/30c24d95
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/30c24d95
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/30c24d95
Branch: refs/heads/release0.8.0
Commit: 30c24d95524d82eed8ec2e0bedef93562827ab65
Parents: 2359037
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 19 09:56:36 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 19 09:56:36 2017 -0700
----------------------------------------------------------------------
examples/build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/30c24d95/examples/build.xml
----------------------------------------------------------------------
diff --git a/examples/build.xml b/examples/build.xml
index ad19419..601993a 100644
--- a/examples/build.xml
+++ b/examples/build.xml
@@ -152,7 +152,7 @@
</target>
<target name="examine" description="Cleans all SWCs and their resource bundles">
- <ant dir="${basedir}/express/DataBindingExample" target="clean"/>
+ <ant dir="${basedir}/express/DataBindingExample" target="examine"/>
<ant dir="${basedir}/flexjs/ASDoc" target="examine"/>
<ant dir="${basedir}/flexjs/CordovaCameraExample" target="examine"/>
<ant dir="${basedir}/flexjs/CreateJSExample" target="examine"/>
[3/4] git commit: [flex-asjs] [refs/heads/release0.8.0] - stick some
sort of index.html in there so you can run it
Posted by ah...@apache.org.
stick some sort of index.html in there so you can run it
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b3b3cd6d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b3b3cd6d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b3b3cd6d
Branch: refs/heads/release0.8.0
Commit: b3b3cd6d6f0a56266eb4833164c3638a6499fd07
Parents: 30c24d9
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 19 09:57:27 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 19 09:57:27 2017 -0700
----------------------------------------------------------------------
examples/native/ButtonExample/build.xml | 2 ++
.../ButtonExample/src/main/resources/index.html | 14 ++++++++++++++
examples/native/USStatesMap/build.xml | 2 ++
.../native/USStatesMap/src/main/resources/index.html | 14 ++++++++++++++
4 files changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b3b3cd6d/examples/native/ButtonExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/native/ButtonExample/build.xml b/examples/native/ButtonExample/build.xml
index bb28b71..0e7fe29 100644
--- a/examples/native/ButtonExample/build.xml
+++ b/examples/native/ButtonExample/build.xml
@@ -34,6 +34,8 @@
<property name="file_suffix" value="as" />
<target name="main" depends="clean,build_example.compile" description="Clean build of ${example}">
+ <copy file="${basedir}/src/main/resources/index.html" tofile="${basedir}/bin/js-debug/index.html" />
+ <copy file="${basedir}/src/main/resources/index.html" tofile="${basedir}/bin/js-release/index.html" />
</target>
<target name="clean">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b3b3cd6d/examples/native/ButtonExample/src/main/resources/index.html
----------------------------------------------------------------------
diff --git a/examples/native/ButtonExample/src/main/resources/index.html b/examples/native/ButtonExample/src/main/resources/index.html
new file mode 100644
index 0000000..2925bae
--- /dev/null
+++ b/examples/native/ButtonExample/src/main/resources/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <script type="text/javascript" src="./library/closure/goog/base.js"></script>
+ <script type="text/javascript" src="./ButtonExample-dependencies.js"></script>
+</head>
+<body>
+ <script type="text/javascript">
+ new ButtonExample().start();
+ </script>
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b3b3cd6d/examples/native/USStatesMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/native/USStatesMap/build.xml b/examples/native/USStatesMap/build.xml
index 6e98c61..8356e4d 100644
--- a/examples/native/USStatesMap/build.xml
+++ b/examples/native/USStatesMap/build.xml
@@ -34,6 +34,8 @@
<property name="file_suffix" value="as" />
<target name="main" depends="clean,build_example.compile" description="Clean build of ${example}">
+ <copy file="${basedir}/src/main/resources/index.html" tofile="${basedir}/bin/js-debug/index.html" />
+ <copy file="${basedir}/src/main/resources/index.html" tofile="${basedir}/bin/js-release/index.html" />
</target>
<target name="clean">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b3b3cd6d/examples/native/USStatesMap/src/main/resources/index.html
----------------------------------------------------------------------
diff --git a/examples/native/USStatesMap/src/main/resources/index.html b/examples/native/USStatesMap/src/main/resources/index.html
new file mode 100644
index 0000000..206409c
--- /dev/null
+++ b/examples/native/USStatesMap/src/main/resources/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <script type="text/javascript" src="./library/closure/goog/base.js"></script>
+ <script type="text/javascript" src="./USStatesMap-dependencies.js"></script>
+</head>
+<body>
+ <script type="text/javascript">
+ new USStatesMap().start();
+ </script>
+</body>
+</html>
\ No newline at end of file