flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-asjs] [refs/heads/develop] - switch to using WrappedHTMLElement after compiler fix found more issues. Probably should use an interface instead but this was less changes for now
Date Mon, 14 Nov 2016 22:25:53 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 869986a60 -> d555dbfd4


switch to using WrappedHTMLElement after compiler fix found more issues.  Probably should
use an interface instead but this was less changes for now


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

Branch: refs/heads/develop
Commit: d555dbfd49806d61bb070b1ccf0454642010d448
Parents: 869986a
Author: Alex Harui <aharui@apache.org>
Authored: Mon Nov 14 14:24:41 2016 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Nov 14 14:25:47 2016 -0800

----------------------------------------------------------------------
 .../apache/flex/core/IInitialViewApplication.as |  2 +-
 .../org/apache/flex/core/IRenderedObject.as     |  2 +-
 .../main/flex/org/apache/flex/core/UIBase.as    | 42 ++++++++++----------
 .../flex/org/apache/flex/svg/GraphicShape.as    |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d555dbfd/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as
index 47f44b8..fe2707c 100755
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as
@@ -62,7 +62,7 @@ COMPILE::SWF
          *  @private
          */
         COMPILE::JS
-		function get element():HTMLElement;
+		function get element():WrappedHTMLElement;
 
     }
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d555dbfd/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IRenderedObject.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IRenderedObject.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IRenderedObject.as
index 7ebee4f..dce73f0 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IRenderedObject.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IRenderedObject.as
@@ -38,7 +38,7 @@ COMPILE::SWF
         function get $displayObject():DisplayObject;
         
         COMPILE::JS
-        function get element():IFlexJSElement;
+        function get element():WrappedHTMLElement;
 
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d555dbfd/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
index 832c015..5ed9623 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
@@ -1327,30 +1327,30 @@ package org.apache.flex.core
         
         /**
          * @return The actual element to be parented.
-         * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+         * @flexjsignorecoercion org.apache.flex.core.IFlexJSElement
          */
+        COMPILE::SWF
         protected function createElement():IFlexJSElement
         {
-			COMPILE::SWF
-			{
-				element = new WrappedSprite();
-				element.flexjs_wrapper = this;
-				(element as InteractiveObject).doubleClickEnabled = true; // make JS and flash consistent
-                return element;
-			}
-			COMPILE::JS
-			{
-	            if (element == null)
-	                element = document.createElement('div') as WrappedHTMLElement;
-	            if (positioner == null)
-	                positioner = element;
-	            positioner.style.display = 'block';
-	            positioner.style.position = 'relative';
-	            
-	            element.flexjs_wrapper = this;
-	            
-	            return positioner;
-			}
+			element = new WrappedSprite();
+			element.flexjs_wrapper = this;
+			(element as InteractiveObject).doubleClickEnabled = true; // make JS and flash consistent
+            return element;
+        }
+        
+		COMPILE::JS
+        protected function createElement():WrappedHTMLElement
+        {
+            if (element == null)
+                element = document.createElement('div') as WrappedHTMLElement;
+            if (positioner == null)
+                positioner = element;
+            positioner.style.display = 'block';
+            positioner.style.position = 'relative';
+            
+            element.flexjs_wrapper = this;
+            
+            return positioner;
         }
         
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d555dbfd/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/GraphicShape.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/GraphicShape.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/GraphicShape.as
index 8f9e326..9cbced8 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/GraphicShape.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/GraphicShape.as
@@ -88,7 +88,7 @@ package org.apache.flex.svg
 		 * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
 		 */
 		COMPILE::JS
-		override protected function createElement():IFlexJSElement
+		override protected function createElement():WrappedHTMLElement
 		{
 			element = document.createElementNS('http://www.w3.org/2000/svg', 'svg') as WrappedHTMLElement;
 			element.flexjs_wrapper = this;


Mime
View raw message