Repository: flex-asjs Updated Branches: refs/heads/develop 715a5ac76 -> 5f6058379
Remove redundant fill-opacity attribute Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/35efe0fd Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/35efe0fd Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/35efe0fd Branch: refs/heads/develop Commit: 35efe0fd0eb51945e5880cfcbc8624f32fceaaf2 Parents: 715a5ac Author: Om <[email protected]> Authored: Fri Sep 5 17:35:58 2014 -0700 Committer: Om <[email protected]> Committed: Fri Sep 5 17:35: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 ++++---- .../js/FlexJS/src/org/apache/flex/core/graphics/Rect.js | 1 - 4 files changed, 9 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35efe0fd/examples/build.xml ---------------------------------------------------------------------- diff --git a/examples/build.xml b/examples/build.xml index cd0e363..5e18e37 100644 --- a/examples/build.xml +++ b/examples/build.xml @@ -74,7 +74,6 @@ </target> <target name="compile" description="Compile Examples"> - <ant dir="${basedir}/CordovaCameraExample"/> <ant dir="${basedir}/DataBindingTest"/> <ant dir="${basedir}/DataGridExample"/> <ant dir="${basedir}/DesktopMap"/> @@ -109,7 +108,6 @@ </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/35efe0fd/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 3984b44..2102807 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, FileMode.WRITE); + fs.open(f, FileMod.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/35efe0fd/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 5e71187..210e305 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:HTMLLoader; + private var _loader:Object; /** * @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) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35efe0fd/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js index e1cf279..35ebda8 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js @@ -55,7 +55,6 @@ org.apache.flex.core.graphics.Rect.prototype.drawRect = function(x, y, width, he rect.setAttribute('y', String(this.get_stroke().get_weight())); rect.setAttribute('width', String(width)); rect.setAttribute('height', String(height)); - rect.setAttribute('fill-opacity', String(this.get_fill().get_alpha())); this.element.appendChild(rect); this.resize(x,y,width+this.get_stroke().get_weight()*2,height+this.get_stroke().get_weight()*2); };
