flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [2/8] git commit: [flex-asjs] [refs/heads/core_js_to_as] - clean compile of as to js
Date Sun, 18 Oct 2015 05:35:10 GMT
clean compile of as to js


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

Branch: refs/heads/core_js_to_as
Commit: 1392924bd5803023bcb40b6b2b4937ab336c7ff1
Parents: f6e4705
Author: Alex Harui <aharui@apache.org>
Authored: Wed Oct 14 13:40:28 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Wed Oct 14 13:40:28 2015 -0700

----------------------------------------------------------------------
 .../projects/Core/as/src/CoreJSClasses.as       |  19 +-
 .../apache/flex/core/BrowserResizeListener.as   |  77 +++++---
 .../src/org/apache/flex/core/BrowserWindow.as   |   1 -
 .../src/org/apache/flex/core/CallLaterBead.as   |  30 ++-
 .../as/src/org/apache/flex/core/ClassFactory.as |   1 -
 .../src/org/apache/flex/core/DataBindingBase.as |   1 -
 .../src/org/apache/flex/core/FilledRectangle.as |   1 -
 .../as/src/org/apache/flex/core/IAlertModel.as  |   1 -
 .../as/src/org/apache/flex/core/IBeadLayout.as  |   1 -
 .../Core/as/src/org/apache/flex/core/IChrome.as |   1 -
 .../src/org/apache/flex/core/IComboBoxModel.as  |   1 -
 .../as/src/org/apache/flex/core/IContentView.as |   1 -
 .../core/IDataProviderItemRendererMapper.as     |   1 -
 .../src/org/apache/flex/core/IDragInitiator.as  |   1 -
 .../as/src/org/apache/flex/core/IEffectTimer.as |   1 -
 .../as/src/org/apache/flex/core/IFactory.as     |   1 -
 .../as/src/org/apache/flex/core/IFormatBead.as  |   1 -
 .../src/org/apache/flex/core/IItemRenderer.as   |   1 -
 .../flex/core/IItemRendererClassFactory.as      |   1 -
 .../org/apache/flex/core/IItemRendererParent.as |   1 -
 .../as/src/org/apache/flex/core/ILayoutHost.as  |   1 -
 .../apache/flex/core/IListPresentationModel.as  |   1 -
 .../as/src/org/apache/flex/core/IPanelModel.as  |   1 -
 .../Core/as/src/org/apache/flex/core/IPopUp.as  |   1 -
 .../as/src/org/apache/flex/core/IRangeModel.as  |   1 -
 .../src/org/apache/flex/core/IRollOverModel.as  |   1 -
 .../apache/flex/core/ISelectableItemRenderer.as |   1 -
 .../src/org/apache/flex/core/ISelectionModel.as |   1 -
 .../as/src/org/apache/flex/core/IStyleObject.as |   1 -
 .../as/src/org/apache/flex/core/ITextModel.as   |   1 -
 .../src/org/apache/flex/core/ITitleBarModel.as  |   1 -
 .../org/apache/flex/core/IToggleButtonModel.as  |   1 -
 .../apache/flex/core/IValueToggleButtonModel.as |   1 -
 .../as/src/org/apache/flex/core/IViewport.as    |   1 -
 .../src/org/apache/flex/core/IViewportModel.as  |   1 -
 .../flex/core/ItemRendererClassFactory.as       |   1 -
 .../org/apache/flex/core/MXMLDragInitiator.as   |   1 -
 .../org/apache/flex/core/SimpleStatesImpl.as    |   1 -
 .../org/apache/flex/core/SimpleValuesImpl.as    |   7 +-
 .../Core/as/src/org/apache/flex/core/Strand.as  |   1 -
 .../org/apache/flex/core/WrappedHTMLElement.as  |   4 -
 .../src/org/apache/flex/events/CustomEvent.as   |  10 +-
 .../org/apache/flex/events/IEventDispatcher.as  |   1 +
 .../as/src/org/apache/flex/events/MouseEvent.as |  15 +-
 .../org/apache/flex/events/utils/MouseUtils.as  |   1 -
 .../Core/as/src/org/apache/flex/geom/Point.as   |  31 +++-
 .../as/src/org/apache/flex/geom/Rectangle.as    |  54 +++++-
 .../as/src/org/apache/flex/utils/BinaryData.as  | 182 +++++++++++++++++--
 .../as/src/org/apache/flex/utils/EffectTimer.as |  66 +++++--
 .../src/org/apache/flex/utils/MixinManager.as   |  36 +++-
 .../as/src/org/apache/flex/utils/PointUtils.as  |  60 +++++-
 .../Core/as/src/org/apache/flex/utils/Timer.as  |  76 +++++++-
 .../as/src/org/apache/flex/utils/UIUtils.as     |   1 -
 .../flex/utils/ViewSourceContextMenuOption.as   |  41 +++--
 frameworks/projects/Core/as/tests/build.xml     |   2 +
 .../org/apache/flex/core/BindableCSSStyles.as   |   1 -
 .../src/org/apache/flex/core/IDataGridLayout.as |   1 -
 .../src/org/apache/flex/core/IDataGridModel.as  |   1 -
 .../flex/core/IDataGridPresentationModel.as     |   1 -
 .../org/apache/flex/core/IDateChooserModel.as   |   1 -
 .../org/apache/flex/core/ParentDocumentBead.as  |   1 -
 .../src/org/apache/flex/core/SimpleCSSStyles.as |   1 -
 frameworks/projects/Core/basic-manifest.xml     |   2 -
 63 files changed, 600 insertions(+), 158 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/CoreJSClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/CoreJSClasses.as b/frameworks/projects/Core/as/src/CoreJSClasses.as
