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/07 19:24:19 UTC

[13/21] git commit: [flex-asjs] [refs/heads/spark] - Fix for ant script in DataBindingTestbed manual test, and added extra test for IEventDispatcher problem in MyInitialView init

Fix for ant script in DataBindingTestbed manual test, and added extra test for IEventDispatcher problem in MyInitialView init


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

Branch: refs/heads/spark
Commit: c12038310333f1c072f129ec1a83453a28c70d55
Parents: 095bb4f
Author: greg-dove <gr...@gmail.com>
Authored: Thu Sep 1 09:35:20 2016 +1200
Committer: greg-dove <gr...@gmail.com>
Committed: Thu Sep 1 09:35:20 2016 +1200

----------------------------------------------------------------------
 manualtests/DataBindingTestbed/build.xml        | 42 ++++++++++++++++----
 .../DataBindingTestbed/src/MyInitialView.mxml   | 16 +++++++-
 2 files changed, 50 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1203831/manualtests/DataBindingTestbed/build.xml
----------------------------------------------------------------------
diff --git a/manualtests/DataBindingTestbed/build.xml b/manualtests/DataBindingTestbed/build.xml
index 6713be4..9a14448 100644
--- a/manualtests/DataBindingTestbed/build.xml
+++ b/manualtests/DataBindingTestbed/build.xml
@@ -20,17 +20,45 @@
 
 
 <project name="databindingexample" default="main" basedir=".">
-    <property name="FLEXJS_HOME" location="../../.."/>
+        <property name="FLEXJS_HOME" location="../.."/>
     <property name="example" value="DataBindingTestbed" />
     
-    <property file="${FLEXJS_HOME}/env.properties"/>
+  <property file="${FLEXJS_HOME}/env.properties"/>
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
-    <property name="opt1_arg" value="-js-output-optimization=skipAsCoercions" />
-
-    <include file="${basedir}/../../build_example.xml" />
+    <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
+    type="file"
+    property="FALCON_HOME"
+    value="${env.FALCON_HOME}"/>
+    
+    <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
+    type="file"
+    property="FALCON_HOME"
+    value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
+    
+    <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
+    type="file"
+    property="FALCONJX_HOME"
+    value="${env.FALCONJX_HOME}"/>
+    
+    <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+    type="file"
+    property="FALCONJX_HOME"
+    value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+    
+    <available file="${env.GOOG_HOME}/closure/goog/base.js"
+    type="file"
+    property="GOOG_HOME"
+    value="${env.GOOG_HOME}"/>
     
+    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
+    type="file"
+    property="GOOG_HOME"
+    value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
+    
+    <include file="${basedir}/../build_example.xml" />
+
     <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}">
     </target>
     
@@ -38,8 +66,8 @@
         <delete dir="${basedir}/bin" failonerror="false" />
         <delete dir="${basedir}/bin-debug" failonerror="false" />
         <delete dir="${basedir}/bin-release" failonerror="false" />
-        <delete dir="${basedir}/target" failonerror="false" />
-    </target>
+    </target>    
+    
 
     
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1203831/manualtests/DataBindingTestbed/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/DataBindingTestbed/src/MyInitialView.mxml b/manualtests/DataBindingTestbed/src/MyInitialView.mxml
index 286c097..c5005be 100644
--- a/manualtests/DataBindingTestbed/src/MyInitialView.mxml
+++ b/manualtests/DataBindingTestbed/src/MyInitialView.mxml
@@ -107,11 +107,25 @@ limitations under the License.
 					} catch (e:Error) {
 						addErrorReport("problem instantiating BindableSubVO1 ",e);
 					}
+					test=null;
 					try {
-					   test = new BindableSubVO2()
+					   test = new BindableSubVO2();
 					} catch (e:Error) {
 						addErrorReport("problem instantiating BindableSubVO2 ",e);
 					}
+					
+					try {
+					   if (test) {
+							//remove the EventDispatcher constructor hack in js
+						//	if (test.fireListeners) delete test.fireListeners;
+							test.fieldofBindableSubVO2 = "otherValue";
+					   }
+					  
+					} catch (e:Error) {
+						addErrorReport("problem dispatching events on BindableSubVO2 ",e);
+					}
+					
+					test=null;
 					try {
 						test = new BindableSubVO3()
 					} catch (e:Error) {