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 e5ad2c2 return Container to Basic
e5ad2c2 is described below
commit e5ad2c28edcbb759e037516138c89c1969b8de86
Author: Carlos Rovira <[email protected]>
AuthorDate: Sun May 6 12:22:51 2018 +0200
return Container to Basic
---
frameworks/projects/Basic/src/main/resources/basic-manifest.xml | 1 +
frameworks/projects/Core/src/main/resources/basic-manifest.xml | 3 +--
.../main/royale/org/apache/royale/core/beads/views/ContainerView.as | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index f133836..302c26e 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -24,6 +24,7 @@
<component id="Application" class="org.apache.royale.core.Application"/>
<component id="AirApplication"
class="org.apache.royale.core.AirApplication"/>
<component id="View" class="org.apache.royale.core.View"/>
+ <component id="Container" class="org.apache.royale.core.Container"/>
<component id="Button" class="org.apache.royale.html.Button"/>
<component id="CloseButton" class="org.apache.royale.html.CloseButton"/>
<component id="ButtonBar" class="org.apache.royale.html.ButtonBar"/>
diff --git a/frameworks/projects/Core/src/main/resources/basic-manifest.xml
b/frameworks/projects/Core/src/main/resources/basic-manifest.xml
index 234b4f7..a255761 100644
--- a/frameworks/projects/Core/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Core/src/main/resources/basic-manifest.xml
@@ -55,8 +55,7 @@
<component id="MXMLBeadView" class="org.apache.royale.core.MXMLBeadView"/>
<component id="LayoutChangeNotifier"
class="org.apache.royale.core.beads.layouts.LayoutChangeNotifier"/>
-
- <component id="Container" class="org.apache.royale.core.Container"/>
+
<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/Core/src/main/royale/org/apache/royale/core/beads/views/ContainerView.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/views/ContainerView.as
index d444432..44544ed 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/views/ContainerView.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/views/ContainerView.as
@@ -35,7 +35,6 @@ package org.apache.royale.core.beads.views
import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
import org.apache.royale.geom.Size;
- import org.apache.royale.core.Container;
import org.apache.royale.core.beads.models.ViewportModel;
import org.apache.royale.core.supportClasses.Border;
import org.apache.royale.core.supportClasses.Viewport;
--
To stop receiving notification emails like this one, please contact
[email protected].