index 0d4496a..6bb95de 100644
--- a/frameworks/projects/Core/as/src/CoreJSClasses.as
+++ b/frameworks/projects/Core/as/src/CoreJSClasses.as
@@ -27,7 +27,6 @@ package
  */
 internal class CoreJSClasses
 {	
-    /* comment out for now until we get Application and its dependencies to compile
     import org.apache.flex.core.BeadViewBase; BeadViewBase;
     import org.apache.flex.core.BrowserWindow; BrowserWindow;
     import org.apache.flex.core.ItemRendererClassFactory; ItemRendererClassFactory;  
@@ -38,7 +37,7 @@ internal class CoreJSClasses
     import org.apache.flex.core.IBeadLayout; IBeadLayout;
     import org.apache.flex.core.IBeadModel; IBeadModel;
     import org.apache.flex.core.IBeadView; IBeadView;
-    import org.apache.flex.core.IBorderModel; IBorderModel;
+    //import org.apache.flex.core.IBorderModel; IBorderModel;
     import org.apache.flex.core.IChild; IChild;
     import org.apache.flex.core.IChrome; IChrome;
     import org.apache.flex.core.IComboBoxModel; IComboBoxModel;
@@ -47,15 +46,15 @@ internal class CoreJSClasses
     import org.apache.flex.core.IDataProviderItemRendererMapper; IDataProviderItemRendererMapper;
     import org.apache.flex.core.IDocument; IDocument;
     import org.apache.flex.core.IFormatBead; IFormatBead;
-    import org.apache.flex.core.IImageModel; IImageModel;
+    //import org.apache.flex.core.IImageModel; IImageModel;
     import org.apache.flex.core.ILayoutChild; ILayoutChild;
-    import org.apache.flex.core.ILayoutParent; ILayoutParent;
+    import org.apache.flex.core.ILayoutHost; ILayoutHost;
     import org.apache.flex.core.IPanelModel; IPanelModel;
     import org.apache.flex.core.IParent; IParent;
     import org.apache.flex.core.IParentIUIBase; IParentIUIBase;
     import org.apache.flex.core.IPopUp; IPopUp;
     import org.apache.flex.core.IRollOverModel; IRollOverModel;
-    import org.apache.flex.core.IScrollBarModel; IScrollBarModel;
+    //import org.apache.flex.core.IScrollBarModel; IScrollBarModel;
     import org.apache.flex.core.ISelectableItemRenderer; ISelectableItemRenderer;
     import org.apache.flex.core.ISelectionModel; ISelectionModel;
     import org.apache.flex.core.IStrand; IStrand;
@@ -67,11 +66,11 @@ internal class CoreJSClasses
     import org.apache.flex.core.IValueToggleButtonModel; IValueToggleButtonModel;
 	import org.apache.flex.core.IViewport; IViewport;
 	import org.apache.flex.core.IViewportModel; IViewportModel;
-	import org.apache.flex.core.IViewportScroller; IViewportScroller;
+	//import org.apache.flex.core.IViewportScroller; IViewportScroller;
     import org.apache.flex.core.SimpleStatesImpl; SimpleStatesImpl;
     import org.apache.flex.core.DataBindingBase; DataBindingBase;
     import org.apache.flex.core.UIBase; UIBase;
-    import org.apache.flex.core.UIButtonBase; UIButtonBase;
+    //import org.apache.flex.core.UIButtonBase; UIButtonBase;
 	import org.apache.flex.events.CustomEvent; CustomEvent;
 	import org.apache.flex.events.Event; Event;
     import org.apache.flex.events.EventDispatcher; EventDispatcher;
@@ -82,11 +81,10 @@ internal class CoreJSClasses
     import org.apache.flex.geom.Point; Point;
     import org.apache.flex.geom.Rectangle; Rectangle;
     import org.apache.flex.utils.BinaryData; BinaryData;
-    import org.apache.flex.utils.BeadMetrics; BeadMetrics;
 	import org.apache.flex.utils.EffectTimer; EffectTimer;
     import org.apache.flex.utils.MixinManager; MixinManager;
-    import org.apache.flex.utils.PNGEncoder; PNGEncoder;
-    import org.apache.flex.utils.StringTrimmer; StringTrimmer;
+    //import org.apache.flex.utils.PNGEncoder; PNGEncoder;
+    //import org.apache.flex.utils.StringTrimmer; StringTrimmer;
 	import org.apache.flex.utils.Timer; Timer;
 	import org.apache.flex.utils.UIUtils; UIUtils;
     
@@ -95,7 +93,6 @@ internal class CoreJSClasses
     import org.apache.flex.states.SetEventHandler; SetEventHandler;
     import org.apache.flex.states.SetProperty; SetProperty;
     import org.apache.flex.states.State; State;
-    */
 }
 
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserResizeListener.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserResizeListener.as b/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserResizeListener.as
index 21544ca..f937dba 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserResizeListener.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserResizeListener.as
@@ -18,10 +18,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.core
 {
+COMPILE::AS3
+{
     import flash.events.Event;
     import flash.external.ExternalInterface;
-    import flash.utils.getQualifiedClassName;
-    
+    import flash.utils.getQualifiedClassName;        
+}
+COMPILE::JS
+{
+    import goog.bind;    
+}
+
     /**
      *  The BrowserResizeListener class listens for browser
      *  resizing and resizes the application accordingly.
@@ -30,6 +37,7 @@ package org.apache.flex.core
      *  @playerversion Flash 10.2
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
+     *  @flexjsignoreimport goog.bind
      */
 	public class BrowserResizeListener implements IBead
 	{
@@ -78,32 +86,57 @@ package org.apache.flex.core
         public function set strand(value:IStrand):void
         {
             app = value as Application;
-            app.stage.addEventListener("resize", resizeHandler);
-            if (ExternalInterface.available && (!isNaN(minWidth) || !isNaN(minHeight)))
+            COMPILE::AS3
+            {
+                app.stage.addEventListener("resize", resizeHandler);
+                if (ExternalInterface.available && (!isNaN(minWidth) || !isNaN(minHeight)))
+                {
+                    // Get application name.  This assumes that the wrapper is using an
+                    // object tag with the id that matches the application name
+                    var appName:String = getQualifiedClassName(app);
+                    var js:String = "var o = document.getElementById('" + appName + "');";
+                    if (!isNaN(minWidth))
+                        js += "o.style.minWidth = '" + minWidth.toString() + "px';";
+                    if (!isNaN(minHeight))
+                        js += "o.style.minHeight = '" + minHeight.toString() + "px';"
+                    ExternalInterface.call("eval", js); 
+                }                    
+            }
+            COMPILE::JS
             {
-                // Get application name.  This assumes that the wrapper is using an
-                // object tag with the id that matches the application name
-                var appName:String = getQualifiedClassName(app);
-                var js:String = "var o = document.getElementById('" + appName + "');";
-                if (!isNaN(minWidth))
-                    js += "o.style.minWidth = '" + minWidth.toString() + "px';";
-                if (!isNaN(minHeight))
-                    js += "o.style.minHeight = '" + minHeight.toString() + "px';"
-                ExternalInterface.call("eval", js); 
+                window.addEventListener('resize',
+                    goog.bind(this.resizeHandler, this), false);
+                if (!isNaN(this.minWidth))
+                    document.body.style.minWidth = this.minWidth.toString() + 'px';
+                if (!isNaN(this.minHeight))
+                    document.body.style.minHeight = this.minHeight.toString() + 'px';
+                document.body.style.overflow = 'auto';
             }
         }
         
         private function resizeHandler(event:Event):void
         {
-            var initialView:UIBase = app.initialView;
-            if (!isNaN(initialView.percentWidth) && !isNaN(initialView.percentHeight))
-                initialView.setWidthAndHeight(Math.max(minWidth, app.stage.stageWidth), 
-                    Math.max(minHeight, app.stage.stageHeight), true);
-            else if (!isNaN(initialView.percentWidth))
-                initialView.setWidth(Math.max(minWidth, app.stage.stageWidth));
-            else if (!isNaN(initialView.percentHeight))
-                initialView.setHeight(Math.max(minHeight, app.stage.stageHeight));
-            
+            COMPILE::AS3
+            {
+                var initialView:UIBase = app.initialView;
+                if (!isNaN(initialView.percentWidth) && !isNaN(initialView.percentHeight))
+                    initialView.setWidthAndHeight(Math.max(minWidth, app.stage.stageWidth), 
+                        Math.max(minHeight, app.stage.stageHeight), true);
+                else if (!isNaN(initialView.percentWidth))
+                    initialView.setWidth(Math.max(minWidth, app.stage.stageWidth));
+                else if (!isNaN(initialView.percentHeight))
+                    initialView.setHeight(Math.max(minHeight, app.stage.stageHeight));
+            }
+            COMPILE::JS
+            {
+                var initialView:UIBase = app.initialView;
+                var element:HTMLElement = app.element;
+                if (!isNaN(initialView.percentWidth) || !isNaN(initialView.percentHeight)) {
+                    element.style.height = window.innerHeight.toString() + 'px';
+                    element.style.width = window.innerWidth.toString() + 'px';
+                    initialView.dispatchEvent('sizeChanged'); // kick off layout if % sizes
+                }
+            }
         }
 
 	}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserWindow.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserWindow.as b/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserWindow.as
index 03e6a6a..91ba7ed 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserWindow.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserWindow.as
@@ -29,7 +29,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public class BrowserWindow
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/CallLaterBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/CallLaterBead.as b/frameworks/projects/Core/as/src/org/apache/flex/core/CallLaterBead.as
index 73fa57e..85c1195 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/CallLaterBead.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/CallLaterBead.as
@@ -18,8 +18,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.core
 {
-    import flash.display.DisplayObject;
-    import flash.events.Event;
+    COMPILE::AS3
+    {
+        import flash.display.DisplayObject;
+        import flash.events.Event;
+    }
+    COMPILE::JS
+    {
+        import goog.bind;
+    }
     
     import org.apache.flex.core.IBead;
     import org.apache.flex.core.IStrand;
@@ -33,8 +40,8 @@ package org.apache.flex.core
      *  @playerversion Flash 10.2
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
+     *  @flexjsignoreimport goog.bind
      */
-    COMPILE::AS3
 	public class CallLaterBead implements IBead
 	{
         /**
@@ -87,17 +94,30 @@ package org.apache.flex.core
          */
         public function callLater(fn:Function, args:Array = null, thisArg:Object = null):void
         {
-            DisplayObject(_strand).addEventListener(Event.ENTER_FRAME, enterFrameHandler);
+            COMPILE::AS3
+            {
+                DisplayObject(_strand).addEventListener(Event.ENTER_FRAME, enterFrameHandler);
+            }
             if (calls == null)
                 calls = [ {thisArg: thisArg, fn: fn, args: args } ];
             else
                 calls.push({thisArg: thisArg, fn: fn, args: args });
+            
+            COMPILE::JS
+            {
+                setTimeout(goog.bind(this.makeCalls, this), 0);
+            }
         }
         
+        COMPILE::AS3
         private function enterFrameHandler(event:Event):void
         {
             DisplayObject(_strand).removeEventListener(Event.ENTER_FRAME, enterFrameHandler);
-            
+            makeCalls();
+        }
+        
+        private function makeCalls():void
+        {
             var list:Array = calls;
             var n:int = list.length;
             for (var i:int = 0; i < n; i++)

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/ClassFactory.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ClassFactory.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ClassFactory.as
index 79e6150..8b1f254 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ClassFactory.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ClassFactory.as
@@ -30,7 +30,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public class ClassFactory implements IFactory
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/DataBindingBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/DataBindingBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/DataBindingBase.as
index 5fee355..c096232 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/DataBindingBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/DataBindingBase.as
@@ -27,7 +27,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public class DataBindingBase
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/FilledRectangle.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/FilledRectangle.as b/frameworks/projects/Core/as/src/org/apache/flex/core/FilledRectangle.as
index a2d9df5..f18f54b 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/FilledRectangle.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/FilledRectangle.as
@@ -31,7 +31,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public class FilledRectangle extends UIBase
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IAlertModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IAlertModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IAlertModel.as
index 716d7c5..75ba6d0 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IAlertModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IAlertModel.as
@@ -30,7 +30,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IAlertModel extends IEventDispatcher, IBeadModel
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadLayout.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadLayout.as
index eb7ae18..a0dba9d 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadLayout.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadLayout.as
@@ -30,7 +30,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IBeadLayout extends IBead
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IChrome.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IChrome.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IChrome.as
index c79264e..e96fdc7 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IChrome.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IChrome.as
@@ -30,7 +30,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IChrome
 	{
 		

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IComboBoxModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IComboBoxModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IComboBoxModel.as
index 54a7606..efe0460 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IComboBoxModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IComboBoxModel.as
@@ -30,7 +30,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IComboBoxModel extends IEventDispatcher, IBeadModel
 	{
         // TODO: should extend ITextModel

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IContentView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IContentView.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IContentView.as
index 8206175..42cc685 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IContentView.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IContentView.as
@@ -18,7 +18,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.core
 {
-COMPILE::AS3
 	public interface IContentView
 	{
 		function get x():Number;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IDataProviderItemRendererMapper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IDataProviderItemRendererMapper.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IDataProviderItemRendererMapper.as
index b198e79..20afbee 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IDataProviderItemRendererMapper.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IDataProviderItemRendererMapper.as
@@ -35,7 +35,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IDataProviderItemRendererMapper extends IBead
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IDragInitiator.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IDragInitiator.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IDragInitiator.as
index 316e351..fa4ae22 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IDragInitiator.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IDragInitiator.as
@@ -33,7 +33,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public interface IDragInitiator
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IEffectTimer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IEffectTimer.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IEffectTimer.as
index 790b9fa..7affda2 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IEffectTimer.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IEffectTimer.as
@@ -34,7 +34,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IEffectTimer extends IEventDispatcher
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IFactory.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IFactory.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IFactory.as
index d6d41e5..3a9665e 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IFactory.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IFactory.as
@@ -29,7 +29,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IFactory
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IFormatBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IFormatBead.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IFormatBead.as
index 7d67f77..016642b 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IFormatBead.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IFormatBead.as
@@ -31,7 +31,6 @@ package org.apache.flex.core
 	 *  @playerversion AIR 2.6
 	 *  @productversion FlexJS 0.0
 	 */
-	COMPILE::AS3
 	public interface IFormatBead extends IBead, IEventDispatcher
 	{
 		/**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRenderer.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRenderer.as
index 0d8f038..7843e36 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRenderer.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRenderer.as
@@ -29,7 +29,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IItemRenderer extends IEventDispatcher
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererClassFactory.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererClassFactory.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererClassFactory.as
index 0afa093..a12c1e5 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererClassFactory.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererClassFactory.as
@@ -37,7 +37,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IItemRendererClassFactory extends IBead
 	{
         // TODO: add additional parameters like the data item and index

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererParent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererParent.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererParent.as
index ade3cea..18656ef 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererParent.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererParent.as
@@ -29,7 +29,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IItemRendererParent extends IParent, IEventDispatcher
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as
index fc38f36..3f36723 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as
@@ -29,7 +29,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface ILayoutHost
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IListPresentationModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IListPresentationModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IListPresentationModel.as
index 13d056e..9b3a35e 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IListPresentationModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IListPresentationModel.as
@@ -27,7 +27,6 @@ package org.apache.flex.core
 	 *  @playerversion AIR 2.6
 	 *  @productversion FlexJS 0.0
 	 */
-	COMPILE::AS3
 	public interface IListPresentationModel extends IBead
 	{
 		/**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IPanelModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IPanelModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IPanelModel.as
index aff1e9b..02ece38 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IPanelModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IPanelModel.as
@@ -28,7 +28,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public interface IPanelModel extends IBeadModel, ITitleBarModel
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IPopUp.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IPopUp.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IPopUp.as
index 29353c5..0ffc3b1 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IPopUp.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IPopUp.as
@@ -27,7 +27,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IPopUp
 	{
 	}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IRangeModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IRangeModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IRangeModel.as
index 1ffd283..42bf02a 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IRangeModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IRangeModel.as
@@ -29,7 +29,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IRangeModel extends IBeadModel
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IRollOverModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IRollOverModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IRollOverModel.as
index 4be7c4f..788012a 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IRollOverModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IRollOverModel.as
@@ -30,7 +30,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IRollOverModel extends IEventDispatcher, IBeadModel
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/ISelectableItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ISelectableItemRenderer.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ISelectableItemRenderer.as
index 03d4e9b..366a5dd 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ISelectableItemRenderer.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ISelectableItemRenderer.as
@@ -29,7 +29,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public interface ISelectableItemRenderer extends IItemRenderer
 	{
 		

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/ISelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ISelectionModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ISelectionModel.as
index 5c12f60..e918e47 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ISelectionModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ISelectionModel.as
@@ -31,7 +31,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public interface ISelectionModel extends IEventDispatcher, IBeadModel
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IStyleObject.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IStyleObject.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IStyleObject.as
index be743da..f8b3862 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IStyleObject.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IStyleObject.as
@@ -29,7 +29,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IStyleObject
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/ITextModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ITextModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ITextModel.as
index 0fe8c18..3ae624c 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ITextModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ITextModel.as
@@ -28,7 +28,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public interface ITextModel extends IBeadModel
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/ITitleBarModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ITitleBarModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ITitleBarModel.as
index 4fa9046..a3577ee 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ITitleBarModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ITitleBarModel.as
@@ -28,7 +28,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public interface ITitleBarModel extends IBeadModel
 	{
         [Bindable("titleChange")]

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IToggleButtonModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IToggleButtonModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IToggleButtonModel.as
index d6dc58d..352087d 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IToggleButtonModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IToggleButtonModel.as
@@ -27,7 +27,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public interface IToggleButtonModel extends IBeadModel
 	{
         // TODO: Should extend ITextModel?  Or should it

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IValueToggleButtonModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IValueToggleButtonModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IValueToggleButtonModel.as
index 4c1f483..f776951 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IValueToggleButtonModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IValueToggleButtonModel.as
@@ -28,7 +28,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IValueToggleButtonModel extends IToggleButtonModel
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IViewport.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IViewport.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IViewport.as
index 9fd5b00..e87a1d6 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IViewport.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IViewport.as
@@ -26,7 +26,6 @@ package org.apache.flex.core
 	 * is specified by the IViewportModel, adding scrollbars or whatever scrolling
 	 * mechanism they want.
 	 */
-	COMPILE::AS3
     public interface IViewport extends IBead
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
index 328e2eb..6de0cb8 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
@@ -26,7 +26,6 @@ package org.apache.flex.core
      * The ViewportModel caches the offsets required to compute the size
      * of the Viewport.
 	 */
-	COMPILE::AS3
 	public interface IViewportModel extends IBead
 	{	
 		/**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as
index 3dbecce..ba70e65 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as
@@ -39,7 +39,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public class ItemRendererClassFactory extends Strand implements IItemRendererClassFactory, IDocument, IBead
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/MXMLDragInitiator.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/MXMLDragInitiator.as b/frameworks/projects/Core/as/src/org/apache/flex/core/MXMLDragInitiator.as
index dd82023..cb20f01 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/MXMLDragInitiator.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/MXMLDragInitiator.as
@@ -53,7 +53,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public class MXMLDragInitiator extends EventDispatcher implements IBead, IDragInitiator
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleStatesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleStatesImpl.as b/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleStatesImpl.as
index d72bd97..4ccddd1 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleStatesImpl.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleStatesImpl.as
@@ -43,7 +43,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public class SimpleStatesImpl extends EventDispatcher implements IStatesImpl, IBead
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleValuesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleValuesImpl.as b/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleValuesImpl.as
index b567300..527f59e 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleValuesImpl.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleValuesImpl.as
@@ -32,7 +32,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public class SimpleValuesImpl extends EventDispatcher implements IValuesImpl
 	{
 		public function SimpleValuesImpl()
@@ -179,5 +178,11 @@ package org.apache.flex.core
                 values[p] = values[p];
         }
         
+        COMPILE::JS
+        public function applyStyles(thisObject:IUIBase, styles:Object):void
+        {
+            // to do or not needed?
+        }
+
     }
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/Strand.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/Strand.as b/frameworks/projects/Core/as/src/org/apache/flex/core/Strand.as
index b02cea7..b0318d6 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/Strand.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/Strand.as
@@ -30,7 +30,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public class Strand extends EventDispatcher implements IStrand
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/core/WrappedHTMLElement.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/WrappedHTMLElement.as b/frameworks/projects/Core/as/src/org/apache/flex/core/WrappedHTMLElement.as
index c160bcb..e765e01 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/WrappedHTMLElement.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/WrappedHTMLElement.as
@@ -1,9 +1,5 @@
 package org.apache.flex.core
 {
-    COMPILE::JS
-    {
-    }
-
 	COMPILE::JS
 	public class WrappedHTMLElement extends HTMLElement
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/events/CustomEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/events/CustomEvent.as b/frameworks/projects/Core/as/src/org/apache/flex/events/CustomEvent.as
index 880e860..a7921df 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/events/CustomEvent.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/events/CustomEvent.as
@@ -30,7 +30,6 @@ package org.apache.flex.events
 	 * @playerversion AIR 2.6
 	 * @productversion FlexJS 0.0
 	 */
-	COMPILE::AS3
 	public class CustomEvent extends Event
 	{
 
@@ -52,7 +51,14 @@ package org.apache.flex.events
 		 */
 		public function CustomEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false)
 		{
-			super(type, bubbles, cancelable);
+            COMPILE::AS3
+            {
+                super(type, bubbles, cancelable);                    
+            }
+            COMPILE::JS
+            {
+                super(type);
+            }
 		}
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/events/IEventDispatcher.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/events/IEventDispatcher.as b/frameworks/projects/Core/as/src/org/apache/flex/events/IEventDispatcher.as
index ec35569..6d8c684 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/events/IEventDispatcher.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/events/IEventDispatcher.as
@@ -44,5 +44,6 @@ package org.apache.flex.events
         function addEventListener(type:String, handler:Function, opt_capture:Boolean = false, opt_handlerScope:Object = null):void;
         function removeEventListener(type:String, handler:Function, opt_capture:Boolean = false, opt_handlerScope:Object = null):void;
         //function hasEventListener(type:String):Boolean;
+        function dispatchEvent(event:Object):Boolean;
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/events/MouseEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/events/MouseEvent.as b/frameworks/projects/Core/as/src/org/apache/flex/events/MouseEvent.as
index 9a17235..a15971e 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/events/MouseEvent.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/events/MouseEvent.as
@@ -18,7 +18,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.events
 {	
-    import flash.events.MouseEvent;
+    COMPILE::AS3
+    {
+        import flash.events.MouseEvent;
+    }
     
     import org.apache.flex.core.IUIBase;
     import org.apache.flex.geom.Point;
@@ -32,7 +35,6 @@ package org.apache.flex.events
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
 	 */
-    COMPILE::AS3
 	public class MouseEvent extends Event
 	{
 		public static const MOUSE_DOWN:String = "mouseDown";
@@ -64,7 +66,14 @@ package org.apache.flex.events
                                    commandKey:Boolean = false, controlKey:Boolean = false, 
                                    clickCount:int = 0)
 		{
-			super(type, bubbles, cancelable);
+            COMPILE::AS3
+            {
+                super(type, bubbles, cancelable);                    
+            }
+            COMPILE::JS
+            {
+                super(type);
+            }
             this.localX = localX;
             this.localY = localY;
             this.relatedObject = relatedObject;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/events/utils/MouseUtils.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/events/utils/MouseUtils.as b/frameworks/projects/Core/as/src/org/apache/flex/events/utils/MouseUtils.as
index c58122b..5dbc934 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/events/utils/MouseUtils.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/events/utils/MouseUtils.as
@@ -29,7 +29,6 @@ package org.apache.flex.events.utils
 	 *  @playerversion AIR 2.6
 	 *  @productversion FlexJS 0.0
 	 */
-	COMPILE::AS3
 	public class MouseUtils
 	{
 		public function MouseUtils()

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/geom/Point.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/geom/Point.as b/frameworks/projects/Core/as/src/org/apache/flex/geom/Point.as
index 462c3b1..46d4464 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/geom/Point.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/geom/Point.as
@@ -18,7 +18,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.geom
 {
-import flash.geom.Point;
+COMPILE::AS3
+{
+    import flash.geom.Point;
+}
 
 /**
  *  The Point class is a utility class for holding x and y values, not that you
@@ -40,4 +43,30 @@ public class Point extends flash.geom.Point
         super(x, y);
     }
 }
+
+/**
+ *  The Point class is a utility class for holding x and y values, not that you
+ *  can't use it to hold a width and height value.  
+ *  
+ *  The ActionScript version simply wraps flash.geom.Point to enable cross
+ *  compilation.
+ * 
+ *  @langversion 3.0
+ *  @playerversion Flash 10.2
+ *  @playerversion AIR 2.6
+ *  @productversion FlexJS 0.0
+ */
+COMPILE::JS
+public class Point
+{
+    public function Point(x:Number = 0, y:Number = 0)
+    {
+        this.x = x;
+        this.y = y;
+    }
+    
+    public var x:Number;
+    public var y:Number;
+}
+
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/geom/Rectangle.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/geom/Rectangle.as b/frameworks/projects/Core/as/src/org/apache/flex/geom/Rectangle.as
index 3fb403d..a68c080 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/geom/Rectangle.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/geom/Rectangle.as
@@ -18,7 +18,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.geom
 {
-import flash.geom.Rectangle;
+COMPILE::AS3
+{
+    import flash.geom.Rectangle;
+}
 
 /**
  *  The Rectangle class is a utility class for holding four coordinates of
@@ -40,4 +43,53 @@ public class Rectangle extends flash.geom.Rectangle
         super(x, y, width, height);
     }
 }
+
+/**
+ *  The Rectangle class is a utility class for holding four coordinates of
+ *  a rectangle
+ *  
+ *  The ActionScript version simply wraps flash.geom.Rectangle to enable cross
+ *  compilation.
+ * 
+ *  @langversion 3.0
+ *  @playerversion Flash 10.2
+ *  @playerversion AIR 2.6
+ *  @productversion FlexJS 0.0
+ */
+COMPILE::JS
+public class Rectangle
+{
+    public function Rectangle(x:Number = 0, y:Number = 0, width:Number = 0, height:Number = 0)
+    {
+        left = x;
+        top = y;
+        this.width = width;
+        this.height = height;
+    }
+    
+    public var left:Number;
+    public var top:Number;
+    public var width:Number;
+    public var height:Number;
+
+    public function get right():Number
+    {
+        return left + width;
+    }
+    public function set right(value:Number):void
+    {
+        width = value - left;
+    }
+    
+    public function get bottom():Number
+    {
+        return top + height;
+    }
+    public function set bottom(value:Number):void
+    {
+        height = value - top;
+    }
+}
+
+
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/utils/BinaryData.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/utils/BinaryData.as b/frameworks/projects/Core/as/src/org/apache/flex/utils/BinaryData.as
index 5feb0dc..2d6f6ed 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/utils/BinaryData.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/utils/BinaryData.as
@@ -18,7 +18,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.utils
 {
-import flash.utils.ByteArray;
+COMPILE::AS3
+{
+    import flash.utils.ByteArray;
+}
 
     
 /**
@@ -31,7 +34,6 @@ import flash.utils.ByteArray;
  *  @playerversion AIR 2.6
  *  @productversion FlexJS 0.0
  */
-COMPILE::AS3
 public class BinaryData
 {
     /**
@@ -47,8 +49,15 @@ public class BinaryData
 		
 	}
 	
+    COMPILE::AS3
 	private var ba:ByteArray = new ByteArray();
 	
+    COMPILE::JS
+    private var ba:ArrayBuffer = new ArrayBuffer(0);
+    
+    COMPILE::JS
+    private var _position:int = 0;
+    
 	/**
 	 * Get the platform-specific data for sending.
 	 * Generally only used by the network services.
@@ -73,7 +82,20 @@ public class BinaryData
      */
 	public function writeByte(byte:int):void
 	{
-		ba.writeByte(byte);
+        COMPILE::AS3
+        {
+            ba.writeByte(byte);                
+        }
+        COMPILE::JS
+        {
+            var view:Int8Array;
+            
+            growBuffer(1);
+            
+            view = new Int8Array(ba, _position, 1);
+            view[0] = byte;
+            _position++;
+        }
 	}
 	
     /**
@@ -86,7 +108,20 @@ public class BinaryData
      */
 	public function writeShort(short:int):void
 	{
-		ba.writeShort(short);
+        COMPILE::AS3
+        {
+            ba.writeShort(short);                
+        }
+        COMPILE::JS
+        {
+            var view:Int16Array;
+            
+            growBuffer(2);
+            
+            view = new Int16Array(ba, _position, 1);
+            view[0] = short;
+            _position += 2;
+        }
 	}
 	
     /**
@@ -99,7 +134,20 @@ public class BinaryData
      */
 	public function writeUnsignedInt(unsigned:uint):void
 	{
-		ba.writeUnsignedInt(unsigned);
+        COMPILE::AS3
+        {
+            ba.writeUnsignedInt(unsigned);                
+        }
+        COMPILE::JS
+        {
+            var view:Uint32Array;
+            
+            growBuffer(4);
+            
+            view = new Uint32Array(ba, _position, 1);
+            view[0] = unsigned;
+            _position += 4;
+        }
 	}
 
     /**
@@ -112,7 +160,20 @@ public class BinaryData
      */
 	public function writeInt(integer:uint):void
 	{
-		ba.writeInt(integer);
+        COMPILE::AS3
+        {
+            ba.writeInt(integer);                
+        }
+        COMPILE::JS
+        {
+            var view:Int32Array;
+            
+            growBuffer(4);
+            
+            view = new Int32Array(ba, _position, 1);
+            view[0] = integer;
+            _position += 4;
+        }
 	}
 
     /**
@@ -125,7 +186,18 @@ public class BinaryData
      */
 	public function readByte():int
 	{
-		return ba.readByte();
+        COMPILE::AS3
+        {
+            return ba.readByte();                
+        }
+        COMPILE::JS
+        {
+            var view:Int8Array;
+            
+            view = new Int8Array(ba, _position, 1);
+            _position++;
+            return view[0];
+        }
 	}
 	
     /**
@@ -138,7 +210,18 @@ public class BinaryData
      */
 	public function readShort():int
 	{
-		return ba.readShort();
+        COMPILE::AS3
+        {
+            return ba.readShort();                
+        }
+        COMPILE::JS
+        {
+            var view:Int16Array;
+            
+            view = new Int16Array(ba, _position, 1);
+            _position += 2;
+            return view[0];
+        }
 	}
 	
     /**
@@ -151,7 +234,18 @@ public class BinaryData
      */
 	public function readUnsignedInt():uint
 	{
-		return ba.readUnsignedInt();
+        COMPILE::AS3
+        {
+            return ba.readUnsignedInt();                
+        }
+        COMPILE::JS
+        {
+            var view:Uint32Array;
+            
+            view = new Uint32Array(ba, _position, 1);
+            _position += 4;
+            return view[0];
+        }
 	}
 	
     /**
@@ -164,7 +258,18 @@ public class BinaryData
      */
     public function readInt():int
 	{
-		return ba.readInt();
+        COMPILE::AS3
+        {
+            return ba.readInt();                
+        }
+        COMPILE::JS
+        {
+            var view:Int32Array;
+            
+            view = new Int32Array(ba, _position, 1);
+            _position += 4;
+            return view[0];
+        }
 	}
 
     /**
@@ -177,7 +282,14 @@ public class BinaryData
      */
 	public function get length():int
 	{
-		return ba.length;
+        COMPILE::AS3
+        {
+            return ba.length;                
+        }
+        COMPILE::JS
+        {
+            return ba.byteLength;
+        }
 	}
 	
     /**
@@ -190,7 +302,14 @@ public class BinaryData
      */
 	public function get bytesAvailable():int
 	{
-		return ba.bytesAvailable;
+        COMPILE::AS3
+        {
+            return ba.bytesAvailable;                
+        }
+        COMPILE::JS
+        {
+            return ba.byteLength - position;
+        }
 	}
 
     /**
@@ -203,7 +322,14 @@ public class BinaryData
      */
 	public function get position():int
 	{
-		return ba.position;
+        COMPILE::AS3
+        {
+            return ba.position;                
+        }
+        COMPILE::JS
+        {
+            return _position;
+        }
 	}
 	
     /**
@@ -211,7 +337,14 @@ public class BinaryData
      */
 	public function set position(value:int):void
 	{
-		ba.position = value;
+        COMPILE::AS3
+        {
+            ba.position = value;
+        }
+        COMPILE::JS
+        {
+            _position = value;
+        }
 	}
 	
     /**
@@ -232,6 +365,27 @@ public class BinaryData
 	public function growBuffer(extra:int):void
 	{
 		// no need to do anything in AS
+        COMPILE::JS
+        {
+            var newBuffer:ArrayBuffer;
+            var newView:Int8Array;
+            var view:Int8Array;
+            var i:int;
+            var n:int;
+            
+            if (_position >= ba.byteLength)
+            {
+                n = ba.byteLength;
+                newBuffer = new ArrayBuffer(n + extra);
+                newView = new Int8Array(newBuffer, 0, n);
+                view = new Int8Array(ba, 0, n);
+                for (i = 0; i < n; i++)
+                {
+                    newView[i] = view[i];
+                }
+                ba = newBuffer;
+            }
+        }
 	}
 }
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/utils/EffectTimer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/utils/EffectTimer.as b/frameworks/projects/Core/as/src/org/apache/flex/utils/EffectTimer.as
index 020919d..7accf42 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/utils/EffectTimer.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/utils/EffectTimer.as
@@ -18,11 +18,18 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.utils
 {
-import flash.events.EventDispatcher;
-import flash.events.TimerEvent;
-import flash.utils.Timer;
-import flash.utils.getTimer;
-
+COMPILE::AS3
+{
+    import flash.events.EventDispatcher;
+    import flash.events.TimerEvent;
+    import flash.utils.Timer;
+    import flash.utils.getTimer;
+}
+COMPILE::JS
+{
+    import goog.bind;
+    import org.apache.flex.events.EventDispatcher;
+}
 import org.apache.flex.core.IEffectTimer;
 import org.apache.flex.core.ValuesManager;
 import org.apache.flex.events.ValueEvent;
@@ -50,8 +57,8 @@ import org.apache.flex.events.ValueEvent;
  *  @playerversion Flash 10.2
  *  @playerversion AIR 2.6
  *  @productversion FlexJS 0.0
+ *  @flexjsignoreimport goog.bind
  */
-COMPILE::AS3
 public class EffectTimer extends EventDispatcher implements IEffectTimer
 {
     /**
@@ -69,28 +76,63 @@ public class EffectTimer extends EventDispatcher implements IEffectTimer
      */
     public function EffectTimer()
     {
-		var interval:int = ValuesManager.valuesImpl.getValue(this, "effectTimerInterval");
-		timer = new flash.utils.Timer(interval);
-		timer.addEventListener("timer", timerHandler);
+		interval = ValuesManager.valuesImpl.getValue(this, "effectTimerInterval");
+        COMPILE::AS3
+        {
+    		timer = new flash.utils.Timer(interval);
+    		timer.addEventListener("timer", timerHandler);
+        }
     }
 
+    private var interval:int;
+    
+    COMPILE::AS3
 	private var timer:flash.utils.Timer;
+    
+    COMPILE::JS
+    private var timerInterval:Number;
 	
 	public function start():int
 	{
-		timer.start();
-		return getTimer();
+        COMPILE::AS3
+        {
+    		timer.start();
+    		return getTimer();
+        }
+        COMPILE::JS
+        {
+            timerInterval =
+                setInterval(goog.bind(timerHandler, this), interval);
+            var d:Date = new Date();
+            return d.getTime();
+        }
 	}
 	
 	public function stop():void
 	{
-		timer.stop();
+        COMPILE::AS3
+        {
+    		timer.stop();
+        }
+        COMPILE::JS
+        {
+            clearInterval(timerInterval);
+            timerInterval = -1;
+        }
 	}
 	
+    COMPILE::AS3
 	private function timerHandler(event:flash.events.TimerEvent):void
 	{
 		event.updateAfterEvent();
 		dispatchEvent(new ValueEvent("update", false, false, getTimer()));
 	}
+    
+    COMPILE::JS
+    private function timerHandler():void
+    {
+        var d:Date = new Date();
+        dispatchEvent(new org.apache.flex.events.ValueEvent('update', d.getTime()));
+    }
 }
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/utils/MixinManager.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/utils/MixinManager.as b/frameworks/projects/Core/as/src/org/apache/flex/utils/MixinManager.as
index f57dc9f..9ad450a 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/utils/MixinManager.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/utils/MixinManager.as
@@ -35,7 +35,6 @@ import org.apache.flex.core.IStrand;
  *  @playerversion AIR 2.6
  *  @productversion FlexJS 0.0
  */
-COMPILE::AS3
 public class MixinManager implements IBead
 {
     /**
@@ -60,20 +59,41 @@ public class MixinManager implements IBead
      *  @playerversion Flash 10.2
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
+     *  @flexjsignorecoercion Array
+     *  @flexjsignorecoercion org.apache.flex.core.IFlexInfo
+     *  @flexjsignoreimport org.apache.flex.core.IFlexInfo
      */
     public function set strand(value:IStrand):void
     {
         _strand = value;
         
-        var app:IFlexInfo = value as IFlexInfo;
-        if (app)
+        COMPILE::AS3
         {
-            var mixins:Array = app.info().mixins;
-            var domain:ApplicationDomain = app.info().currentDomain;
-            for each (var mixin:String in mixins)
+            var app:IFlexInfo = value as IFlexInfo;
+            if (app)
             {
-                var mixinClass:Object = domain.getDefinition(mixin); 
-                mixinClass.init(value);
+                var mixins:Array = app.info().mixins;
+                var domain:ApplicationDomain = app.info().currentDomain;
+                for each (var mixin:String in mixins)
+                {
+                    var mixinClass:Object = domain.getDefinition(mixin); 
+                    mixinClass.init(value);
+                }
+            }
+        }
+        COMPILE::JS
+        {
+            var app:IFlexInfo = value as IFlexInfo;
+            if (app) 
+            {
+                var mixins:Array = app.info()['mixins'] as Array;
+                if (mixins) {
+                    var n:int = mixins.length;
+                    for (var i:int = 0; i < n; i++) 
+                    {
+                        mixins[i].init(value);
+                    }
+                }
             }
         }
     }    

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/utils/PointUtils.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/utils/PointUtils.as b/frameworks/projects/Core/as/src/org/apache/flex/utils/PointUtils.as
index e39e029..09c88b4 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/utils/PointUtils.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/utils/PointUtils.as
@@ -18,10 +18,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.utils
 {
-    import flash.display.DisplayObject;
-    import flash.geom.Point;
+    COMPILE::AS3
+    {
+        import flash.display.DisplayObject;
+        import flash.geom.Point;
+    }
     
-	import org.apache.flex.core.IUIBase;
+    import org.apache.flex.core.IUIBase;
     import org.apache.flex.geom.Point;
 
 	/**
@@ -33,7 +36,6 @@ package org.apache.flex.utils
 	 *  @playerversion AIR 2.6
 	 *  @productversion FlexJS 0.0
 	 */
-	COMPILE::AS3
 	public class PointUtils
 	{
 		/**
@@ -54,11 +56,35 @@ package org.apache.flex.utils
 		 *  @playerversion Flash 10.2
 		 *  @playerversion AIR 2.6
 		 *  @productversion FlexJS 0.0
+         *  @flexjsignorecoercion HTMLElement
 		 */
 		public static function globalToLocal( pt:org.apache.flex.geom.Point, local:Object ):org.apache.flex.geom.Point
 		{
-            var fpt:flash.geom.Point = DisplayObject(local).globalToLocal(pt);
-            return new org.apache.flex.geom.Point(fpt.x, fpt.y);
+            COMPILE::AS3
+            {
+                var fpt:flash.geom.Point = DisplayObject(local).globalToLocal(pt);
+                return new org.apache.flex.geom.Point(fpt.x, fpt.y);
+            }
+            COMPILE::JS
+            {
+                var x:Number = pt.x;
+                var y:Number = pt.y;
+                var element:HTMLElement = local.element as HTMLElement;
+                
+                do {
+                    x -= element.offsetLeft;
+                    y -= element.offsetTop;
+                    if (local.hasOwnProperty('parent')) {
+                        local = local.parent;
+                        element = local.element as HTMLElement;
+                    } else {
+                        element = null;
+                    }
+                }
+                while (element);
+                return new org.apache.flex.geom.Point(x, y);
+
+            }
 		}
 		
         /**
@@ -71,11 +97,29 @@ package org.apache.flex.utils
          *  @playerversion Flash 10.2
          *  @playerversion AIR 2.6
          *  @productversion FlexJS 0.0
+         *  @flexjsignorecoercion HTMLElement
          */
         public static function localToGlobal( pt:org.apache.flex.geom.Point, local:Object ):org.apache.flex.geom.Point
         {
-            var fpt:flash.geom.Point = DisplayObject(local).localToGlobal(pt);
-            return new org.apache.flex.geom.Point(fpt.x, fpt.y);
+            COMPILE::AS3
+            {
+                var fpt:flash.geom.Point = DisplayObject(local).localToGlobal(pt);
+                return new org.apache.flex.geom.Point(fpt.x, fpt.y);
+            }
+            COMPILE::JS
+            {
+                var x:Number = pt.x;
+                var y:Number = pt.y;
+                var element:HTMLElement = local.element as HTMLElement;
+                
+                do {
+                    x += element.offsetLeft;
+                    y += element.offsetTop;
+                    element = element.offsetParent as HTMLElement;
+                }
+                while (element);
+                return new org.apache.flex.geom.Point(x, y);
+            }
         }
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/utils/Timer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/utils/Timer.as b/frameworks/projects/Core/as/src/org/apache/flex/utils/Timer.as
index 9f462ef..b99a4d8 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/utils/Timer.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/utils/Timer.as
@@ -18,11 +18,23 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.utils
 {
-import flash.events.TimerEvent;
-import flash.utils.Timer;
+COMPILE::AS3
+{
+    import flash.events.TimerEvent;
+    import flash.utils.Timer;
+}
+COMPILE::JS
+{
+    import goog.bind;
+}
 
 import org.apache.flex.events.Event;
 
+COMPILE::JS
+{
+    import org.apache.flex.events.EventDispatcher;
+}
+
 //--------------------------------------
 //  Events
 //--------------------------------------
@@ -46,6 +58,7 @@ import org.apache.flex.events.Event;
  *  @playerversion Flash 10.2
  *  @playerversion AIR 2.6
  *  @productversion FlexJS 0.0
+ *  @flexjsignoreimport goog.bind
  */
 COMPILE::AS3
 public class Timer extends flash.utils.Timer
@@ -78,4 +91,63 @@ public class Timer extends flash.utils.Timer
 		}
 	}
 }
+
+COMPILE::JS
+public class Timer extends EventDispatcher
+{
+    /**
+     *  Constructor.
+     * 
+     *  @param delay The number of milliseconds 
+     *  to wait before dispatching the event.
+     *  @param repeatCount The number of times to dispatch
+     *  the event.  If 0, keep dispatching forever.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+    public function Timer(delay:Number, repeatCount:int = 0)
+    {
+        this.delay = delay;
+        this.repeatCount = repeatCount;
+    }
+    
+    public var delay:Number;
+    public var repeatCount:int;
+    
+    private var currentCount:int = 0;
+    
+    private var timerInterval:int = -1;
+    
+    public function reset():void
+    {
+        stop();
+        currentCount = 0;
+    }
+    
+    public function stop():void
+    {
+        clearInterval(timerInterval);
+        timerInterval = -1;
+    }
+    
+    public function start():void
+    {
+        timerInterval =
+            setInterval(goog.bind(timerHandler, this), delay);
+    }
+    
+    private function timerHandler():void
+    {
+        currentCount++;
+        if (repeatCount > 0 && currentCount >= repeatCount) {
+            stop();
+        }
+        
+        dispatchEvent(new Event('timer'));
+    }
+}
+
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/utils/UIUtils.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/utils/UIUtils.as b/frameworks/projects/Core/as/src/org/apache/flex/utils/UIUtils.as
index 57a0595..2e14e12 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/utils/UIUtils.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/utils/UIUtils.as
@@ -31,7 +31,6 @@ package org.apache.flex.utils
 	 *  @playerversion AIR 2.6
 	 *  @productversion FlexJS 0.0
 	 */
-	COMPILE::AS3
 	public class UIUtils
 	{
 		/**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/as/src/org/apache/flex/utils/ViewSourceContextMenuOption.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/utils/ViewSourceContextMenuOption.as b/frameworks/projects/Core/as/src/org/apache/flex/utils/ViewSourceContextMenuOption.as
index 23a1324..5a2469a 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/utils/ViewSourceContextMenuOption.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/utils/ViewSourceContextMenuOption.as
@@ -19,12 +19,15 @@
 package org.apache.flex.utils
 {
 
-import flash.display.InteractiveObject;
-import flash.events.ContextMenuEvent;
-import flash.net.URLRequest;
-import flash.net.navigateToURL;
-import flash.ui.ContextMenu;
-import flash.ui.ContextMenuItem;
+COMPILE::AS3
+{
+    import flash.display.InteractiveObject;
+    import flash.events.ContextMenuEvent;
+    import flash.net.URLRequest;
+    import flash.net.navigateToURL;
+    import flash.ui.ContextMenu;
+    import flash.ui.ContextMenuItem;
+}
 
 import org.apache.flex.core.IBead;
 import org.apache.flex.core.IStrand;
@@ -68,19 +71,23 @@ public class ViewSourceContextMenuOption implements IBead
 	{
 		_strand = value;
 		
-		var menuHost:InteractiveObject = InteractiveObject(value);
-		var cm:ContextMenu = ContextMenu(menuHost.contextMenu);
-		if (!cm)
-		{
-			cm = new ContextMenu();
-			menuHost.contextMenu = cm;
-		}
-		var cmi:ContextMenuItem = new ContextMenuItem("View Source...");
-		cm.hideBuiltInItems();
-		cm.customItems.push(cmi);
-		cmi.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, viewSource);
+        COMPILE::AS3
+        {
+    		var menuHost:InteractiveObject = InteractiveObject(value);
+    		var cm:ContextMenu = ContextMenu(menuHost.contextMenu);
+    		if (!cm)
+    		{
+    			cm = new ContextMenu();
+    			menuHost.contextMenu = cm;
+    		}
+    		var cmi:ContextMenuItem = new ContextMenuItem("View Source...");
+    		cm.hideBuiltInItems();
+    		cm.customItems.push(cmi);
+    		cmi.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, viewSource);
+        }
 	}
 	
+    COMPILE::AS3
 	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/1392924b/frameworks/projects/Core/as/tests/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/tests/build.xml b/frameworks/projects/Core/as/tests/build.xml
index 34c6700..9292522 100644
--- a/frameworks/projects/Core/as/tests/build.xml
+++ b/frameworks/projects/Core/as/tests/build.xml
@@ -99,6 +99,8 @@
             <jvmarg line="${mxmlc.jvm.args}"/>
             <arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
             <arg value="-debug" />
+            <arg value="-define=COMPILE::AS3,true" />
+            <arg value="-define=COMPILE::JS,false" />
             <arg value="-compiler.mxml.children-as-data" />
             <arg value="-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent" />
             <arg value="-compiler.binding-value-change-event-kind=org.apache.flex.events.ValueChangeEvent" />

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/asjs/src/org/apache/flex/core/BindableCSSStyles.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/asjs/src/org/apache/flex/core/BindableCSSStyles.as b/frameworks/projects/Core/asjs/src/org/apache/flex/core/BindableCSSStyles.as
index 53399ca..7137ade 100644
--- a/frameworks/projects/Core/asjs/src/org/apache/flex/core/BindableCSSStyles.as
+++ b/frameworks/projects/Core/asjs/src/org/apache/flex/core/BindableCSSStyles.as
@@ -31,7 +31,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public class BindableCSSStyles extends EventDispatcher
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridLayout.as b/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridLayout.as
index cf74612..c744ae6 100644
--- a/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridLayout.as
+++ b/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridLayout.as
@@ -28,7 +28,6 @@ package org.apache.flex.core
 	 *  @playerversion AIR 2.6
 	 *  @productversion FlexJS 0.0
 	 */
-	COMPILE::AS3
 	public interface IDataGridLayout extends IBeadLayout
 	{
 		/**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridModel.as b/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridModel.as
index 72eb394..e0948da 100644
--- a/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridModel.as
+++ b/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridModel.as
@@ -28,7 +28,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	COMPILE::AS3
 	public interface IDataGridModel extends ISelectionModel
 	{		
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridPresentationModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridPresentationModel.as b/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridPresentationModel.as
index 8fe7733..7307148 100644
--- a/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridPresentationModel.as
+++ b/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDataGridPresentationModel.as
@@ -29,7 +29,6 @@ package org.apache.flex.core
 	 *  @playerversion AIR 2.6
 	 *  @productversion FlexJS 0.0
 	 */
-	COMPILE::AS3
 	public interface IDataGridPresentationModel extends IListPresentationModel
 	{
 		/**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDateChooserModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDateChooserModel.as b/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDateChooserModel.as
index be337fc..7dea245 100644
--- a/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDateChooserModel.as
+++ b/frameworks/projects/Core/asjs/src/org/apache/flex/core/IDateChooserModel.as
@@ -28,7 +28,6 @@ package org.apache.flex.core
 	 *  @playerversion AIR 2.6
 	 *  @productversion FlexJS 0.0
 	 */
-	COMPILE::AS3
 	public interface IDateChooserModel extends IEventDispatcher, IBeadModel
 	{
 		/**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/asjs/src/org/apache/flex/core/ParentDocumentBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/asjs/src/org/apache/flex/core/ParentDocumentBead.as b/frameworks/projects/Core/asjs/src/org/apache/flex/core/ParentDocumentBead.as
index d466b5f..1b0b0e7 100644
--- a/frameworks/projects/Core/asjs/src/org/apache/flex/core/ParentDocumentBead.as
+++ b/frameworks/projects/Core/asjs/src/org/apache/flex/core/ParentDocumentBead.as
@@ -42,7 +42,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public class ParentDocumentBead extends EventDispatcher implements IBead
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/asjs/src/org/apache/flex/core/SimpleCSSStyles.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/asjs/src/org/apache/flex/core/SimpleCSSStyles.as b/frameworks/projects/Core/asjs/src/org/apache/flex/core/SimpleCSSStyles.as
index 8c67688..6e83b2d 100644
--- a/frameworks/projects/Core/asjs/src/org/apache/flex/core/SimpleCSSStyles.as
+++ b/frameworks/projects/Core/asjs/src/org/apache/flex/core/SimpleCSSStyles.as
@@ -30,7 +30,6 @@ package org.apache.flex.core
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-    COMPILE::AS3
 	public class SimpleCSSStyles 
 	{
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1392924b/frameworks/projects/Core/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/basic-manifest.xml b/frameworks/projects/Core/basic-manifest.xml
index 69dab36..c1842df 100644
--- a/frameworks/projects/Core/basic-manifest.xml
+++ b/frameworks/projects/Core/basic-manifest.xml
@@ -25,7 +25,6 @@
     <component id="SimpleCSSValuesImpl" class="org.apache.flex.core.SimpleCSSValuesImpl"/>
     <component id="CSSFontFaceBead" class="org.apache.flex.core.CSSFontFaceBead" />
     <component id="ViewBase" class="org.apache.flex.core.ViewBase"/>
-    <!-- temporarily remove these classes while we try to get Application to compile
     <component id="BrowserScroller" class="org.apache.flex.core.BrowserScroller"/>
     <component id="BrowserResizeHandler" class="org.apache.flex.core.BrowserResizeListener"/>
     <component id="SimpleValuesImpl" class="org.apache.flex.core.SimpleValuesImpl"/>
@@ -36,7 +35,6 @@
     <component id="SimpleCSSStyles" class="org.apache.flex.core.SimpleCSSStyles"/>
     <component id="ParentDocumentBead" class="org.apache.flex.core.ParentDocumentBead"/>
     <component id="MixinManager" class="org.apache.flex.utils.MixinManager" />
-     -->
     <component id="ViewSourceContextMenuOption" class="org.apache.flex.utils.ViewSourceContextMenuOption" />
     
     <component id="State" class="org.apache.flex.states.State"/>


Mime
View raw message