This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new f40eed1 Return Group to Core since is Core and HTML needs them.
f40eed1 is described below
commit f40eed1d7fddfc3123c8d0672ea83c77626d68ea
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Wed May 9 13:15:11 2018 +0200
Return Group to Core since is Core and HTML needs them.
---
.../src/main/royale/LabelPlayGround.mxml | 4 +
.../Basic/src/main/resources/basic-manifest.xml | 1 -
.../Core/src/main/resources/basic-manifest.xml | 1 +
.../main/royale/org/apache/royale/html/Group.as | 0
.../main/royale/org/apache/royale/jewel/Group.as | 101 +--------------------
5 files changed, 7 insertions(+), 100 deletions(-)
diff --git a/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
b/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
index 25ad5f6..c19189f 100644
--- a/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
@@ -40,5 +40,9 @@ limitations under the License.
<html:H3 text="Jewel Label"/>
<j:Label id="label" text="This is a Label" click="labelClick(event)"/>
+
+ <html:Div>
+ <html:Span text="Hello"/>
+ </html:Div>
</j:Group>
diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index 302c26e..dc79a5a 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -51,7 +51,6 @@
<component id="RadioButton" class="org.apache.royale.html.RadioButton"/>
<component id="ComboBox" class="org.apache.royale.html.ComboBox"/>
<component id="ComboBoxList"
class="org.apache.royale.html.supportClasses.ComboBoxList"/>
- <component id="Group" class="org.apache.royale.html.Group"/>
<component id="HGroup" class="org.apache.royale.html.HGroup"/>
<component id="VGroup" class="org.apache.royale.html.VGroup"/>
<component id="Accordion" class="org.apache.royale.html.Accordion"/>
diff --git a/frameworks/projects/Core/src/main/resources/basic-manifest.xml
b/frameworks/projects/Core/src/main/resources/basic-manifest.xml
index a255761..9c4a6a4 100644
--- a/frameworks/projects/Core/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Core/src/main/resources/basic-manifest.xml
@@ -56,6 +56,7 @@
<component id="MXMLBeadView" class="org.apache.royale.core.MXMLBeadView"/>
<component id="LayoutChangeNotifier"
class="org.apache.royale.core.beads.layouts.LayoutChangeNotifier"/>
+ <component id="Group" class="org.apache.royale.html.Group"/>
<component id="Viewport"
class="org.apache.royale.core.supportClasses.Viewport" />
<component id="Border"
class="org.apache.royale.core.supportClasses.Border"/>
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Group.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/Group.as
similarity index 100%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Group.as
rename to
frameworks/projects/Core/src/main/royale/org/apache/royale/html/Group.as
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
index 289fb67..0cfa316 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
@@ -18,28 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
- import org.apache.royale.core.IMXMLDocument;
- import org.apache.royale.core.GroupBase;
- import org.apache.royale.core.ValuesManager;
- import org.apache.royale.events.Event;
- import org.apache.royale.utils.MXMLDataInterpreter;
-
- /**
- * Indicates that the children of the container is have been added.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.3
- */
- [Event(name="childrenAdded", type="org.apache.royale.events.Event")]
-
- /**
- * The default property uses when additional MXML content appears
within an element's
- * definition in an MXML file.
- */
- [DefaultProperty("mxmlContent")]
-
+ import org.apache.royale.html.Group;
/**
* The Group class provides a light-weight container for visual elements.
By default
* the Group does not have a layout, allowing its children to be sized
and positioned
@@ -53,7 +32,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public class Group extends GroupBase implements IMXMLDocument
+ public class Group extends org.apache.royale.html.Group
{
/**
* Constructor.
@@ -68,81 +47,5 @@ package org.apache.royale.jewel
super();
typeNames = "";
}
-
- private var _mxmlDescriptor:Array;
- private var _mxmlDocument:Object = this;
- private var _initialized:Boolean;
-
- /**
- * @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;
-
- //?? why was this added here? childrenAdded();
//?? Is this needed since MXMLDataInterpreter will already have called it
- }
- }
-
- /**
- * @copy org.apache.royale.core.Application#MXMLDescriptor
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.3
- */
- public function get MXMLDescriptor():Array
- {
- return _mxmlDescriptor;
- }
-
- /**
- * @private
- */
- public function setMXMLDescriptor(document:Object,
value:Array):void
- {
- _mxmlDocument = document;
- _mxmlDescriptor = value;
- }
-
- /**
- * @copy
org.apache.royale.core.Application#generateMXMLAttributes()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.3
- */
- public function generateMXMLAttributes(data:Array):void
- {
- MXMLDataInterpreter.generateMXMLProperties(this, data);
- }
-
- /**
- * @copy
org.apache.royale.core.ItemRendererClassFactory#mxmlContent
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.3
- *
- * @royalesuppresspublicvarwarning
- */
- public var mxmlContent:Array;
}
}
--
To stop receiving notification emails like this one, please contact
carlosrov...@apache.org.
