flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject [3/3] git commit: [flex-asjs] [refs/heads/develop] - Revert changes to these files (was not supposed to commit it)
Date Sat, 06 Sep 2014 01:14:16 GMT
Revert changes to these files (was not supposed to commit 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/5f605837
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5f605837
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5f605837

Branch: refs/heads/develop
Commit: 5f6058379490325e84de019cefb6378de4077ee5
Parents: 5f12977
Author: Om <bigosmallm@gmail.com>
Authored: Fri Sep 5 18:12:58 2014 -0700
Committer: Om <bigosmallm@gmail.com>
Committed: Fri Sep 5 18:12:58 2014 -0700

----------------------------------------------------------------------
 examples/build.xml                                        |  2 ++
 .../FlexJSUI/src/org/apache/cordova/camera/Camera.as      | 10 +++++-----
 .../src/org/apache/flex/maps/google/beads/MapView.as      |  8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5f605837/examples/build.xml
----------------------------------------------------------------------
diff --git a/examples/build.xml b/examples/build.xml
index 5e18e37..cd0e363 100644
--- a/examples/build.xml
+++ b/examples/build.xml
@@ -74,6 +74,7 @@
     </target>
     
     <target name="compile" description="Compile Examples">
+        <ant dir="${basedir}/CordovaCameraExample"/>
         <ant dir="${basedir}/DataBindingTest"/>
         <ant dir="${basedir}/DataGridExample"/>
         <ant dir="${basedir}/DesktopMap"/>
@@ -108,6 +109,7 @@
     </target>
     
     <target name="clean" description="Cleans all SWCs and their resource bundles">
+        <ant dir="${basedir}/CordovaCameraExample" target="clean"/>
         <ant dir="${basedir}/DataBindingTest" target="clean"/>
         <ant dir="${basedir}/DataGridExample" target="clean"/>
         <ant dir="${basedir}/DesktopMap" target="clean"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5f605837/frameworks/as/projects/FlexJSUI/src/org/apache/cordova/camera/Camera.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/cordova/camera/Camera.as b/frameworks/as/projects/FlexJSUI/src/org/apache/cordova/camera/Camera.as
index 2102807..3984b44 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/cordova/camera/Camera.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/cordova/camera/Camera.as
@@ -25,9 +25,9 @@ package org.apache.cordova.camera
 	import flash.events.ActivityEvent;
 	import flash.events.KeyboardEvent;
 	import flash.events.MouseEvent;
-/*	import flash.filesystem.File;
+	import flash.filesystem.File;
 	import flash.filesystem.FileMode;
-	import flash.filesystem.FileStream;*/
+	import flash.filesystem.FileStream;
 	import flash.geom.Rectangle;
 	import flash.media.Camera;
 	import flash.media.Video;
@@ -133,7 +133,7 @@ package org.apache.cordova.camera
 
 		private function savePicture():void
 		{
-/*			var f:File = File.createTempFile();
+			var f:File = File.createTempFile();
 			var bd:BitmapData = new BitmapData(camera.width, camera.height, false);
 			var pix:ByteArray = new ByteArray();
 			var rect:Rectangle = new Rectangle(0, 0, camera.width, camera.height);
@@ -143,10 +143,10 @@ package org.apache.cordova.camera
 			var png:PNGEncoder = new PNGEncoder();
 			var ba:ByteArray = png.encode(bd);
 			var fs:FileStream = new FileStream();
-			fs.open(f, FileMod.WRITE);
+			fs.open(f, FileMode.WRITE);
 			fs.writeBytes(ba);
 			fs.close();
-			cameraSuccess(f.url);*/
+			cameraSuccess(f.url);
 		}
 		
 		public function cleanup( cameraSuccess:Function, cameraError:Function ) : void

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5f605837/frameworks/as/projects/FlexJSUI/src/org/apache/flex/maps/google/beads/MapView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/maps/google/beads/MapView.as
b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/maps/google/beads/MapView.as
index 210e305..5e71187 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/maps/google/beads/MapView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/maps/google/beads/MapView.as
@@ -19,7 +19,7 @@
 package org.apache.flex.maps.google.beads
 {
 	import flash.events.Event;
-/*	import flash.html.HTMLLoader;*/
+	import flash.html.HTMLLoader;
 	import flash.net.URLRequest;
 	
     import org.apache.flex.core.BeadViewBase;
@@ -57,7 +57,7 @@ package org.apache.flex.maps.google.beads
 		{
 		}
 		
-		private var _loader:Object;
+		private var _loader:HTMLLoader;
 		
 		/**
 		 *  @copy org.apache.flex.core.IBead#strand
@@ -71,7 +71,7 @@ package org.apache.flex.maps.google.beads
 		{
 			super.strand = value;
 			
-/*			_loader = new HTMLLoader();*/
+			_loader = new HTMLLoader();
 			_loader.x = 0;
 			_loader.y = 0;
 			_loader.width = UIBase(value).width;
@@ -84,7 +84,7 @@ package org.apache.flex.maps.google.beads
 			model.addEventListener("zoomChanged", handleZoomChange);
 			model.addEventListener("currentLocationChanged", handleCurrentLocationChange);
 						
-/*			(_strand as UIBase).addChild(_loader);*/
+			(_strand as UIBase).addChild(_loader);
 			
 			var token:String = Map(_strand).token;
 			if (token)


Mime
View raw message