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/30 19:47:41 UTC
[06/50] git commit: [flex-asjs] [refs/heads/tlf] - Updated examples
that run in Air to use new AirApplication class.
Updated examples that run in Air to use new AirApplication class.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fef38745
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fef38745
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fef38745
Branch: refs/heads/tlf
Commit: fef3874581e8309457c87e3436f5b23257866133
Parents: 6ccc025
Author: Peter Ent <pe...@apache.org>
Authored: Tue May 23 14:27:53 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Tue May 23 14:27:53 2017 -0400
----------------------------------------------------------------------
examples/flexjs/DesktopMap/build.xml | 3 ++-
examples/flexjs/DesktopMap/src/main/flex/DesktopMap.mxml | 6 +++---
examples/flexjs/DesktopMap/src/main/flex/MyInitialView.mxml | 4 +---
examples/flexjs/MapSearch/MapSearch-app.xml | 2 +-
examples/flexjs/MapSearch/src/main/flex/MapSearch.mxml | 9 ++++-----
examples/flexjs/MapSearch/src/main/flex/MyInitialView.mxml | 1 -
examples/flexjs/MobileStocks/build.xml | 3 ++-
examples/flexjs/StorageExample/build.xml | 5 +++--
.../flexjs/StorageExample/src/main/flex/StorageExample.mxml | 4 ++--
9 files changed, 18 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/DesktopMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/build.xml b/examples/flexjs/DesktopMap/build.xml
index ea73725..eb915ca 100644
--- a/examples/flexjs/DesktopMap/build.xml
+++ b/examples/flexjs/DesktopMap/build.xml
@@ -73,7 +73,8 @@
</target>
<target name="run">
- <antcall target="build_example.run.air" />
+ <property name="which" value="debug" />
+ <antcall target="build_example.run.air.desktop" />
</target>
<target name="examine" depends="build_example.get.browser">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/DesktopMap/src/main/flex/DesktopMap.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/src/main/flex/DesktopMap.mxml b/examples/flexjs/DesktopMap/src/main/flex/DesktopMap.mxml
index 4f938b6..d5c357b 100644
--- a/examples/flexjs/DesktopMap/src/main/flex/DesktopMap.mxml
+++ b/examples/flexjs/DesktopMap/src/main/flex/DesktopMap.mxml
@@ -18,7 +18,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-->
-<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+<js:AirApplication xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:local="*"
xmlns:models="models.*"
xmlns:js="library://ns.apache.org/flexjs/basic"
@@ -34,7 +34,7 @@
<js:SimpleCSSValuesImpl />
</js:valuesImpl>
<js:initialView>
- <local:MyInitialView />
+ <local:MyInitialView width="100%" height="100%" />
</js:initialView>
<js:model>
<models:MyModel />
@@ -43,4 +43,4 @@
<js:MixinManager />
</js:beads>
-</js:Application>
+</js:AirApplication>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/DesktopMap/src/main/flex/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/src/main/flex/MyInitialView.mxml b/examples/flexjs/DesktopMap/src/main/flex/MyInitialView.mxml
index df08437..3e45ddb 100644
--- a/examples/flexjs/DesktopMap/src/main/flex/MyInitialView.mxml
+++ b/examples/flexjs/DesktopMap/src/main/flex/MyInitialView.mxml
@@ -98,7 +98,6 @@ limitations under the License.
.MapPanel {
border: 1px solid #555555;
backgroundColor: darkgray;
- margin-top: 20px;
margin-left: auto;
margin-right: auto;
}
@@ -132,10 +131,9 @@ limitations under the License.
<js:beads>
<js:ViewDataBinding />
- <local:NoLayout />
</js:beads>
- <js:Panel title="Map" width="500" height="600" className="MapPanel">
+ <js:Panel title="Map" width="100%" height="100%" className="MapPanel">
<js:beads>
<js:VerticalFlexLayout />
</js:beads>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/MapSearch/MapSearch-app.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/MapSearch-app.xml b/examples/flexjs/MapSearch/MapSearch-app.xml
index b93fefb..55dcbef 100644
--- a/examples/flexjs/MapSearch/MapSearch-app.xml
+++ b/examples/flexjs/MapSearch/MapSearch-app.xml
@@ -88,7 +88,7 @@
<!-- <resizable></resizable> -->
<!-- The window's initial width in pixels. Optional. -->
- <width>500</width>
+ <width>480</width>
<!-- The window's initial height in pixels. Optional. -->
<height>640</height>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/MapSearch/src/main/flex/MapSearch.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/src/main/flex/MapSearch.mxml b/examples/flexjs/MapSearch/src/main/flex/MapSearch.mxml
index 5613b81..be37386 100644
--- a/examples/flexjs/MapSearch/src/main/flex/MapSearch.mxml
+++ b/examples/flexjs/MapSearch/src/main/flex/MapSearch.mxml
@@ -18,11 +18,10 @@
//
////////////////////////////////////////////////////////////////////////////////
-->
-<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+<js:AirApplication xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:local="*"
xmlns:models="models.*"
- xmlns:js="library://ns.apache.org/flexjs/basic"
- >
+ xmlns:js="library://ns.apache.org/flexjs/basic">
<!-- This application demonstrates how to use the Google MAP API
on both the AIR and JavaScript/browser platform. After cross-
@@ -34,7 +33,7 @@
<js:SimpleCSSValuesImpl />
</js:valuesImpl>
<js:initialView>
- <local:MyInitialView width="500" height="640" />
+ <local:MyInitialView width="100%" height="100%"/>
</js:initialView>
<js:model>
<models:MyModel />
@@ -43,4 +42,4 @@
<js:MixinManager />
</js:beads>
-</js:Application>
+</js:AirApplication>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/MapSearch/src/main/flex/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/src/main/flex/MyInitialView.mxml b/examples/flexjs/MapSearch/src/main/flex/MyInitialView.mxml
index c235064..dbbb514 100644
--- a/examples/flexjs/MapSearch/src/main/flex/MyInitialView.mxml
+++ b/examples/flexjs/MapSearch/src/main/flex/MyInitialView.mxml
@@ -119,7 +119,6 @@ limitations under the License.
.TopContainer {
backgroundColor: darkgray;
- margin-top: 20px;
margin-left: auto;
margin-right: auto;
border: 1px solid #555555;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/MobileStocks/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileStocks/build.xml b/examples/flexjs/MobileStocks/build.xml
index 831e25d..397b895 100644
--- a/examples/flexjs/MobileStocks/build.xml
+++ b/examples/flexjs/MobileStocks/build.xml
@@ -58,7 +58,8 @@
</target>
<target name="run">
- <antcall target="build_example.run.air" />
+ <property name="which" value="debug" />
+ <antcall target="build_example.run.air.desktop" />
</target>
<target name="examine" depends="build_example.get.browser">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/StorageExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/StorageExample/build.xml b/examples/flexjs/StorageExample/build.xml
index 5e6d1a2..e990b7f 100644
--- a/examples/flexjs/StorageExample/build.xml
+++ b/examples/flexjs/StorageExample/build.xml
@@ -73,8 +73,9 @@
<delete dir="${basedir}/target" failonerror="false" />
</target>
- <target name="run">
- <antcall target="build_example.run.air" />
+ <target name="run">
+ <property name="which" value="debug" />
+ <antcall target="build_example.run.air.desktop" />
</target>
<target name="examine" depends="build_example.get.browser">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/StorageExample/src/main/flex/StorageExample.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/StorageExample/src/main/flex/StorageExample.mxml b/examples/flexjs/StorageExample/src/main/flex/StorageExample.mxml
index 1b9842a..17b81fa 100644
--- a/examples/flexjs/StorageExample/src/main/flex/StorageExample.mxml
+++ b/examples/flexjs/StorageExample/src/main/flex/StorageExample.mxml
@@ -18,7 +18,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-->
-<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+<js:AirApplication xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:local="*"
xmlns:js="library://ns.apache.org/flexjs/basic"
>
@@ -39,4 +39,4 @@
<js:MixinManager />
</js:beads>
-</js:Application>
+</js:AirApplication>