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/05/26 23:05:24 UTC

[40/51] [abbrv] git commit: [flex-asjs] [refs/heads/spark] - - Renamed the property again (strangely this time it didn't compile ... wonder why it did last time ...) - Updated the MyInitialView.mxml in the DataBindingExample_Flat project to not mixup nam

- Renamed the property again (strangely this time it didn't compile ... wonder why it did last time ...)
- Updated the MyInitialView.mxml in the DataBindingExample_Flat project to not mixup namespaces.


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8f914c10
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8f914c10
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8f914c10

Branch: refs/heads/spark
Commit: 8f914c100fd268ab651736ea7016ec766dfe9809
Parents: 9481792
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu May 19 10:45:53 2016 +0200
Committer: Alex Harui <ah...@apache.org>
Committed: Thu May 26 16:04:23 2016 -0700

----------------------------------------------------------------------
 .../src/CordovaCameraExample.mxml                    |  4 ++--
 examples/flexjs/DataBindingExample_Flat/pom.xml      |  6 ++++++
 .../DataBindingExample_Flat/src/MyInitialView.mxml   | 15 ++++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8f914c10/examples/flexjs/CordovaCameraExample/src/CordovaCameraExample.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/src/CordovaCameraExample.mxml b/examples/flexjs/CordovaCameraExample/src/CordovaCameraExample.mxml
index 13cc1a9..a745202 100644
--- a/examples/flexjs/CordovaCameraExample/src/CordovaCameraExample.mxml
+++ b/examples/flexjs/CordovaCameraExample/src/CordovaCameraExample.mxml
@@ -22,8 +22,8 @@
 				   xmlns:local="*"
 				   xmlns:models="models.*"
 				   xmlns:js="library://ns.apache.org/flexjs/basic" 
-				   xmlns:cordova="library://ns.apache.org/flexjs/cordova" 
-				   isdeviceready="MyInitialView(initialView).ready = true"
+				   xmlns:cordova="library://ns.apache.org/flexjs/cordova"
+				   isDeviceReady="MyInitialView(initialView).ready = true"
 				   >
 	
 	<cordova:valuesImpl>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8f914c10/examples/flexjs/DataBindingExample_Flat/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_Flat/pom.xml b/examples/flexjs/DataBindingExample_Flat/pom.xml
index 3fd04ca..31ff335 100644
--- a/examples/flexjs/DataBindingExample_Flat/pom.xml
+++ b/examples/flexjs/DataBindingExample_Flat/pom.xml
@@ -49,6 +49,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.flex.flexjs.framework</groupId>
+            <artifactId>Flat</artifactId>
+            <version>0.7.0-SNAPSHOT</version>
+            <type>swc</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flex.flexjs.framework</groupId>
             <artifactId>Network</artifactId>
             <version>0.7.0-SNAPSHOT</version>
             <type>swc</type>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8f914c10/examples/flexjs/DataBindingExample_Flat/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_Flat/src/MyInitialView.mxml b/examples/flexjs/DataBindingExample_Flat/src/MyInitialView.mxml
index b153ba5..b3456d2 100644
--- a/examples/flexjs/DataBindingExample_Flat/src/MyInitialView.mxml
+++ b/examples/flexjs/DataBindingExample_Flat/src/MyInitialView.mxml
@@ -18,7 +18,8 @@ limitations under the License.
 
 -->
 <js:ViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
-				xmlns:js="library://ns.apache.org/flexjs/flat"
+             xmlns:js="library://ns.apache.org/flexjs/basic"
+             xmlns:flat="library://ns.apache.org/flexjs/flat"
 			    initComplete="initControls()">
     <fx:Script>
         <![CDATA[
@@ -125,14 +126,14 @@ limitations under the License.
                 <js:beads>
                     <js:VerticalLayout />
                 </js:beads>
-                <js:DropDownList id="list" width="100"
+                <flat:DropDownList id="list" width="100"
                                     change="_symbol = list.selectedItem as String; dispatchEvent(new CustomEvent('listChanged'))"
                                     dataProvider="{MyModel(applicationModel).strings}" />
-                <js:RadioButton id="radio1" text="Price" value="Ask" groupName="group1" change="radioChanged(event)"/>
-                <js:RadioButton id="radio2" text="Change" value="Change" groupName="group1" change="radioChanged(event)"/>
-                <js:RadioButton id="radio3" text="Day's High" value="DaysHigh" groupName="group1" change="radioChanged(event)"/>
-                <js:RadioButton id="radio4" text="Day's Low" value="DaysLow" groupName="group1" change="radioChanged(event)"/>
-                <js:CheckBox id="showAllData" text="Show All Data" change="setState()" />
+                <flat:RadioButton id="radio1" text="Price" value="Ask" groupName="group1" change="radioChanged(event)"/>
+                <flat:RadioButton id="radio2" text="Change" value="Change" groupName="group1" change="radioChanged(event)"/>
+                <flat:RadioButton id="radio3" text="Day's High" value="DaysHigh" groupName="group1" change="radioChanged(event)"/>
+                <flat:RadioButton id="radio4" text="Day's Low" value="DaysLow" groupName="group1" change="radioChanged(event)"/>
+                <flat:CheckBox id="showAllData" text="Show All Data" change="setState()" />
             </js:Container>
         </js:Container>
         <js:Label id="bindtest" text="{fieldText + ' expression binding'}" />