You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/04/18 06:17:28 UTC
[04/50] [abbrv] git commit: [flex-asjs] [refs/heads/dual] - Updated
"HTML" elements to use Group as their base class because it now contains MXML
support and does not produce nested structures and viewports.
Updated "HTML" elements to use Group as their base class because it now contains MXML support and does not produce nested structures and viewports.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4a89d4d7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4a89d4d7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4a89d4d7
Branch: refs/heads/dual
Commit: 4a89d4d7b5094af89d02d6c8a4b6688f65dc0ff4
Parents: 060a9c0
Author: Peter Ent <pe...@apache.org>
Authored: Sun Apr 2 14:29:17 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Sun Apr 2 14:29:17 2017 -0400
----------------------------------------------------------------------
.../main/flex/org/apache/flex/core/GroupBase.as | 81 --------------------
.../src/main/flex/org/apache/flex/html/A.as | 4 +-
.../src/main/flex/org/apache/flex/html/Div.as | 4 +-
.../src/main/flex/org/apache/flex/html/Li.as | 4 +-
.../src/main/flex/org/apache/flex/html/P.as | 4 +-
.../src/main/flex/org/apache/flex/html/Span.as | 4 +-
.../src/main/flex/org/apache/flex/html/Td.as | 4 +-
.../src/main/flex/org/apache/flex/html/Th.as | 4 +-
.../src/main/flex/org/apache/flex/html/Ul.as | 4 +-
.../org/apache/flex/html/beads/ContainerView.as | 6 +-
10 files changed, 13 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a89d4d7/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as
index 88c7899..565b2e4 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as
@@ -18,7 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.core
{
-// import org.apache.flex.core.IMXMLDocument;
import org.apache.flex.core.IContentViewHost;
import org.apache.flex.core.ILayoutParent;
import org.apache.flex.core.ILayoutHost;
@@ -63,12 +62,6 @@ package org.apache.flex.core
*/
[Event(name="childrenAdded", type="org.apache.flex.events.Event")]
- /**
- * The default property uses when additional MXML content appears within an element's
- * definition in an MXML file.
- */
-// [DefaultProperty("mxmlContent")]
-
/**
* The GroupBase class is the base class for most simple containers
* in FlexJS. It is usable as the root tag of MXML
@@ -117,31 +110,6 @@ package org.apache.flex.core
}
/**
- * @private
- */
-// override public function addedToParent():void
-// {
-// if (!_initialized)
-// {
-// // each MXML file can also have styles in fx:Style block
-// ValuesManager.valuesImpl.init(this);
-// }
-//
-// super.addedToParent();
-//
-// if (!_initialized)
-// {
-// MXMLDataInterpreter.generateMXMLInstances(_mxmlDocument, this, MXMLDescriptor);
-//
-// dispatchEvent(new Event("initBindings"));
-// dispatchEvent(new Event("initComplete"));
-// _initialized = true;
-//
-// childrenAdded();
-// }
-// }
-
- /**
* Returns the ILayoutHost which is its view. From ILayoutParent.
*
* @langversion 3.0
@@ -166,55 +134,6 @@ package org.apache.flex.core
{
return this;
}
-
-// private var _mxmlDescriptor:Array;
-// private var _mxmlDocument:Object = this;
-// private var _initialized:Boolean;
-
- /**
- * @copy org.apache.flex.core.Application#MXMLDescriptor
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
-// public function get MXMLDescriptor():Array
-// {
-// return _mxmlDescriptor;
-// }
-
- /**
- * @private
- */
-// public function setMXMLDescriptor(document:Object, value:Array):void
-// {
-// _mxmlDocument = document;
-// _mxmlDescriptor = value;
-// }
-
- /**
- * @copy org.apache.flex.core.Application#generateMXMLAttributes()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
-// public function generateMXMLAttributes(data:Array):void
-// {
-// MXMLDataInterpreter.generateMXMLProperties(this, data);
-// }
-
- /**
- * @copy org.apache.flex.core.ItemRendererClassFactory#mxmlContent
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
-// public var mxmlContent:Array;
private var _states:Array;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a89d4d7/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as
index 5f95235..fdb39b3 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as
@@ -18,8 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html
{
- import org.apache.flex.core.ContainerBase;
-
COMPILE::JS
{
import org.apache.flex.core.WrappedHTMLElement;
@@ -35,7 +33,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class A extends ContainerBase
+ public class A extends Group
{
/**
* constructor.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a89d4d7/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Div.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Div.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Div.as
index 5c95172..285a661 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Div.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Div.as
@@ -18,8 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html
{
- import org.apache.flex.core.ContainerBase;
-
COMPILE::JS
{
import org.apache.flex.core.WrappedHTMLElement;
@@ -35,7 +33,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class Div extends ContainerBase
+ public class Div extends Group
{
/**
* constructor.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a89d4d7/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Li.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Li.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Li.as
index 9b75887..90ea4ea 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Li.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Li.as
@@ -18,8 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html
{
- import org.apache.flex.core.ContainerBase;
-
COMPILE::JS
{
import org.apache.flex.core.WrappedHTMLElement;
@@ -35,7 +33,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class Li extends ContainerBase
+ public class Li extends Group
{
/**
* constructor.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a89d4d7/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/P.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/P.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/P.as
index 9cadcc7..b7530aa 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/P.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/P.as
@@ -18,8 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html
{
- import org.apache.flex.core.ContainerBase;
-
COMPILE::JS
{
import org.apache.flex.core.WrappedHTMLElement;
@@ -35,7 +33,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class P extends ContainerBase
+ public class P extends Group
{
/**
* constructor.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a89d4d7/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as
index 0bc8e3e..d3f025b 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as
@@ -18,8 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html
{
- import org.apache.flex.core.ContainerBase;
-
COMPILE::JS
{
import org.apache.flex.core.WrappedHTMLElement;
@@ -35,7 +33,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class Span extends ContainerBase
+ public class Span extends Group
{
/**
* constructor.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a89d4d7/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Td.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Td.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Td.as
index 8e1276e..3052a13 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Td.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Td.as
@@ -18,8 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html
{
- import org.apache.flex.core.ContainerBase;
-
COMPILE::JS
{
import org.apache.flex.core.WrappedHTMLElement;
@@ -35,7 +33,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class Td extends ContainerBase
+ public class Td extends Group
{
/**
* constructor.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a89d4d7/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Th.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Th.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Th.as
index 1a40439..cc7aedf 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Th.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Th.as
@@ -18,8 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html
{
- import org.apache.flex.core.ContainerBase;
-
COMPILE::JS
{
import org.apache.flex.core.WrappedHTMLElement;
@@ -35,7 +33,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class Th extends ContainerBase
+ public class Th extends Group
{
/**
* constructor.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a89d4d7/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Ul.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Ul.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Ul.as
index dfafbef..6c97f64 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Ul.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Ul.as
@@ -18,8 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html
{
- import org.apache.flex.core.ContainerBase;
-
COMPILE::JS
{
import org.apache.flex.core.WrappedHTMLElement;
@@ -35,7 +33,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class Ul extends ContainerBase
+ public class Ul extends Group
{
/**
* constructor.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a89d4d7/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as
index 36d285c..9d9fb9a 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as
@@ -365,7 +365,11 @@ package org.apache.flex.html.beads
*/
override public function get contentView():ILayoutView
{
- return viewport.contentView as ILayoutView;
+ if (viewport != null) {
+ return viewport.contentView as ILayoutView;
+ } else {
+ return host as ILayoutView;
+ }
}
/**