http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Circle.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Circle.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Circle.as index a806b56..9f067f1 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Circle.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Circle.as @@ -14,7 +14,7 @@ package org.apache.flex.core.graphics { - COMPILE::AS3 + COMPILE::SWF { import flash.geom.Point; import flash.geom.Rectangle; @@ -53,7 +53,7 @@ package org.apache.flex.core.graphics */ public function drawCircle(cx:Number, cy:Number, radius:Number):void { - COMPILE::AS3 + COMPILE::SWF { graphics.clear(); applyStroke(); @@ -93,4 +93,4 @@ package org.apache.flex.core.graphics } } -} \ No newline at end of file +}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Ellipse.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Ellipse.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Ellipse.as index 3b796bb..f3c6c90 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Ellipse.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Ellipse.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.core.graphics { - COMPILE::AS3 + COMPILE::SWF { import flash.geom.Point; import flash.geom.Rectangle; @@ -47,7 +47,7 @@ package org.apache.flex.core.graphics */ public function drawEllipse(xp:Number, yp:Number, width:Number, height:Number):void { - COMPILE::AS3 + COMPILE::SWF { graphics.clear(); applyStroke(); @@ -86,4 +86,4 @@ package org.apache.flex.core.graphics } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GradientBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GradientBase.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GradientBase.as index 58d417a..0fb521c 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GradientBase.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GradientBase.as @@ -33,7 +33,7 @@ package org.apache.flex.core.graphics * @playerversion Flash 9 * @playerversion AIR 1.1 */ - COMPILE::AS3 + COMPILE::SWF protected var compoundTransform:CompoundTransform; /** @@ -80,7 +80,7 @@ package org.apache.flex.core.graphics public function set entries(value:Array):void { _entries = value; - COMPILE::AS3 + COMPILE::SWF { processEntries(); } @@ -150,12 +150,12 @@ package org.apache.flex.core.graphics _y = value; } - COMPILE::AS3 + COMPILE::SWF protected function toRad(a:Number):Number { return a*Math.PI/180; } - COMPILE::AS3 + COMPILE::SWF protected function get rotationInRadians():Number { return rotation / 180 * Math.PI; @@ -167,7 +167,7 @@ package org.apache.flex.core.graphics * Array into the internal <code>colors</code>, <code>ratios</code>, * and <code>alphas</code> arrays. */ - COMPILE::AS3 + COMPILE::SWF private function processEntries():void { colors = []; @@ -226,4 +226,4 @@ package org.apache.flex.core.graphics } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GradientEntry.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GradientEntry.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GradientEntry.as index cbcdb3f..68ce012 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GradientEntry.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GradientEntry.as @@ -112,7 +112,7 @@ package org.apache.flex.core.graphics */ public function begin(s:GraphicShape):void { - COMPILE::AS3 + COMPILE::SWF { s.graphics.beginFill(color,alpha); } @@ -123,11 +123,11 @@ package org.apache.flex.core.graphics */ public function end(s:GraphicShape):void { - COMPILE::AS3 + COMPILE::SWF { s.graphics.endFill(); } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GraphicShape.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GraphicShape.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GraphicShape.as index 7e0391e..6bbe486 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GraphicShape.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GraphicShape.as @@ -14,7 +14,7 @@ package org.apache.flex.core.graphics { - COMPILE::AS3 + COMPILE::SWF { import flash.geom.Point; import flash.geom.Rectangle; @@ -85,7 +85,7 @@ package org.apache.flex.core.graphics } } - COMPILE::AS3 + COMPILE::SWF protected function applyStroke():void { if(stroke) @@ -94,7 +94,7 @@ package org.apache.flex.core.graphics } } - COMPILE::AS3 + COMPILE::SWF protected function beginFill(targetBounds:Rectangle,targetOrigin:Point):void { if(fill) @@ -103,7 +103,7 @@ package org.apache.flex.core.graphics } } - COMPILE::AS3 + COMPILE::SWF protected function endFill():void { if(fill) @@ -122,7 +122,7 @@ package org.apache.flex.core.graphics override public function addedToParent():void { - COMPILE::AS3 + COMPILE::SWF { super.addedToParent(); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GraphicsContainer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GraphicsContainer.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GraphicsContainer.as index 4927eb9..5ac4e54 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GraphicsContainer.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/GraphicsContainer.as @@ -14,7 +14,7 @@ package org.apache.flex.core.graphics { - COMPILE::AS3 + COMPILE::SWF { import flash.display.GraphicsPath; import flash.display.Shape; @@ -51,7 +51,7 @@ package org.apache.flex.core.graphics */ public function removeAllElements():void { - COMPILE::AS3 + COMPILE::SWF { graphics.clear(); } @@ -79,7 +79,7 @@ package org.apache.flex.core.graphics */ public function drawRect(x:Number, y:Number, width:Number, height:Number):void { - COMPILE::AS3 + COMPILE::SWF { applyStroke(); beginFill(new Rectangle(x, y, width, height), new Point(x,y) ); @@ -102,7 +102,7 @@ package org.apache.flex.core.graphics } } - COMPILE::AS3 + COMPILE::SWF public function createRect(x:Number, y:Number, width:Number, height:Number):void { var color:uint = (fill as SolidColor).color; @@ -132,7 +132,7 @@ package org.apache.flex.core.graphics */ public function drawEllipse(x:Number, y:Number, width:Number, height:Number):void { - COMPILE::AS3 + COMPILE::SWF { applyStroke(); beginFill(new Rectangle(x,y,width,height), new Point(x,y)); @@ -169,7 +169,7 @@ package org.apache.flex.core.graphics */ public function drawCircle(x:Number, y:Number, radius:Number):void { - COMPILE::AS3 + COMPILE::SWF { applyStroke(); beginFill(new Rectangle(x,y,radius*2, radius*2),new Point(x-radius,y-radius)); @@ -211,7 +211,7 @@ package org.apache.flex.core.graphics */ public function drawPath(data:String):void { - COMPILE::AS3 + COMPILE::SWF { applyStroke(); var bounds:Rectangle = PathHelper.getBounds(data); @@ -259,7 +259,7 @@ package org.apache.flex.core.graphics */ public function drawText(value:String, x:Number, y:Number):Object { - COMPILE::AS3 + COMPILE::SWF { var textField:CSSTextField = new CSSTextField(); addChild(textField); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/IFill.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/IFill.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/IFill.as index f0101ab..4dd69a0 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/IFill.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/IFill.as @@ -14,7 +14,7 @@ package org.apache.flex.core.graphics { - COMPILE::AS3 + COMPILE::SWF { import flash.geom.Point; import flash.geom.Rectangle; @@ -22,11 +22,11 @@ package org.apache.flex.core.graphics public interface IFill { - COMPILE::AS3 + COMPILE::SWF function begin(s:GraphicShape,targetBounds:Rectangle, targetOrigin:Point):void; - COMPILE::AS3 + COMPILE::SWF function end(s:GraphicShape):void; COMPILE::JS function addFillAttrib(s:GraphicShape):String; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/IStroke.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/IStroke.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/IStroke.as index be3f022..7dcfd6c 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/IStroke.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/IStroke.as @@ -16,7 +16,7 @@ package org.apache.flex.core.graphics { public interface IStroke { - COMPILE::AS3 + COMPILE::SWF function apply(s:GraphicShape):void; COMPILE::JS @@ -26,4 +26,4 @@ package org.apache.flex.core.graphics function addStrokeAttrib(s:GraphicShape):String; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/LinearGradient.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/LinearGradient.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/LinearGradient.as index c36a37b..c4cf5db 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/LinearGradient.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/LinearGradient.as @@ -14,7 +14,7 @@ package org.apache.flex.core.graphics { - COMPILE::AS3 + COMPILE::SWF { import flash.display.GradientType; import flash.display.InterpolationMethod; @@ -26,7 +26,7 @@ package org.apache.flex.core.graphics public class LinearGradient extends GradientBase implements IFill { - COMPILE::AS3 + COMPILE::SWF private static var commonMatrix:Matrix = new Matrix(); private var _scaleX:Number; @@ -44,7 +44,7 @@ package org.apache.flex.core.graphics _scaleX = value; } - COMPILE::AS3 + COMPILE::SWF public function begin(s:GraphicShape,targetBounds:Rectangle, targetOrigin:Point):void { commonMatrix.identity(); @@ -55,7 +55,7 @@ package org.apache.flex.core.graphics } - COMPILE::AS3 + COMPILE::SWF public function end(s:GraphicShape):void { s.graphics.endFill(); @@ -120,4 +120,4 @@ package org.apache.flex.core.graphics } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Path.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Path.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Path.as index 7cef8bb..0a152bb 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Path.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Path.as @@ -14,7 +14,7 @@ package org.apache.flex.core.graphics { - COMPILE::AS3 + COMPILE::SWF { import flash.display.GraphicsPath; import flash.geom.Point; @@ -60,7 +60,7 @@ package org.apache.flex.core.graphics */ public function drawPath(xp:Number,yp:Number,data:String):void { - COMPILE::AS3 + COMPILE::SWF { graphics.clear(); applyStroke(); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Rect.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Rect.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Rect.as index 5f402ec..3556459 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Rect.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Rect.as @@ -14,7 +14,7 @@ package org.apache.flex.core.graphics { - COMPILE::AS3 + COMPILE::SWF { import flash.display.CapsStyle; import flash.display.JointStyle; @@ -44,7 +44,7 @@ package org.apache.flex.core.graphics */ public function drawRect(xp:Number, yp:Number, width:Number, height:Number):void { - COMPILE::AS3 + COMPILE::SWF { graphics.clear(); applyStroke(); @@ -82,4 +82,4 @@ package org.apache.flex.core.graphics } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/SolidColor.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/SolidColor.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/SolidColor.as index 73e99b0..81f9534 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/SolidColor.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/SolidColor.as @@ -14,7 +14,7 @@ package org.apache.flex.core.graphics { - COMPILE::AS3 + COMPILE::SWF { import flash.geom.Point; import flash.geom.Rectangle; @@ -81,13 +81,13 @@ package org.apache.flex.core.graphics } } - COMPILE::AS3 + COMPILE::SWF public function begin(s:GraphicShape,targetBounds:Rectangle,targetOrigin:Point):void { s.graphics.beginFill(color,alpha); } - COMPILE::AS3 + COMPILE::SWF public function end(s:GraphicShape):void { s.graphics.endFill(); @@ -109,4 +109,4 @@ package org.apache.flex.core.graphics return 'fill:#' + String(color) + ';fill-opacity:' + String(alpha); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/SolidColorStroke.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/SolidColorStroke.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/SolidColorStroke.as index 9535cdc..1d05507 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/SolidColorStroke.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/SolidColorStroke.as @@ -14,7 +14,7 @@ package org.apache.flex.core.graphics { - COMPILE::AS3 + COMPILE::SWF { import flash.display.CapsStyle; import flash.display.JointStyle; @@ -103,7 +103,7 @@ package org.apache.flex.core.graphics _weight = value; } - COMPILE::AS3 + COMPILE::SWF public function apply(s:GraphicShape):void { s.graphics.lineStyle(weight,color,alpha,false,"normal",CapsStyle.SQUARE,JointStyle.MITER); @@ -127,4 +127,4 @@ package org.apache.flex.core.graphics }; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Text.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Text.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Text.as index bc429ed..b493488 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Text.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/Text.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.core.graphics { - COMPILE::AS3 + COMPILE::SWF { import flash.text.TextFieldType; import org.apache.flex.core.CSSTextField; @@ -53,7 +53,7 @@ package org.apache.flex.core.graphics { super(); - COMPILE::AS3 + COMPILE::SWF { _textField = new CSSTextField(); addChild(_textField); @@ -61,7 +61,7 @@ package org.apache.flex.core.graphics } - COMPILE::AS3 + COMPILE::SWF private var _textField:CSSTextField; /** @@ -72,7 +72,7 @@ package org.apache.flex.core.graphics * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public function get textField() : CSSTextField { return _textField; @@ -95,7 +95,7 @@ package org.apache.flex.core.graphics */ public function drawText(value:String, xt:Number, yt:Number):void { - COMPILE::AS3 + COMPILE::SWF { textField.selectable = false; textField.type = TextFieldType.DYNAMIC; @@ -136,4 +136,4 @@ package org.apache.flex.core.graphics } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/utils/CompoundTransform.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/utils/CompoundTransform.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/utils/CompoundTransform.as index 7b1916b..4dc546e 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/utils/CompoundTransform.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/core/graphics/utils/CompoundTransform.as @@ -774,4 +774,4 @@ package org.apache.flex.core.graphics.utils } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/.actionScriptProperties ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/.actionScriptProperties b/frameworks/projects/HTML/.actionScriptProperties index d326dd7..dac63a4 100644 --- a/frameworks/projects/HTML/.actionScriptProperties +++ b/frameworks/projects/HTML/.actionScriptProperties @@ -18,7 +18,7 @@ limitations under the License. --> <actionScriptProperties analytics="false" mainApplicationPath="HTML.as" projectUUID="10468643-4626-481f-ba6b-3f035ccbbabb" version="11"> - <compiler additionalCompilerArguments="-locale en_US -define=COMPILE::AS3,true -define=COMPILE::JS,false -load-config=../config/compile-as-config.xml" autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="target" removeUnusedRSL="true" sourceFolderPath="src/main/flex" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" useFlashSDK="false" verifyDigests="true" warn="true"> + <compiler additionalCompilerArguments="-locale en_US -define=COMPILE::SWF,true -define=COMPILE::JS,false -load-config=../config/compile-as-config.xml" autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="target" removeUnusedRSL="true" sourceFolderPath="src/main/flex" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" useFlashSDK="false" verifyDigests="true" warn="true"> <compilerSourcePath/> <libraryPath defaultLinkType="0"> <libraryPathEntry kind="4" path=""> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml index 8f206e3..5fb4679 100644 --- a/frameworks/projects/HTML/build.xml +++ b/frameworks/projects/HTML/build.xml @@ -84,7 +84,7 @@ <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-define=COMPILE::AS3,true" /> + <arg value="-define=COMPILE::SWF,true" /> <arg value="-define=COMPILE::JS,false" /> </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/HTMLClasses.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/HTMLClasses.as b/frameworks/projects/HTML/src/main/flex/HTMLClasses.as index fb0608c..86a7e1f 100644 --- a/frameworks/projects/HTML/src/main/flex/HTMLClasses.as +++ b/frameworks/projects/HTML/src/main/flex/HTMLClasses.as @@ -33,18 +33,18 @@ internal class HTMLClasses import org.apache.flex.html.accessories.PasswordInputBead; PasswordInputBead; import org.apache.flex.html.accessories.TextPromptBead; TextPromptBead; import org.apache.flex.html.beads.AlertView; AlertView; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.BackgroundImageBead; BackgroundImageBead; } import org.apache.flex.html.beads.ButtonBarView; ButtonBarView; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.CheckBoxView; CheckBoxView; import org.apache.flex.html.beads.ComboBoxView; ComboBoxView; } import org.apache.flex.html.beads.ContainerView; ContainerView; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.ControlBarMeasurementBead; ControlBarMeasurementBead; import org.apache.flex.html.beads.CSSButtonView; CSSButtonView; @@ -58,12 +58,12 @@ internal class HTMLClasses } import org.apache.flex.html.beads.ImageButtonView; ImageButtonView; import org.apache.flex.html.beads.ListView; ListView; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.NumericStepperView; NumericStepperView; } import org.apache.flex.html.beads.PanelView; PanelView; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.PanelWithControlBarView; PanelWithControlBarView; import org.apache.flex.html.beads.RadioButtonView; RadioButtonView; @@ -76,7 +76,7 @@ internal class HTMLClasses } import org.apache.flex.html.beads.SliderThumbView; SliderThumbView; import org.apache.flex.html.beads.SliderTrackView; SliderTrackView; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.SolidBackgroundBead; SolidBackgroundBead; import org.apache.flex.html.beads.SpinnerView; SpinnerView; @@ -92,29 +92,29 @@ internal class HTMLClasses import org.apache.flex.html.beads.models.ArraySelectionModel; ArraySelectionModel; import org.apache.flex.html.beads.models.RangeModel; RangeModel; import org.apache.flex.html.beads.models.RangeModelExtended; RangeModelExtended; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.models.ComboBoxModel; ComboBoxModel; } - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.models.ImageModel; ImageModel; import org.apache.flex.html.beads.models.ImageAndTextModel; ImageAndTextModel; } import org.apache.flex.html.beads.models.PanelModel; PanelModel; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.models.SingleLineBorderModel; SingleLineBorderModel; } import org.apache.flex.html.beads.models.TextModel; TextModel; import org.apache.flex.html.beads.models.TitleBarModel; TitleBarModel; import org.apache.flex.html.beads.models.ToggleButtonModel; ToggleButtonModel; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.models.ValueToggleButtonModel; ValueToggleButtonModel; } import org.apache.flex.html.beads.models.ViewportModel; ViewportModel; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.controllers.AlertController; AlertController; import org.apache.flex.html.beads.controllers.ComboBoxController; ComboBoxController; @@ -124,7 +124,7 @@ internal class HTMLClasses import org.apache.flex.html.beads.controllers.ItemRendererMouseController; ItemRendererMouseController; import org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController; ListSingleSelectionMouseController; import org.apache.flex.html.beads.controllers.TreeSingleSelectionMouseController; TreeSingleSelectionMouseController; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.controllers.SliderMouseController; SliderMouseController; import org.apache.flex.html.beads.controllers.SpinnerMouseController; SpinnerMouseController; @@ -135,7 +135,7 @@ internal class HTMLClasses import org.apache.flex.html.beads.layouts.VerticalLayout; VerticalLayout; import org.apache.flex.html.beads.layouts.HorizontalLayout; HorizontalLayout; import org.apache.flex.html.beads.layouts.BasicLayout; BasicLayout; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.layouts.HScrollBarLayout; HScrollBarLayout; import org.apache.flex.html.beads.layouts.VScrollBarLayout; VScrollBarLayout; @@ -173,7 +173,7 @@ internal class HTMLClasses import org.apache.flex.html.beads.WebBrowserView; WebBrowserView; import org.apache.flex.html.beads.models.WebBrowserModel; WebBrowserModel; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.HRuleView; HRuleView; import org.apache.flex.html.beads.VRuleView; VRuleView; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemAddedEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemAddedEvent.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemAddedEvent.as index 24707c0..a6ae756 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemAddedEvent.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemAddedEvent.as @@ -52,7 +52,7 @@ package org.apache.flex.events */ public function ItemAddedEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false) { - COMPILE::AS3 + COMPILE::SWF { super(type, bubbles, cancelable); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemClickedEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemClickedEvent.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemClickedEvent.as index ac943b0..febc798 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemClickedEvent.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemClickedEvent.as @@ -53,7 +53,7 @@ package org.apache.flex.events */ public function ItemClickedEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false) { - COMPILE::AS3 + COMPILE::SWF { super(type, bubbles, cancelable); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemRemovedEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemRemovedEvent.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemRemovedEvent.as index d638084..313f3f9 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemRemovedEvent.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemRemovedEvent.as @@ -52,7 +52,7 @@ package org.apache.flex.events */ public function ItemRemovedEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false) { - COMPILE::AS3 + COMPILE::SWF { super(type, bubbles, cancelable); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Button.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Button.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Button.as index dbee62b..f6d13ea 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Button.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Button.as @@ -20,7 +20,7 @@ package org.apache.flex.html { import org.apache.flex.core.IStrand; import org.apache.flex.core.IUIBase; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.core.UIButtonBase; } @@ -66,7 +66,7 @@ package org.apache.flex.html * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class Button extends UIButtonBase implements IStrand, IEventDispatcher, IUIBase { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/CheckBox.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/CheckBox.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/CheckBox.as index 7dff6da..bb1f6bd 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/CheckBox.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/CheckBox.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html { - COMPILE::AS3 + COMPILE::SWF { import flash.events.MouseEvent; } @@ -26,7 +26,7 @@ package org.apache.flex.html import org.apache.flex.core.IStrand; import org.apache.flex.core.IToggleButtonModel; import org.apache.flex.core.IUIBase; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.core.UIButtonBase; } @@ -61,7 +61,7 @@ package org.apache.flex.html * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class CheckBox extends UIButtonBase implements IStrand { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Label.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Label.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Label.as index 2512a31..9365099 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Label.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Label.as @@ -71,7 +71,7 @@ package org.apache.flex.html */ public function get text():String { - COMPILE::AS3 + COMPILE::SWF { return ITextModel(model).text; } @@ -86,7 +86,7 @@ package org.apache.flex.html */ public function set text(value:String):void { - COMPILE::AS3 + COMPILE::SWF { ITextModel(model).text = value; } @@ -109,7 +109,7 @@ package org.apache.flex.html */ public function get html():String { - COMPILE::AS3 + COMPILE::SWF { return ITextModel(model).html; } @@ -124,7 +124,7 @@ package org.apache.flex.html */ public function set html(value:String):void { - COMPILE::AS3 + COMPILE::SWF { ITextModel(model).html = value; } @@ -139,7 +139,7 @@ package org.apache.flex.html /** * @private */ - COMPILE::AS3 + COMPILE::SWF override public function addedToParent():void { super.addedToParent(); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/List.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/List.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/List.as index 63bcf02..17c8b3f 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/List.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/List.as @@ -248,7 +248,7 @@ package org.apache.flex.html { var result:Boolean = false; - COMPILE::AS3 { + COMPILE::SWF { result = _itemRenderer != null; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/MXMLBeadView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/MXMLBeadView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/MXMLBeadView.as index 894cf0c..1807381 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/MXMLBeadView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/MXMLBeadView.as @@ -165,7 +165,7 @@ package org.apache.flex.html //TODO: Need to handle this case more gracefully catch(e:Error) { - COMPILE::AS3 + COMPILE::SWF { trace(e.message); } @@ -314,4 +314,4 @@ package org.apache.flex.html } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/RadioButton.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/RadioButton.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/RadioButton.as index 8630ab1..66f4e42 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/RadioButton.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/RadioButton.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html { - COMPILE::AS3 + COMPILE::SWF { import flash.display.DisplayObject; import flash.events.MouseEvent; @@ -27,7 +27,7 @@ package org.apache.flex.html import org.apache.flex.core.IStrand; import org.apache.flex.core.IValueToggleButtonModel; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.core.UIButtonBase; } @@ -55,7 +55,7 @@ package org.apache.flex.html * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class RadioButton extends UIButtonBase implements IStrand { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as index 676d9e7..76160c0 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as @@ -121,7 +121,7 @@ package org.apache.flex.html */ static public function show(message:String, parent:Object):SimpleAlert { - COMPILE::AS3 + COMPILE::SWF { var alert:SimpleAlert = new SimpleAlert(); alert.message = message; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextArea.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextArea.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextArea.as index 57bc3c3..10b7555 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextArea.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextArea.as @@ -60,7 +60,7 @@ package org.apache.flex.html */ public function get text():String { - COMPILE::AS3 + COMPILE::SWF { return ITextModel(model).text; } @@ -76,7 +76,7 @@ package org.apache.flex.html */ public function set text(value:String):void { - COMPILE::AS3 + COMPILE::SWF { ITextModel(model).text = value; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as index ca1bbcd..7d90ed1 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as @@ -54,7 +54,7 @@ package org.apache.flex.html */ public function get text():String { - COMPILE::AS3 + COMPILE::SWF { return ITextModel(model).text; } @@ -69,7 +69,7 @@ package org.apache.flex.html */ public function set text(value:String):void { - COMPILE::AS3 + COMPILE::SWF { ITextModel(model).text = value; } @@ -90,7 +90,7 @@ package org.apache.flex.html */ public function get html():String { - COMPILE::AS3 + COMPILE::SWF { return ITextModel(model).html; } @@ -105,7 +105,7 @@ package org.apache.flex.html */ public function set html(value:String):void { - COMPILE::AS3 + COMPILE::SWF { ITextModel(model).html = value; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextInput.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextInput.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextInput.as index 1861405..70ad9a2 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextInput.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextInput.as @@ -59,7 +59,7 @@ package org.apache.flex.html { super(); - COMPILE::AS3 + COMPILE::SWF { model.addEventListener("textChange", textChangeHandler); } @@ -76,7 +76,7 @@ package org.apache.flex.html */ public function get text():String { - COMPILE::AS3 + COMPILE::SWF { return ITextModel(model).text; } @@ -92,7 +92,7 @@ package org.apache.flex.html */ public function set text(value:String):void { - COMPILE::AS3 + COMPILE::SWF { inSetter = true; ITextModel(model).text = value; @@ -116,7 +116,7 @@ package org.apache.flex.html */ public function get html():String { - COMPILE::AS3 + COMPILE::SWF { return ITextModel(model).html; } @@ -132,7 +132,7 @@ package org.apache.flex.html */ public function set html(value:String):void { - COMPILE::AS3 + COMPILE::SWF { ITextModel(model).html = value; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ToggleTextButton.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ToggleTextButton.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ToggleTextButton.as index e6ca726..be86d41 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ToggleTextButton.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ToggleTextButton.as @@ -87,7 +87,7 @@ package org.apache.flex.html */ public function get selected():Boolean { - COMPILE::AS3 + COMPILE::SWF { return IToggleButtonModel(model).selected; } @@ -102,7 +102,7 @@ package org.apache.flex.html */ public function set selected(value:Boolean):void { - COMPILE::AS3 + COMPILE::SWF { IToggleButtonModel(model).selected = value; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/WebBrowser.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/WebBrowser.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/WebBrowser.as index 009a508..7027359 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/WebBrowser.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/WebBrowser.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html { - COMPILE::AS3 { + COMPILE::SWF { import flash.events.Event; import flash.html.HTMLLoader; import flash.net.URLRequest; @@ -53,7 +53,7 @@ package org.apache.flex.html * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class WebBrowser extends UIBase implements IHandlesOriginalEvent { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as index 8790830..3b23f5b 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as @@ -22,7 +22,7 @@ package org.apache.flex.html.accessories { import goog.events.BrowserEvent; } - COMPILE::AS3 + COMPILE::SWF { import flash.events.TextEvent; @@ -32,7 +32,7 @@ package org.apache.flex.html.accessories import org.apache.flex.core.IStrand; import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.ITextFieldView; } @@ -75,7 +75,7 @@ package org.apache.flex.html.accessories { _strand = value; - COMPILE::AS3 + COMPILE::SWF { IEventDispatcher(value).addEventListener("viewChanged",viewChangeHandler); } @@ -130,7 +130,7 @@ package org.apache.flex.html.accessories /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function viewChangeHandler(event:Event):void { // get the ITextFieldView bead, which is required for this bead to work @@ -151,7 +151,7 @@ package org.apache.flex.html.accessories /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function handleTextInput(event:TextEvent):void { var insert:String = event.text; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/PasswordInputBead.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/PasswordInputBead.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/PasswordInputBead.as index 191339b..e73822b 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/PasswordInputBead.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/PasswordInputBead.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.accessories { - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.core.CSSTextField; } @@ -27,7 +27,7 @@ package org.apache.flex.html.accessories import org.apache.flex.core.UIBase; import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.ITextFieldView; } @@ -70,7 +70,7 @@ package org.apache.flex.html.accessories { _strand = value; - COMPILE::AS3 + COMPILE::SWF { IEventDispatcher(value).addEventListener("viewChanged",viewChangeHandler); } @@ -85,7 +85,7 @@ package org.apache.flex.html.accessories /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function viewChangeHandler(event:Event):void { // get the ITextFieldView bead, which is required for this bead to work http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as index 5447da6..99e2866 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.accessories { - COMPILE::AS3 + COMPILE::SWF { import flash.text.TextFieldType; @@ -90,7 +90,7 @@ package org.apache.flex.html.accessories { _strand = value; - COMPILE::AS3 + COMPILE::SWF { // listen for changes in text to hide or show the prompt var model:Object = UIBase(_strand).model; @@ -120,14 +120,14 @@ package org.apache.flex.html.accessories } } - COMPILE::AS3 + COMPILE::SWF private var promptField:CSSTextField; private var promptAdded:Boolean; /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function handleTextChange( event:Event ):void { // see what the model currently has to determine if the prompt should be http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/BackgroundImageBead.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/BackgroundImageBead.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/BackgroundImageBead.as index bee07e9..8cedc9a 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/BackgroundImageBead.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/BackgroundImageBead.as @@ -109,4 +109,4 @@ package org.apache.flex.html.beads } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as index 26e78be..0c6696a 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as @@ -550,4 +550,4 @@ package org.apache.flex.html.beads } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridLinesBead.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridLinesBead.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridLinesBead.as index b4e5b1d..92a3b99 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridLinesBead.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridLinesBead.as @@ -196,4 +196,4 @@ package org.apache.flex.html.beads } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as index 8905fb9..c639b90 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as @@ -151,4 +151,4 @@ package org.apache.flex.html.beads selectionModel.dispatchEvent(new Event("dataProviderChanged")); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as index 3ad1743..14a51c4 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads { - COMPILE::AS3 + COMPILE::SWF { import flash.display.DisplayObject; } @@ -43,7 +43,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF function get track():DisplayObject; /** @@ -54,7 +54,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF function get thumb():DisplayObject; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISpinnerView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISpinnerView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISpinnerView.as index eb6adaa..b6b148a 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISpinnerView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISpinnerView.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads { - COMPILE::AS3 + COMPILE::SWF { import flash.display.DisplayObject; } @@ -44,7 +44,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF function get increment():DisplayObject; /** @@ -55,7 +55,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF function get decrement():DisplayObject; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as index b0ee998..3083465 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as @@ -273,4 +273,4 @@ package org.apache.flex.html.beads } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageButtonView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageButtonView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageButtonView.as index 7e81263..21f34ca 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageButtonView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageButtonView.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads { -COMPILE::AS3 { +COMPILE::SWF { import flash.display.Loader; import flash.display.Shape; import flash.display.SimpleButton; @@ -60,7 +60,7 @@ COMPILE::AS3 { */ public function ImageButtonView() { - COMPILE::AS3 { + COMPILE::SWF { upSprite = new Sprite(); downSprite = new Sprite(); overSprite = new Sprite(); @@ -79,7 +79,7 @@ COMPILE::AS3 { { super.strand = value; - COMPILE::AS3 { + COMPILE::SWF { shape = new Shape(); shape.graphics.beginFill(0xCCCCCC); shape.graphics.drawRect(0, 0, 10, 10); @@ -95,7 +95,7 @@ COMPILE::AS3 { } } - COMPILE::AS3 { + COMPILE::SWF { private var upSprite:Sprite; private var downSprite:Sprite; private var overSprite:Sprite; @@ -105,7 +105,7 @@ COMPILE::AS3 { /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function setupBackground(sprite:Sprite, state:String = null):void { var backgroundImage:Object = ValuesManager.valuesImpl.getValue(_strand, "background-image", state); @@ -146,7 +146,7 @@ COMPILE::AS3 { /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function updateHitArea():void { shape.graphics.clear(); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageView.as index 9c4875c..652392a 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageView.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads { - COMPILE::AS3 + COMPILE::SWF { import flash.display.Bitmap; import flash.display.Loader; @@ -62,9 +62,9 @@ package org.apache.flex.html.beads { } - COMPILE::AS3 + COMPILE::SWF private var bitmap:Bitmap; - COMPILE::AS3 + COMPILE::SWF private var loader:Loader; private var _model:IImageModel; @@ -81,7 +81,7 @@ package org.apache.flex.html.beads { super.strand = value; - COMPILE::AS3 + COMPILE::SWF { IEventDispatcher(_strand).addEventListener("widthChanged",handleSizeChange); IEventDispatcher(_strand).addEventListener("heightChanged",handleSizeChange); @@ -98,7 +98,7 @@ package org.apache.flex.html.beads */ private function handleUrlChange(event:Event):void { - COMPILE::AS3 + COMPILE::SWF { if (_model.source) { loader = new Loader(); @@ -126,7 +126,7 @@ package org.apache.flex.html.beads /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function onComplete(event:Object):void { var host:UIBase = UIBase(_strand); @@ -161,7 +161,7 @@ package org.apache.flex.html.beads /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function handleSizeChange(event:Object):void { var host:UIBase = UIBase(_strand); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderThumbView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderThumbView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderThumbView.as index c20c781..2e99eef 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderThumbView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderThumbView.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads { - COMPILE::AS3 + COMPILE::SWF { import flash.display.Graphics; import flash.display.Shape; @@ -55,7 +55,7 @@ package org.apache.flex.html.beads */ public function SliderThumbView() { - COMPILE::AS3 + COMPILE::SWF { hitArea = new Shape(); upView = new Shape(); @@ -67,7 +67,7 @@ package org.apache.flex.html.beads /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function drawView(g:Graphics, bgColor:uint):void { g.clear(); @@ -77,7 +77,7 @@ package org.apache.flex.html.beads g.endFill(); } - COMPILE::AS3 + COMPILE::SWF private var hitArea:Shape; /** @@ -94,7 +94,7 @@ package org.apache.flex.html.beads { super.strand = value; - COMPILE::AS3 + COMPILE::SWF { drawView(hitArea.graphics, 0xDD0000); drawView(upView.graphics, 0xFFFFFF); @@ -131,11 +131,11 @@ package org.apache.flex.html.beads } } - COMPILE::AS3 + COMPILE::SWF private var upView:Shape; - COMPILE::AS3 + COMPILE::SWF private var downView:Shape; - COMPILE::AS3 + COMPILE::SWF private var overView:Shape; COMPILE::JS @@ -144,7 +144,7 @@ package org.apache.flex.html.beads /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function sizeChangeHandler( event:Event ) : void { drawView(hitArea.graphics, 0xDD0000); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderTrackView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderTrackView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderTrackView.as index 6752347..4290ac7 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderTrackView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderTrackView.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads { - COMPILE::AS3 + COMPILE::SWF { import flash.display.Graphics; import flash.display.Shape; @@ -57,7 +57,7 @@ package org.apache.flex.html.beads */ public function SliderTrackView() { - COMPILE::AS3 + COMPILE::SWF { hitArea = new Shape(); upView = new Shape(); @@ -69,7 +69,7 @@ package org.apache.flex.html.beads /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function drawView(g:Graphics, bgColor:uint):void { g.clear(); @@ -79,7 +79,7 @@ package org.apache.flex.html.beads g.endFill(); } - COMPILE::AS3 + COMPILE::SWF private var hitArea:Shape; /** @@ -94,7 +94,7 @@ package org.apache.flex.html.beads { super.strand = value; - COMPILE::AS3 + COMPILE::SWF { drawView(hitArea.graphics, 0xDD0000); drawView(upView.graphics, 0xCCCCCC); @@ -131,17 +131,17 @@ package org.apache.flex.html.beads COMPILE::JS public var element:WrappedHTMLElement; - COMPILE::AS3 + COMPILE::SWF private var upView:Shape; - COMPILE::AS3 + COMPILE::SWF private var downView:Shape; - COMPILE::AS3 + COMPILE::SWF private var overView:Shape; /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function sizeChangeHandler( event:Event ) : void { drawView(hitArea.graphics, 0xDD0000); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/WebBrowserView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/WebBrowserView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/WebBrowserView.as index 46c9484..63d04e2 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/WebBrowserView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/WebBrowserView.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads { - COMPILE::AS3 { + COMPILE::SWF { import flash.events.Event; import flash.html.HTMLLoader; import flash.net.URLRequest; @@ -41,7 +41,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class WebBrowserView implements IBeadView { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as index 9e1073e..cf2f8cd 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as @@ -21,7 +21,7 @@ package org.apache.flex.html.beads.controllers import org.apache.flex.core.IBeadController; import org.apache.flex.core.ISelectableItemRenderer; import org.apache.flex.core.IStrand; -COMPILE::AS3 { +COMPILE::SWF { import org.apache.flex.events.Event; import org.apache.flex.events.MouseEvent; } @@ -76,7 +76,7 @@ COMPILE::JS { _strand = value; renderer = value as ISelectableItemRenderer; - COMPILE::AS3 { + COMPILE::SWF { renderer.addEventListener(MouseEvent.ROLL_OVER, rollOverHandler); renderer.addEventListener(MouseEvent.ROLL_OUT, rollOutHandler); renderer.addEventListener(MouseEvent.MOUSE_DOWN, mouseDownHandler); @@ -96,7 +96,7 @@ COMPILE::JS { /** * @private */ - COMPILE::AS3 + COMPILE::SWF protected function rollOverHandler(event:MouseEvent):void { var target:ISelectableItemRenderer = event.target as ISelectableItemRenderer; @@ -118,7 +118,7 @@ COMPILE::JS { /** * @private */ - COMPILE::AS3 + COMPILE::SWF protected function rollOutHandler(event:MouseEvent):void { var target:ISelectableItemRenderer = event.target as ISelectableItemRenderer; @@ -141,7 +141,7 @@ COMPILE::JS { /** * @private */ - COMPILE::AS3 + COMPILE::SWF protected function mouseDownHandler(event:MouseEvent):void { var target:ISelectableItemRenderer = event.currentTarget as ISelectableItemRenderer; @@ -169,7 +169,7 @@ COMPILE::JS { /** * @private */ - COMPILE::AS3 + COMPILE::SWF protected function mouseUpHandler(event:MouseEvent):void { var target:ISelectableItemRenderer = event.currentTarget as ISelectableItemRenderer; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SliderMouseController.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SliderMouseController.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SliderMouseController.as index 6469fd0..487b365 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SliderMouseController.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SliderMouseController.as @@ -83,7 +83,7 @@ package org.apache.flex.html.beads.controllers rangeModel = UIBase(value).model as IRangeModel; - COMPILE::AS3 + COMPILE::SWF { var sliderView:ISliderView = value.getBeadByType(ISliderView) as ISliderView; sliderView.thumb.addEventListener(MouseEvent.MOUSE_DOWN, thumbDownHandler); @@ -117,7 +117,7 @@ package org.apache.flex.html.beads.controllers /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function thumbDownHandler( event:MouseEvent ) : void { UIBase(_strand).topMostEventDispatcher.addEventListener(MouseEvent.MOUSE_MOVE, thumbMoveHandler); @@ -132,7 +132,7 @@ package org.apache.flex.html.beads.controllers /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function thumbUpHandler( event:MouseEvent ) : void { UIBase(_strand).topMostEventDispatcher.removeEventListener(MouseEvent.MOUSE_MOVE, thumbMoveHandler); @@ -141,15 +141,15 @@ package org.apache.flex.html.beads.controllers IEventDispatcher(_strand).dispatchEvent(new Event("valueChange")); } - COMPILE::AS3 + COMPILE::SWF private var origin:Point; - COMPILE::AS3 + COMPILE::SWF private var thumb:Point; /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function thumbMoveHandler( event:MouseEvent ) : void { var sliderView:ISliderView = _strand.getBeadByType(ISliderView) as ISliderView; @@ -169,7 +169,7 @@ package org.apache.flex.html.beads.controllers /** * @private */ - COMPILE::AS3 + COMPILE::SWF private function trackClickHandler( event:MouseEvent ) : void { event.stopImmediatePropagation(); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SpinnerMouseController.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SpinnerMouseController.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SpinnerMouseController.as index 53309df..8303e12 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SpinnerMouseController.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SpinnerMouseController.as @@ -77,7 +77,7 @@ package org.apache.flex.html.beads.controllers rangeModel = UIBase(value).model as IRangeModel; - COMPILE::AS3 + COMPILE::SWF { var spinnerBead:ISpinnerView = value.getBeadByType(ISpinnerView) as ISpinnerView; spinnerBead.decrement.addEventListener(MouseEvent.CLICK, decrementClickHandler); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as index 8a8c0d7..b566354 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as @@ -82,7 +82,7 @@ package org.apache.flex.html.beads.layouts */ public function layout():Boolean { - COMPILE::AS3 + COMPILE::SWF { //trace(DOMPathUtil.getPath(host), event ? event.type : "fixed size"); var layoutParent:ILayoutHost = host.getBeadByType(ILayoutHost) as ILayoutHost; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as index 33399c3..1cfba0b 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as @@ -153,4 +153,4 @@ package org.apache.flex.html.beads.layouts return true; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as index 13c8c8b..225e0ac 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as @@ -90,7 +90,7 @@ package org.apache.flex.html.beads.layouts */ public function layout():Boolean { - COMPILE::AS3 + COMPILE::SWF { //trace(DOMPathUtil.getPath(host), event ? event.type : "fixed size"); var layoutParent:ILayoutHost = host.getBeadByType(ILayoutHost) as ILayoutHost; @@ -250,7 +250,7 @@ package org.apache.flex.html.beads.layouts } } - COMPILE::AS3 + COMPILE::SWF private function setPositionAndHeight(child:IUIBase, top:Number, mt:Number, pt:Number, bottom:Number, mb:Number, pb:Number, h:Number, valign:*):void http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as index 39e70ef..848a769 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as @@ -131,7 +131,7 @@ package org.apache.flex.html.beads.layouts */ public function layout():Boolean { - COMPILE::AS3 + COMPILE::SWF { // this is where the layout is calculated var host:UIBase = _strand as UIBase; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as index d32777d..6eaa30a 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as @@ -196,4 +196,4 @@ package org.apache.flex.html.beads.layouts return true; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as index fe43af4..dd02989 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as @@ -90,7 +90,7 @@ package org.apache.flex.html.beads.layouts */ public function layout():Boolean { - COMPILE::AS3 + COMPILE::SWF { var layoutParent:ILayoutHost = host.getBeadByType(ILayoutHost) as ILayoutHost; var contentView:IParentIUIBase = layoutParent ? layoutParent.contentView : IParentIUIBase(host); @@ -305,7 +305,7 @@ package org.apache.flex.html.beads.layouts } } - COMPILE::AS3 + COMPILE::SWF private function setPositionAndWidth(child:IUIBase, left:Number, ml:Number, pl:Number, right:Number, mr:Number, pr:Number, w:Number):void { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/ListPresentationModel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/ListPresentationModel.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/ListPresentationModel.as index 897d8d6..8a372ac 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/ListPresentationModel.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/ListPresentationModel.as @@ -104,4 +104,4 @@ package org.apache.flex.html.beads.models _strand = value; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/ViewportModel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/ViewportModel.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/ViewportModel.as index c15c5d8..26752ac 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/ViewportModel.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/ViewportModel.as @@ -69,4 +69,4 @@ package org.apache.flex.html.beads.models _strand = value; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as index bd0c016..46426cd 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as @@ -64,7 +64,7 @@ package org.apache.flex.html.supportClasses */ public function removeAllElements():void { - COMPILE::AS3 + COMPILE::SWF { removeChildren(0); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as index ac15dcf..f3b2527 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.supportClasses { - COMPILE::AS3 + COMPILE::SWF { import flash.display.Sprite; } @@ -110,7 +110,7 @@ package org.apache.flex.html.supportClasses _dataField = value; } - COMPILE::AS3 + COMPILE::SWF private var background:Sprite; COMPILE::JS @@ -119,7 +119,7 @@ package org.apache.flex.html.supportClasses /** * @private */ - COMPILE::AS3 + COMPILE::SWF override public function addedToParent():void { super.addedToParent(); @@ -133,7 +133,7 @@ package org.apache.flex.html.supportClasses */ override public function updateRenderer():void { - COMPILE::AS3 + COMPILE::SWF { super.updateRenderer(); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/GraphicsItemRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/GraphicsItemRenderer.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/GraphicsItemRenderer.as index ec096ae..2a343fa 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/GraphicsItemRenderer.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/GraphicsItemRenderer.as @@ -313,4 +313,4 @@ package org.apache.flex.html.supportClasses // handle in subclass } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as index 395fea0..d7c8d71 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.supportClasses { - COMPILE::AS3 + COMPILE::SWF { import flash.geom.Rectangle; } @@ -30,7 +30,7 @@ package org.apache.flex.html.supportClasses import org.apache.flex.core.IUIBase; import org.apache.flex.core.IViewport; import org.apache.flex.core.IViewportModel; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.core.IViewportScroller; } @@ -65,30 +65,30 @@ package org.apache.flex.html.supportClasses { } - COMPILE::AS3 + COMPILE::SWF private var _verticalScroller:ScrollBar; - COMPILE::AS3 + COMPILE::SWF public function get verticalScroller():IViewportScroller { return _verticalScroller; } - COMPILE::AS3 + COMPILE::SWF private var _horizontalScroller:ScrollBar - COMPILE::AS3 + COMPILE::SWF public function get horizontalScroller():IViewportScroller { return _horizontalScroller; } - COMPILE::AS3 + COMPILE::SWF private var _verticalScrollPosition:Number = 0; public function get verticalScrollPosition():Number { - COMPILE::AS3 + COMPILE::SWF { return _verticalScrollPosition; } @@ -99,7 +99,7 @@ package org.apache.flex.html.supportClasses } public function set verticalScrollPosition(value:Number):void { - COMPILE::AS3 + COMPILE::SWF { _verticalScrollPosition = value; handleVerticalScrollChange(); @@ -110,12 +110,12 @@ package org.apache.flex.html.supportClasses } } - COMPILE::AS3 + COMPILE::SWF private var _horizontalScrollPosition:Number = 0; public function get horizontalScrollPosition():Number { - COMPILE::AS3 + COMPILE::SWF { return _horizontalScrollPosition; } @@ -126,7 +126,7 @@ package org.apache.flex.html.supportClasses } public function set horizontalScrollPosition(value:Number):void { - COMPILE::AS3 + COMPILE::SWF { _horizontalScrollPosition = value; handleHorizontalScrollChange(); @@ -162,7 +162,7 @@ package org.apache.flex.html.supportClasses */ override public function layoutViewportAfterContentLayout():Size { - COMPILE::AS3 + COMPILE::SWF { var hadV:Boolean = _verticalScroller != null && _verticalScroller.visible; var hadH:Boolean = _horizontalScroller != null && _horizontalScroller.visible; @@ -272,7 +272,7 @@ package org.apache.flex.html.supportClasses } - COMPILE::AS3 + COMPILE::SWF private function createVerticalScrollBar():ScrollBar { var vsbm:ScrollBarModel = new ScrollBarModel(); @@ -290,7 +290,7 @@ package org.apache.flex.html.supportClasses return vsb; } - COMPILE::AS3 + COMPILE::SWF private function createHorizontalScrollBar():ScrollBar { var hsbm:ScrollBarModel = new ScrollBarModel(); @@ -308,7 +308,7 @@ package org.apache.flex.html.supportClasses return hsb; } - COMPILE::AS3 + COMPILE::SWF private function handleVerticalScroll(event:Event):void { var host:UIBase = UIBase(_strand); @@ -320,7 +320,7 @@ package org.apache.flex.html.supportClasses _verticalScrollPosition = vpos; } - COMPILE::AS3 + COMPILE::SWF private function handleHorizontalScroll(event:Event):void { var host:UIBase = UIBase(_strand); @@ -332,7 +332,7 @@ package org.apache.flex.html.supportClasses _horizontalScrollPosition = hpos; } - COMPILE::AS3 + COMPILE::SWF private function handleVerticalScrollChange():void { if (_verticalScroller) { @@ -340,7 +340,7 @@ package org.apache.flex.html.supportClasses } } - COMPILE::AS3 + COMPILE::SWF private function handleHorizontalScrollChange():void { if (_horizontalScroller) {
