http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as index 0cd6a7c..ff25bd0 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.core { - COMPILE::AS3 + COMPILE::SWF { import flash.display.DisplayObject; import flash.display.Sprite; @@ -152,7 +152,7 @@ package org.apache.flex.core { super(); - COMPILE::AS3 + COMPILE::SWF { MouseEventConverter.setupInstanceConverters(this); } @@ -253,7 +253,7 @@ package org.apache.flex.core */ public function set percentWidth(value:Number):void { - COMPILE::AS3 { + COMPILE::SWF { if (_percentWidth == value) return; @@ -296,7 +296,7 @@ package org.apache.flex.core */ public function set percentHeight(value:Number):void { - COMPILE::AS3 { + COMPILE::SWF { if (_percentHeight == value) return; @@ -331,7 +331,7 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF override public function get width():Number { var w:Number = _width; @@ -366,7 +366,7 @@ package org.apache.flex.core /** * @private */ - COMPILE::AS3 + COMPILE::SWF override public function set width(value:Number):void { if (explicitWidth != value) @@ -400,7 +400,7 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public function get $width():Number { return super.width; @@ -421,7 +421,7 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF override public function get height():Number { var h:Number = _height; @@ -456,7 +456,7 @@ package org.apache.flex.core /** * @private */ - COMPILE::AS3 + COMPILE::SWF override public function set height(value:Number):void { if (explicitHeight != value) @@ -490,7 +490,7 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public function get $height():Number { return super.height; @@ -617,7 +617,7 @@ package org.apache.flex.core /** * @private */ - COMPILE::AS3 + COMPILE::SWF override public function set x(value:Number):void { super.x = _x = value; @@ -657,7 +657,7 @@ package org.apache.flex.core */ public function setX(value:Number):void { - COMPILE::AS3 + COMPILE::SWF { super.x = value; } @@ -673,7 +673,7 @@ package org.apache.flex.core /** * @private */ - COMPILE::AS3 + COMPILE::SWF override public function set y(value:Number):void { super.y = _y = value; @@ -713,7 +713,7 @@ package org.apache.flex.core */ public function setY(value:Number):void { - COMPILE::AS3 + COMPILE::SWF { super.y = value; } @@ -728,7 +728,7 @@ package org.apache.flex.core * @private */ [Bindable("visibleChanged")] - COMPILE::AS3 + COMPILE::SWF override public function set visible(value:Boolean):void { super.visible = value; @@ -795,7 +795,7 @@ package org.apache.flex.core return element.childNodes as Array; } - COMPILE::AS3 + COMPILE::SWF private var _model:IBeadModel; /** @@ -806,7 +806,7 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public function get model():Object { if (_model == null) @@ -820,7 +820,7 @@ package org.apache.flex.core /** * @private */ - COMPILE::AS3 + COMPILE::SWF public function set model(value:Object):void { if (_model != value) @@ -989,7 +989,7 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public function get element():IFlexJSElement { return this; @@ -1005,7 +1005,7 @@ package org.apache.flex.core */ public var beads:Array; - COMPILE::AS3 + COMPILE::SWF private var _beads:Vector.<IBead>; /** @@ -1040,7 +1040,7 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public function getBeadByType(classOrInterface:Class):IBead { for each (var bead:IBead in _beads) @@ -1059,7 +1059,7 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public function removeBead(value:IBead):IBead { var n:int = _beads.length; @@ -1085,7 +1085,7 @@ package org.apache.flex.core */ public function addElement(c:Object, dispatchEvent:Boolean = true):void { - COMPILE::AS3 + COMPILE::SWF { if (c is IUIBase) { @@ -1112,7 +1112,7 @@ package org.apache.flex.core */ public function addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void { - COMPILE::AS3 + COMPILE::SWF { if (c is IUIBase) { @@ -1146,7 +1146,7 @@ package org.apache.flex.core */ public function getElementAt(index:int):Object { - COMPILE::AS3 + COMPILE::SWF { return getChildAt(index); } @@ -1167,7 +1167,7 @@ package org.apache.flex.core */ public function getElementIndex(c:Object):int { - COMPILE::AS3 + COMPILE::SWF { if (c is IUIBase) return getChildIndex(IUIBase(c).element as DisplayObject); @@ -1197,7 +1197,7 @@ package org.apache.flex.core */ public function removeElement(c:Object, dispatchEvent:Boolean = true):void { - COMPILE::AS3 + COMPILE::SWF { if (c is IUIBase) removeChild(IUIBase(c).element as DisplayObject); @@ -1220,7 +1220,7 @@ package org.apache.flex.core */ public function get numElements():int { - COMPILE::AS3 + COMPILE::SWF { return numChildren; } @@ -1350,7 +1350,7 @@ package org.apache.flex.core return measurementBead; } - COMPILE::AS3 + COMPILE::SWF private var _stageProxy:StageProxy; /** @@ -1365,7 +1365,7 @@ package org.apache.flex.core */ public function get topMostEventDispatcher():IEventDispatcher { - COMPILE::AS3 + COMPILE::SWF { if (!_stageProxy) { @@ -1382,7 +1382,7 @@ package org.apache.flex.core } } - COMPILE::AS3 + COMPILE::SWF private function stageProxy_removedFromStageHandler(event:Event):void { _stageProxy = null;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as index 427c42b..d158665 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as @@ -57,7 +57,7 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class UIButtonBase extends SimpleButton implements IStrandWithModel, IEventDispatcher, IUIBase, IStyleableObject, ILayoutChild, IFlexJSElement { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ElementEvents.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ElementEvents.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ElementEvents.as index e79762a..ad510fc 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ElementEvents.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ElementEvents.as @@ -20,7 +20,7 @@ package org.apache.flex.events { [ExcludeClass] - COMPILE::AS3 + COMPILE::SWF public class ElementEvents { } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as index 8076c66..9ca3743 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.events { - COMPILE::AS3 { + COMPILE::SWF { import flash.events.Event; } @@ -39,7 +39,7 @@ package org.apache.flex.events * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class Event extends flash.events.Event { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/events/EventDispatcher.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/EventDispatcher.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/EventDispatcher.as index f6e635b..9847e30 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/EventDispatcher.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/EventDispatcher.as @@ -24,7 +24,7 @@ package org.apache.flex.events import goog.events.EventTarget; } - COMPILE::AS3 + COMPILE::SWF { import flash.events.EventDispatcher; } @@ -38,7 +38,7 @@ package org.apache.flex.events * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class EventDispatcher extends flash.events.EventDispatcher implements IEventDispatcher { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IEventDispatcher.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IEventDispatcher.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IEventDispatcher.as index 6d8c684..944d1ab 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IEventDispatcher.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/IEventDispatcher.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.events { - COMPILE::AS3 + COMPILE::SWF { import flash.events.IEventDispatcher; } @@ -32,7 +32,7 @@ package org.apache.flex.events * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public interface IEventDispatcher extends flash.events.IEventDispatcher { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as index 605885d..d392114 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.events { - COMPILE::AS3 + COMPILE::SWF { import flash.events.MouseEvent; import flash.display.InteractiveObject; @@ -41,7 +41,7 @@ package org.apache.flex.events * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class MouseEvent extends flash.events.MouseEvent { private static function platformConstant(s:String):String http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/events/utils/IHandlesOriginalEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/utils/IHandlesOriginalEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/utils/IHandlesOriginalEvent.as index f9f035d..49bad8f 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/utils/IHandlesOriginalEvent.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/utils/IHandlesOriginalEvent.as @@ -27,7 +27,7 @@ package org.apache.flex.events.utils * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public interface IHandlesOriginalEvent { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/events/utils/MouseEventConverter.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/utils/MouseEventConverter.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/utils/MouseEventConverter.as index 1c015fd..48ff1fa 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/utils/MouseEventConverter.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/utils/MouseEventConverter.as @@ -33,7 +33,7 @@ package org.apache.flex.events.utils * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class MouseEventConverter { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Point.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Point.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Point.as index 46d4464..433f7cb 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Point.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Point.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.geom { -COMPILE::AS3 +COMPILE::SWF { import flash.geom.Point; } @@ -35,7 +35,7 @@ COMPILE::AS3 * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ -COMPILE::AS3 +COMPILE::SWF public class Point extends flash.geom.Point { public function Point(x:Number = 0, y:Number = 0) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Rectangle.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Rectangle.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Rectangle.as index a68c080..c16540b 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Rectangle.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Rectangle.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.geom { -COMPILE::AS3 +COMPILE::SWF { import flash.geom.Rectangle; } @@ -35,7 +35,7 @@ COMPILE::AS3 * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ -COMPILE::AS3 +COMPILE::SWF public class Rectangle extends flash.geom.Rectangle { public function Rectangle(x:Number = 0, y:Number = 0, width:Number = 0, height:Number = 0) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Size.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Size.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Size.as index 4c02934..83f509a 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Size.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Size.as @@ -38,4 +38,4 @@ public class Size public var width:Number; public var height:Number; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BinaryData.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BinaryData.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BinaryData.as index 2d6f6ed..0adcf3c 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BinaryData.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BinaryData.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.utils { -COMPILE::AS3 +COMPILE::SWF { import flash.utils.ByteArray; } @@ -49,7 +49,7 @@ public class BinaryData } - COMPILE::AS3 + COMPILE::SWF private var ba:ByteArray = new ByteArray(); COMPILE::JS @@ -82,7 +82,7 @@ public class BinaryData */ public function writeByte(byte:int):void { - COMPILE::AS3 + COMPILE::SWF { ba.writeByte(byte); } @@ -108,7 +108,7 @@ public class BinaryData */ public function writeShort(short:int):void { - COMPILE::AS3 + COMPILE::SWF { ba.writeShort(short); } @@ -134,7 +134,7 @@ public class BinaryData */ public function writeUnsignedInt(unsigned:uint):void { - COMPILE::AS3 + COMPILE::SWF { ba.writeUnsignedInt(unsigned); } @@ -160,7 +160,7 @@ public class BinaryData */ public function writeInt(integer:uint):void { - COMPILE::AS3 + COMPILE::SWF { ba.writeInt(integer); } @@ -186,7 +186,7 @@ public class BinaryData */ public function readByte():int { - COMPILE::AS3 + COMPILE::SWF { return ba.readByte(); } @@ -210,7 +210,7 @@ public class BinaryData */ public function readShort():int { - COMPILE::AS3 + COMPILE::SWF { return ba.readShort(); } @@ -234,7 +234,7 @@ public class BinaryData */ public function readUnsignedInt():uint { - COMPILE::AS3 + COMPILE::SWF { return ba.readUnsignedInt(); } @@ -258,7 +258,7 @@ public class BinaryData */ public function readInt():int { - COMPILE::AS3 + COMPILE::SWF { return ba.readInt(); } @@ -282,7 +282,7 @@ public class BinaryData */ public function get length():int { - COMPILE::AS3 + COMPILE::SWF { return ba.length; } @@ -302,7 +302,7 @@ public class BinaryData */ public function get bytesAvailable():int { - COMPILE::AS3 + COMPILE::SWF { return ba.bytesAvailable; } @@ -322,7 +322,7 @@ public class BinaryData */ public function get position():int { - COMPILE::AS3 + COMPILE::SWF { return ba.position; } @@ -337,7 +337,7 @@ public class BinaryData */ public function set position(value:int):void { - COMPILE::AS3 + COMPILE::SWF { ba.position = value; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/CSSBorderUtils.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/CSSBorderUtils.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/CSSBorderUtils.as index 61fecc7..ef32e1a 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/CSSBorderUtils.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/CSSBorderUtils.as @@ -36,7 +36,7 @@ package org.apache.flex.utils * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class CSSBorderUtils { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/CSSContainerUtils.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/CSSContainerUtils.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/CSSContainerUtils.as index 868faec..05c605e 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/CSSContainerUtils.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/CSSContainerUtils.as @@ -191,4 +191,4 @@ public class CSSContainerUtils borderMetrics.height + paddingMetrics.height); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/EffectTimer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/EffectTimer.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/EffectTimer.as index 3e557d6..505ae48 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/EffectTimer.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/EffectTimer.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.utils { -COMPILE::AS3 +COMPILE::SWF { import flash.events.EventDispatcher; import flash.events.TimerEvent; @@ -75,7 +75,7 @@ public class EffectTimer extends EventDispatcher implements IEffectTimer public function EffectTimer() { interval = ValuesManager.valuesImpl.getValue(this, "effectTimerInterval"); - COMPILE::AS3 + COMPILE::SWF { timer = new flash.utils.Timer(interval); timer.addEventListener("timer", timerHandler); @@ -84,7 +84,7 @@ public class EffectTimer extends EventDispatcher implements IEffectTimer private var interval:int; - COMPILE::AS3 + COMPILE::SWF private var timer:flash.utils.Timer; COMPILE::JS @@ -92,7 +92,7 @@ public class EffectTimer extends EventDispatcher implements IEffectTimer public function start():int { - COMPILE::AS3 + COMPILE::SWF { timer.start(); return getTimer(); @@ -108,7 +108,7 @@ public class EffectTimer extends EventDispatcher implements IEffectTimer public function stop():void { - COMPILE::AS3 + COMPILE::SWF { timer.stop(); } @@ -119,7 +119,7 @@ public class EffectTimer extends EventDispatcher implements IEffectTimer } } - COMPILE::AS3 + COMPILE::SWF private function timerHandler(event:flash.events.TimerEvent):void { event.updateAfterEvent(); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/HTMLLoader.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/HTMLLoader.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/HTMLLoader.as index ac8a7c1..7364680 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/HTMLLoader.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/HTMLLoader.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.utils { -COMPILE::AS3 +COMPILE::SWF { import flash.html.HTMLLoader; import org.apache.flex.events.utils.IHandlesOriginalEvent; @@ -33,7 +33,7 @@ COMPILE::AS3 * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ -COMPILE::AS3 +COMPILE::SWF public class HTMLLoader extends flash.html.HTMLLoader implements IHandlesOriginalEvent { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as index bb97ecd..611bb0f 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as @@ -20,7 +20,7 @@ package org.apache.flex.utils { [ExcludeClass] - COMPILE::AS3 + COMPILE::SWF public class Language {} COMPILE::JS http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/MXMLDataInterpreter.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/MXMLDataInterpreter.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/MXMLDataInterpreter.as index c69b550..f280a04 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/MXMLDataInterpreter.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/MXMLDataInterpreter.as @@ -19,7 +19,7 @@ package org.apache.flex.utils { -COMPILE::AS3 +COMPILE::SWF { import flash.display.DisplayObject; } @@ -254,7 +254,7 @@ public class MXMLDataInterpreter comp.setStyle(name, value); } - COMPILE::AS3 + COMPILE::SWF { // flexjs on the JS side won't have effects in here, they are regular properties // but falcon provides this set for SWFs for future compatibility with @@ -278,7 +278,7 @@ public class MXMLDataInterpreter { name = data[i++]; value = data[i++]; - COMPILE::AS3 + COMPILE::SWF { comp.addEventListener(name, value); } @@ -293,7 +293,7 @@ public class MXMLDataInterpreter { comp.setMXMLDescriptor(document, children); } - COMPILE::AS3 + COMPILE::SWF { if (parent && comp is DisplayObject) parent.addElement(comp, !(parent is IContainer)); @@ -423,7 +423,7 @@ public class MXMLDataInterpreter host[name] = value; } - COMPILE::AS3 + COMPILE::SWF { // flexjs on the JS side won't have effects in here, they are regular properties // but falcon provides this set for SWFs for future compatibility with @@ -447,7 +447,7 @@ public class MXMLDataInterpreter { name = data[i++]; value = data[i++]; - COMPILE::AS3 + COMPILE::SWF { host.addEventListener(name, value as Function); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/MixinManager.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/MixinManager.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/MixinManager.as index ab5dfed..ec61a5c 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/MixinManager.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/MixinManager.as @@ -19,7 +19,7 @@ package org.apache.flex.utils { -COMPILE::AS3 +COMPILE::SWF { import flash.system.ApplicationDomain; } @@ -70,7 +70,7 @@ public class MixinManager implements IBead { _strand = value; - COMPILE::AS3 + COMPILE::SWF { var app:IFlexInfo = value as IFlexInfo; if (app) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PNGEncoder.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PNGEncoder.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PNGEncoder.as index d34ce13..891708c 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PNGEncoder.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PNGEncoder.as @@ -34,7 +34,7 @@ import flash.utils.ByteArray; * @playerversion AIR 1.1 * @productversion Flex 3 */ -COMPILE::AS3 +COMPILE::SWF public class PNGEncoder { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as index 09c88b4..be960a9 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.utils { - COMPILE::AS3 + COMPILE::SWF { import flash.display.DisplayObject; import flash.geom.Point; @@ -60,7 +60,7 @@ package org.apache.flex.utils */ public static function globalToLocal( pt:org.apache.flex.geom.Point, local:Object ):org.apache.flex.geom.Point { - COMPILE::AS3 + COMPILE::SWF { var fpt:flash.geom.Point = DisplayObject(local).globalToLocal(pt); return new org.apache.flex.geom.Point(fpt.x, fpt.y); @@ -101,7 +101,7 @@ package org.apache.flex.utils */ public static function localToGlobal( pt:org.apache.flex.geom.Point, local:Object ):org.apache.flex.geom.Point { - COMPILE::AS3 + COMPILE::SWF { var fpt:flash.geom.Point = DisplayObject(local).localToGlobal(pt); return new org.apache.flex.geom.Point(fpt.x, fpt.y); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as index 39b6945..d1cec4a 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.utils { -COMPILE::AS3 +COMPILE::SWF { import flash.utils.Proxy; import flash.utils.flash_proxy; @@ -42,7 +42,7 @@ COMPILE::JS * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ -COMPILE::AS3 +COMPILE::SWF public dynamic class Proxy extends flash.utils.Proxy { private var valueMap:Object = {}; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/SolidBorderUtil.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/SolidBorderUtil.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/SolidBorderUtil.as index bb74b2a..7d8aa5f 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/SolidBorderUtil.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/SolidBorderUtil.as @@ -32,7 +32,7 @@ import flash.display.Graphics; * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ -COMPILE::AS3 +COMPILE::SWF public class SolidBorderUtil { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/StringTrimmer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/StringTrimmer.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/StringTrimmer.as index fe170df..fe8f581 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/StringTrimmer.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/StringTrimmer.as @@ -28,7 +28,7 @@ package org.apache.flex.utils * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class StringTrimmer { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Timer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Timer.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Timer.as index 582d884..1e1dafa 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Timer.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Timer.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.utils { -COMPILE::AS3 +COMPILE::SWF { import flash.events.TimerEvent; import flash.utils.Timer; @@ -55,7 +55,7 @@ COMPILE::JS * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ -COMPILE::AS3 +COMPILE::SWF public class Timer extends flash.utils.Timer { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/ViewSourceContextMenuOption.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/ViewSourceContextMenuOption.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/ViewSourceContextMenuOption.as index 5a2469a..8b41a7f 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/ViewSourceContextMenuOption.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/ViewSourceContextMenuOption.as @@ -19,7 +19,7 @@ package org.apache.flex.utils { -COMPILE::AS3 +COMPILE::SWF { import flash.display.InteractiveObject; import flash.events.ContextMenuEvent; @@ -71,7 +71,7 @@ public class ViewSourceContextMenuOption implements IBead { _strand = value; - COMPILE::AS3 + COMPILE::SWF { var menuHost:InteractiveObject = InteractiveObject(value); var cm:ContextMenu = ContextMenu(menuHost.contextMenu); @@ -87,7 +87,7 @@ public class ViewSourceContextMenuOption implements IBead } } - COMPILE::AS3 + COMPILE::SWF private function viewSource(e:ContextMenuEvent):void { var urlRequest:URLRequest = new URLRequest("srcview/index.html"); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/dbg/DOMPathUtil.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/dbg/DOMPathUtil.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/dbg/DOMPathUtil.as index 3b3da0e..b58881e 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/dbg/DOMPathUtil.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/dbg/DOMPathUtil.as @@ -35,7 +35,7 @@ package org.apache.flex.utils.dbg * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class DOMPathUtil { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/test/flex/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/test/flex/build.xml b/frameworks/projects/Core/src/test/flex/build.xml index 4835fee..a65c2e5 100644 --- a/frameworks/projects/Core/src/test/flex/build.xml +++ b/frameworks/projects/Core/src/test/flex/build.xml @@ -118,7 +118,7 @@ <jvmarg line="${mxmlc.jvm.args}"/> <arg value="+flexlib=${FLEXJS_HOME}/frameworks" /> <arg value="-debug" /> - <arg value="-define=COMPILE::AS3,true" /> + <arg value="-define=COMPILE::SWF,true" /> <arg value="-define=COMPILE::JS,false" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/test/flex/flexUnitTests/StrandTester.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/test/flex/flexUnitTests/StrandTester.as b/frameworks/projects/Core/src/test/flex/flexUnitTests/StrandTester.as index df62e31..06d673b 100644 --- a/frameworks/projects/Core/src/test/flex/flexUnitTests/StrandTester.as +++ b/frameworks/projects/Core/src/test/flex/flexUnitTests/StrandTester.as @@ -24,4 +24,4 @@ package flexUnitTests { public var strandTesterTest:StrandTesterTest; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Core/src/test/flex/flexUnitTests/StrandTesterTest.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/test/flex/flexUnitTests/StrandTesterTest.as b/frameworks/projects/Core/src/test/flex/flexUnitTests/StrandTesterTest.as index 97a84a3..1c4d7a9 100644 --- a/frameworks/projects/Core/src/test/flex/flexUnitTests/StrandTesterTest.as +++ b/frameworks/projects/Core/src/test/flex/flexUnitTests/StrandTesterTest.as @@ -52,4 +52,4 @@ package flexUnitTests Assert.assertEquals("Error testing Srand.id", strand.id, "foo"); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/CreateJS/.actionScriptProperties ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/.actionScriptProperties b/frameworks/projects/CreateJS/.actionScriptProperties index 25f34a9..458f764 100644 --- a/frameworks/projects/CreateJS/.actionScriptProperties +++ b/frameworks/projects/CreateJS/.actionScriptProperties @@ -18,7 +18,7 @@ limitations under the License. --> <actionScriptProperties analytics="false" mainApplicationPath="CreateJS.as" projectUUID="7d9af24d-d32d-4e14-b0ee-f799e604c2bc" 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/CreateJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/build.xml b/frameworks/projects/CreateJS/build.xml index 1a36a0d..bf7c1cd 100644 --- a/frameworks/projects/CreateJS/build.xml +++ b/frameworks/projects/CreateJS/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/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as index 9eccec2..db85a4a 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as @@ -108,7 +108,7 @@ package org.apache.flex.createjs * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class Application extends org.apache.flex.core.Application { // does nothing different for SWF side http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/CheckBox.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/CheckBox.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/CheckBox.as index f0dfbe8..9f83bb1 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/CheckBox.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/CheckBox.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.createjs { - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.CheckBox; } @@ -39,7 +39,7 @@ package org.apache.flex.createjs import org.apache.flex.core.graphics.IFill; import org.apache.flex.core.graphics.SolidColor; - COMPILE::AS3 + COMPILE::SWF public class CheckBox extends org.apache.flex.html.CheckBox { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as index 697c41e..f73266d 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as @@ -32,7 +32,7 @@ package org.apache.flex.createjs import org.apache.flex.states.State; import org.apache.flex.utils.MXMLDataInterpreter; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.Container; } @@ -59,7 +59,7 @@ package org.apache.flex.createjs * @playerversion AIR 1.1 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class Container extends org.apache.flex.html.Container { // does nothing different for SWF version. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as index 490b3b9..fefac73 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.createjs { - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.Label; } @@ -45,7 +45,7 @@ package org.apache.flex.createjs * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class Label extends org.apache.flex.html.Label { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/TextButton.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/TextButton.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/TextButton.as index 6d8415c..068ad10 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/TextButton.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/TextButton.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.createjs { - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.Button; } @@ -46,7 +46,7 @@ package org.apache.flex.createjs * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class TextButton extends Button { public function TextButton() http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/CreateJSBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/CreateJSBase.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/CreateJSBase.as index 3f13292..1b74e82 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/CreateJSBase.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/CreateJSBase.as @@ -33,7 +33,7 @@ package org.apache.flex.createjs.core import org.apache.flex.core.graphics.SolidColor; } - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.core.UIBase; } @@ -49,7 +49,7 @@ package org.apache.flex.createjs.core * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class CreateJSBase extends org.apache.flex.core.UIBase { // does nothing for SWF version. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as index 568d954..da5fc63 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as @@ -54,7 +54,7 @@ package org.apache.flex.createjs.core * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class UIBase extends org.apache.flex.core.UIBase { // nothing different for the SWF version http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/View.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/View.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/View.as index 81cf83d..e954fd7 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/View.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/View.as @@ -66,7 +66,7 @@ package org.apache.flex.createjs.core * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class View extends org.apache.flex.core.ViewBase { // nothing different for the SWF version http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/Circle.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/Circle.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/Circle.as index f470fbe..e6a31c4 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/Circle.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/Circle.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.createjs.graphics { - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.core.graphics.Circle } @@ -45,7 +45,7 @@ package org.apache.flex.createjs.graphics * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class Circle extends org.apache.flex.core.graphics.Circle { // nothing special for SWF version. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/GraphicShape.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/GraphicShape.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/GraphicShape.as index 8d06985..abe02d3 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/GraphicShape.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/GraphicShape.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.createjs.graphics { - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.core.graphics.GraphicShape } @@ -45,7 +45,7 @@ package org.apache.flex.createjs.graphics * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class GraphicShape extends org.apache.flex.core.graphics.GraphicShape { // nothing special for SWF version. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/Rect.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/Rect.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/Rect.as index eaf0a56..2e735bb 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/Rect.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/Rect.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.createjs.graphics { - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.core.graphics.Rect } @@ -46,7 +46,7 @@ package org.apache.flex.createjs.graphics * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class Rect extends org.apache.flex.core.graphics.Rect { // nothing special for SWF version. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/tween/Ease.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/tween/Ease.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/tween/Ease.as index 20d9763..6566d7a 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/tween/Ease.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/tween/Ease.as @@ -55,7 +55,7 @@ package org.apache.flex.createjs.tween */ static public function get(value:Number) : Function { - COMPILE::AS3 { + COMPILE::SWF { return null; } COMPILE::JS { @@ -73,7 +73,7 @@ package org.apache.flex.createjs.tween */ static public function getPowIn(value:Number) : Function { - COMPILE::AS3 { + COMPILE::SWF { return null; } COMPILE::JS { @@ -91,7 +91,7 @@ package org.apache.flex.createjs.tween */ static public function getPowOut(value:Number) : Function { - COMPILE::AS3 { + COMPILE::SWF { return null; } COMPILE::JS { @@ -109,7 +109,7 @@ package org.apache.flex.createjs.tween */ static public function getPowInOut(value:Number) : Function { - COMPILE::AS3 { + COMPILE::SWF { return null; } COMPILE::JS { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/tween/Tween.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/tween/Tween.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/tween/Tween.as index 40319ae..c69cfae 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/tween/Tween.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/tween/Tween.as @@ -138,7 +138,7 @@ package org.apache.flex.createjs.tween */ override public function createTweenOptions():Object { - COMPILE::AS3 { + COMPILE::SWF { return null; } COMPILE::JS { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/DragDrop/.actionScriptProperties ---------------------------------------------------------------------- diff --git a/frameworks/projects/DragDrop/.actionScriptProperties b/frameworks/projects/DragDrop/.actionScriptProperties index 99d5753..63c5ba8 100644 --- a/frameworks/projects/DragDrop/.actionScriptProperties +++ b/frameworks/projects/DragDrop/.actionScriptProperties @@ -18,7 +18,7 @@ limitations under the License. --> <actionScriptProperties analytics="false" mainApplicationPath="DragDrop.as" projectUUID="8736dc4b-71dc-4f2c-9181-5295a09b7c7e" 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/DragDrop/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/DragDrop/build.xml b/frameworks/projects/DragDrop/build.xml index 0cb8755..ff8a41c 100644 --- a/frameworks/projects/DragDrop/build.xml +++ b/frameworks/projects/DragDrop/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/DragDrop/src/main/flex/org/apache/flex/core/DropType.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/core/DropType.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/core/DropType.as index 9df59cf..4de2eb9 100644 --- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/core/DropType.as +++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/core/DropType.as @@ -61,4 +61,4 @@ package org.apache.flex.core public static const CANCEL:String = "cancel"; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as index 7d9fefb..12f42e3 100644 --- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as +++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as @@ -273,7 +273,7 @@ package org.apache.flex.events */ public function DragEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false) { - COMPILE::AS3 + COMPILE::SWF { super(type, bubbles, cancelable); } @@ -300,7 +300,7 @@ package org.apache.flex.events */ public static function createDragEvent(type:String, event:MouseEvent):DragEvent { - COMPILE::AS3 + COMPILE::SWF { var de:DragEvent = new DragEvent(type, true, true); de.localX = event.localX; @@ -341,7 +341,7 @@ package org.apache.flex.events */ public static function dispatchDragEvent(event:DragEvent, target:IEventDispatcher):void { - COMPILE::AS3 + COMPILE::SWF { target.dispatchEvent(event); } @@ -370,4 +370,4 @@ package org.apache.flex.events private static var dragEventMixin:Boolean = installDragEventMixin(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEventBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEventBase.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEventBase.as index aaa8ddf..f70b7c6 100644 --- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEventBase.as +++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEventBase.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.events { - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.events.MouseEvent; } @@ -35,7 +35,7 @@ package org.apache.flex.events * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class DragEventBase extends MouseEvent { public function DragEventBase(type:String, bubbles:Boolean=false, cancelable:Boolean=false) @@ -48,4 +48,4 @@ package org.apache.flex.events public class DragEventBase extends goog.events.BrowserEvent { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Effects/.actionScriptProperties ---------------------------------------------------------------------- diff --git a/frameworks/projects/Effects/.actionScriptProperties b/frameworks/projects/Effects/.actionScriptProperties index 04a88d5..4e8a684 100644 --- a/frameworks/projects/Effects/.actionScriptProperties +++ b/frameworks/projects/Effects/.actionScriptProperties @@ -18,7 +18,7 @@ limitations under the License. --> <actionScriptProperties analytics="false" mainApplicationPath="Effects.as" projectUUID="c7b22e99-ecef-48e3-90be-f80d3bc54d5f" 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/Effects/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Effects/build.xml b/frameworks/projects/Effects/build.xml index c3b97fe..f4496a4 100644 --- a/frameworks/projects/Effects/build.xml +++ b/frameworks/projects/Effects/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/Effects/src/main/flex/org/apache/flex/core/StatesWithTransitionsImpl.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Effects/src/main/flex/org/apache/flex/core/StatesWithTransitionsImpl.as b/frameworks/projects/Effects/src/main/flex/org/apache/flex/core/StatesWithTransitionsImpl.as index 9549bc8..76a879f 100644 --- a/frameworks/projects/Effects/src/main/flex/org/apache/flex/core/StatesWithTransitionsImpl.as +++ b/frameworks/projects/Effects/src/main/flex/org/apache/flex/core/StatesWithTransitionsImpl.as @@ -343,4 +343,4 @@ package org.apache.flex.core } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/PlatformWiper.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/PlatformWiper.as b/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/PlatformWiper.as index 1e3b412..5f330ff 100644 --- a/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/PlatformWiper.as +++ b/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/PlatformWiper.as @@ -20,7 +20,7 @@ package org.apache.flex.effects { -COMPILE::AS3 +COMPILE::SWF { import flash.display.DisplayObject; import flash.geom.Rectangle; @@ -91,7 +91,7 @@ public class PlatformWiper */ public function set target(value:IUIBase):void { - COMPILE::AS3 + COMPILE::SWF { if (value == null) DisplayObject(_target).scrollRect = null; @@ -123,7 +123,7 @@ public class PlatformWiper */ public function set visibleRect(value:Rectangle):void { - COMPILE::AS3 + COMPILE::SWF { DisplayObject(_target).scrollRect = value; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Flat/.actionScriptProperties ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/.actionScriptProperties b/frameworks/projects/Flat/.actionScriptProperties index 2d5ef3f..496505a 100644 --- a/frameworks/projects/Flat/.actionScriptProperties +++ b/frameworks/projects/Flat/.actionScriptProperties @@ -18,7 +18,7 @@ limitations under the License. --> <actionScriptProperties analytics="false" mainApplicationPath="Flat.as" projectUUID="ea1b31ea-3d47-4d1e-8e28-ad149f2397e1" 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/Flat/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/build.xml b/frameworks/projects/Flat/build.xml index e323e5c..e4fc097 100644 --- a/frameworks/projects/Flat/build.xml +++ b/frameworks/projects/Flat/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/Flat/src/main/flex/FlatClasses.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/src/main/flex/FlatClasses.as b/frameworks/projects/Flat/src/main/flex/FlatClasses.as index 29173ef..0e534ce 100644 --- a/frameworks/projects/Flat/src/main/flex/FlatClasses.as +++ b/frameworks/projects/Flat/src/main/flex/FlatClasses.as @@ -27,7 +27,7 @@ package */ internal class FlatClasses { - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.flat.beads.CSSScrollBarView; CSSScrollBarView; import org.apache.flex.flat.beads.CSSScrollBarButtonView; CSSScrollBarButtonView; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as index 466e9b2..2d09772 100644 --- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as +++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.flat { - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.CheckBox; } @@ -38,7 +38,7 @@ package org.apache.flex.flat * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class CheckBox extends org.apache.flex.html.CheckBox { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as index 265f2c7..1e4b3c7 100644 --- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as +++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as @@ -20,7 +20,7 @@ package org.apache.flex.flat { import org.apache.flex.core.UIBase; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.DropDownList; } @@ -44,7 +44,7 @@ package org.apache.flex.flat * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class DropDownList extends org.apache.flex.html.DropDownList { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/RadioButton.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/RadioButton.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/RadioButton.as index 1294a25..9fe9d1b 100644 --- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/RadioButton.as +++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/RadioButton.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.flat { - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.RadioButton; } @@ -37,7 +37,7 @@ package org.apache.flex.flat * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::AS3 + COMPILE::SWF public class RadioButton extends org.apache.flex.html.RadioButton { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Formatters/.actionScriptProperties ---------------------------------------------------------------------- diff --git a/frameworks/projects/Formatters/.actionScriptProperties b/frameworks/projects/Formatters/.actionScriptProperties index 97e41af..1a581a6 100644 --- a/frameworks/projects/Formatters/.actionScriptProperties +++ b/frameworks/projects/Formatters/.actionScriptProperties @@ -18,7 +18,7 @@ limitations under the License. --> <actionScriptProperties analytics="false" mainApplicationPath="Formatters.as" projectUUID="187f4b92-5fcd-4cee-ac61-58362a56ba1b" 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/Formatters/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml index a14f28c..daf0972 100644 --- a/frameworks/projects/Formatters/build.xml +++ b/frameworks/projects/Formatters/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/Formatters/src/main/flex/FormattersClasses.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Formatters/src/main/flex/FormattersClasses.as b/frameworks/projects/Formatters/src/main/flex/FormattersClasses.as index bbf43ce..d9013dc 100644 --- a/frameworks/projects/Formatters/src/main/flex/FormattersClasses.as +++ b/frameworks/projects/Formatters/src/main/flex/FormattersClasses.as @@ -30,7 +30,7 @@ internal class FormattersClasses import org.apache.flex.core.FormatBase; FormatBase; import org.apache.flex.html.accessories.DateFormatMMDDYYYYBead; DateFormatMMDDYYYYBead; - COMPILE::AS3 + COMPILE::SWF { import org.apache.flex.html.beads.FormatableLabelView; FormatableLabelView; import org.apache.flex.html.beads.FormatableTextInputView; FormatableTextInputView; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Formatters/src/main/flex/org/apache/flex/core/FormatBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Formatters/src/main/flex/org/apache/flex/core/FormatBase.as b/frameworks/projects/Formatters/src/main/flex/org/apache/flex/core/FormatBase.as index b1fa1af..4ccfc35 100644 --- a/frameworks/projects/Formatters/src/main/flex/org/apache/flex/core/FormatBase.as +++ b/frameworks/projects/Formatters/src/main/flex/org/apache/flex/core/FormatBase.as @@ -110,4 +110,4 @@ package org.apache.flex.core _strand = value; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/GoogleMaps/.actionScriptProperties ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/.actionScriptProperties b/frameworks/projects/GoogleMaps/.actionScriptProperties index 7d8a9f1..1cbf05a 100644 --- a/frameworks/projects/GoogleMaps/.actionScriptProperties +++ b/frameworks/projects/GoogleMaps/.actionScriptProperties @@ -18,7 +18,7 @@ limitations under the License. --> <actionScriptProperties analytics="false" mainApplicationPath="GoogleMaps.as" projectUUID="7d907ea6-da29-4573-9741-08d2cf0f85d6" 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/GoogleMaps/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/build.xml b/frameworks/projects/GoogleMaps/build.xml index 0dcfb0c..50484bc 100644 --- a/frameworks/projects/GoogleMaps/build.xml +++ b/frameworks/projects/GoogleMaps/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/GoogleMaps/src/main/flex/GoogleStubClasses.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/src/main/flex/GoogleStubClasses.as b/frameworks/projects/GoogleMaps/src/main/flex/GoogleStubClasses.as index 9f6da21..4fc2890 100644 --- a/frameworks/projects/GoogleMaps/src/main/flex/GoogleStubClasses.as +++ b/frameworks/projects/GoogleMaps/src/main/flex/GoogleStubClasses.as @@ -27,7 +27,7 @@ package */ internal class GoogleStubClasses { - COMPILE::AS3 { + COMPILE::SWF { import google.maps.Animation; Animation; import google.maps.LatLng; LatLng; import google.maps.Marker; Marker; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/GoogleMapView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/GoogleMapView.as b/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/GoogleMapView.as index 304c984..b414c2f 100644 --- a/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/GoogleMapView.as +++ b/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/GoogleMapView.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.maps.google.beads { - COMPILE::AS3 { + COMPILE::SWF { import flash.events.Event; import flash.net.URLRequest; import flash.filesystem.File; @@ -408,7 +408,7 @@ package org.apache.flex.maps.google.beads * The AS3 version of GoogleMapView is geared toward its use with HTMLLoader * for AIR. */ - COMPILE::AS3 + COMPILE::SWF public class GoogleMapView extends BeadViewBase implements IBeadView { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/MapView_original.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/MapView_original.as b/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/MapView_original.as index d21314e..ecf795b 100644 --- a/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/MapView_original.as +++ b/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/MapView_original.as @@ -26,7 +26,7 @@ */ package org.apache.flex.maps.google.beads { - COMPILE::AS3 { + COMPILE::SWF { import flash.events.Event; import flash.html.HTMLLoader; import flash.net.URLRequest; @@ -84,7 +84,7 @@ package org.apache.flex.maps.google.beads } } - COMPILE::AS3 + COMPILE::SWF public class MapView_original extends BeadViewBase implements IBeadView { /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70dd87bb/frameworks/projects/Graphics/.actionScriptProperties ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/.actionScriptProperties b/frameworks/projects/Graphics/.actionScriptProperties index d539c32..f3a3b57 100644 --- a/frameworks/projects/Graphics/.actionScriptProperties +++ b/frameworks/projects/Graphics/.actionScriptProperties @@ -18,7 +18,7 @@ limitations under the License. --> <actionScriptProperties analytics="false" mainApplicationPath="Graphics.as" projectUUID="ff3e0531-b7c9-4b0c-9146-05c27a47f837" 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/Graphics/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/build.xml b/frameworks/projects/Graphics/build.xml index 1aa386f..df5f5f2 100644 --- a/frameworks/projects/Graphics/build.xml +++ b/frameworks/projects/Graphics/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}" />
