You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2017/12/04 14:41:26 UTC
[royale-asjs] branch develop updated: Fixed RoyaleTeamPage_MDL
This is an automated email from the ASF dual-hosted git repository.
harbs 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 6ec2831 Fixed RoyaleTeamPage_MDL
6ec2831 is described below
commit 6ec28317fd08cf85a08e4de2cdcf98c24dcbdb41
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Dec 4 16:41:11 2017 +0200
Fixed RoyaleTeamPage_MDL
Added support for innerHTML in elements
Missing manifest changes
---
.../royale/itemRenderers/MemberItemRenderer.mxml | 3 +-
.../HTML/src/main/resources/html-manifest.xml | 7 ++++-
.../apache/royale/html/TextNodeContainerBase.as | 36 ++++++++++++++++++++++
.../royale/org/apache/royale/html/elements/Div.as | 24 ---------------
.../royale/org/apache/royale/html/elements/P.as | 24 ---------------
.../royale/org/apache/royale/html/elements/Pre.as | 24 ---------------
6 files changed, 44 insertions(+), 74 deletions(-)
diff --git a/examples/royale/RoyaleTeamPage_MDL/src/main/royale/itemRenderers/MemberItemRenderer.mxml b/examples/royale/RoyaleTeamPage_MDL/src/main/royale/itemRenderers/MemberItemRenderer.mxml
index af09182..f55b79a 100644
--- a/examples/royale/RoyaleTeamPage_MDL/src/main/royale/itemRenderers/MemberItemRenderer.mxml
+++ b/examples/royale/RoyaleTeamPage_MDL/src/main/royale/itemRenderers/MemberItemRenderer.mxml
@@ -19,6 +19,7 @@ limitations under the License.
-->
<mdl:ListItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:js="library://ns.apache.org/royale/basic"
+ xmlns:html="library://ns.apache.org/royale/html"
xmlns:mdl="library://ns.apache.org/royale/mdl"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:materialIcon="materialIcon.*" xmlns:fa="library://ns.apache.org/royale/fa">
@@ -53,7 +54,7 @@ limitations under the License.
<mdl:Card className="demo-card-wide" shadow="8">
<mdl:CardTitle>
<mdl:CardTitleText text="{member.name}"/>
- <js:H6 text="{member.apacheID}"></js:H6>
+ <html:H6 text="{member.apacheID}"></html:H6>
</mdl:CardTitle>
<mdl:CardSupportingText>
<js:Group className="cardRow1">
diff --git a/frameworks/projects/HTML/src/main/resources/html-manifest.xml b/frameworks/projects/HTML/src/main/resources/html-manifest.xml
index 5e02d0a..9579093 100644
--- a/frameworks/projects/HTML/src/main/resources/html-manifest.xml
+++ b/frameworks/projects/HTML/src/main/resources/html-manifest.xml
@@ -22,23 +22,28 @@
<componentPackage>
<component id="A" class="org.apache.royale.html.elements.A" />
+ <component id="Em" class="org.apache.royale.html.elements.Em" />
<component id="H1" class="org.apache.royale.html.elements.H1" />
<component id="H2" class="org.apache.royale.html.elements.H2" />
<component id="H3" class="org.apache.royale.html.elements.H3" />
<component id="H4" class="org.apache.royale.html.elements.H4" />
<component id="H5" class="org.apache.royale.html.elements.H5" />
<component id="H6" class="org.apache.royale.html.elements.H6" />
+ <component id="Hr" class="org.apache.royale.html.elements.Hr" />
<component id="Ol" class="org.apache.royale.html.elements.Ol" />
<component id="P" class="org.apache.royale.html.elements.P" />
<component id="Pre" class="org.apache.royale.html.elements.Pre" />
<component id="Code" class="org.apache.royale.html.elements.Code" />
+ <component id="S" class="org.apache.royale.html.elements.S" />
+ <component id="Select" class="org.apache.royale.html.elements.Select"/>
+ <component id="Small" class="org.apache.royale.html.elements.Small"/>
<component id="Span" class="org.apache.royale.html.elements.Span" />
+ <component id="Strong" class="org.apache.royale.html.elements.Strong" />
<component id="Div" class="org.apache.royale.html.elements.Div" />
<component id="I" class="org.apache.royale.html.elements.I" />
<component id="Input" class="org.apache.royale.html.elements.Input" />
<component id="Ul" class="org.apache.royale.html.elements.Ul" />
<component id="Li" class="org.apache.royale.html.elements.Li" />
- <component id="Select" class="org.apache.royale.html.elements.Select"/>
<component id="Option" class="org.apache.royale.html.elements.Option"/>
<component id="Td" class="org.apache.royale.html.elements.Td" />
diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/TextNodeContainerBase.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/TextNodeContainerBase.as
index d3bb6dc..64723a1 100644
--- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/TextNodeContainerBase.as
+++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/TextNodeContainerBase.as
@@ -59,5 +59,41 @@ package org.apache.royale.html
COMPILE::JS
protected var textNode:Text;
+
+ COMPILE::SWF
+ private var _html:String = "";
+
+ /**
+ * Sets the HTML of the Div
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9
+ */
+ public function get innerHTML():String
+ {
+ COMPILE::SWF
+ {
+ return _html;
+ }
+ COMPILE::JS
+ {
+ return element.innerHTML;
+ }
+ }
+ public function set innerHTML(value:String):void
+ {
+ COMPILE::SWF
+ {
+ _html = value;
+ }
+
+ COMPILE::JS
+ {
+ element.innerHTML = value;
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Div.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Div.as
index dac666e..fea78c6 100644
--- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Div.as
+++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Div.as
@@ -50,29 +50,5 @@ package org.apache.royale.html.elements
super();
}
- private var _html:String = "";
-
- /**
- * Sets the HTML of the Div
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9
- */
- public function get html():String
- {
- return _html;
- }
- public function set html(value:String):void
- {
- _html = value;
-
- COMPILE::JS
- {
- element.innerHTML = value;
- }
- }
-
}
}
diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/P.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/P.as
index e558083..af9590d 100644
--- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/P.as
+++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/P.as
@@ -50,30 +50,6 @@ package org.apache.royale.html.elements
super();
}
- private var _html:String = "";
-
- /**
- * Sets the HTML of the P
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9
- */
- public function get html():String
- {
- return _html;
- }
- public function set html(value:String):void
- {
- _html = value;
-
- COMPILE::JS
- {
- element.innerHTML = value;
- }
- }
-
COMPILE::JS
override protected function createElement():WrappedHTMLElement
{
diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Pre.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Pre.as
index edac1f1..4694ccc 100644
--- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Pre.as
+++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Pre.as
@@ -50,30 +50,6 @@ package org.apache.royale.html.elements
super();
}
- private var _html:String = "";
-
- /**
- * Sets the HTML of the Pre
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9
- */
- public function get html():String
- {
- return _html;
- }
- public function set html(value:String):void
- {
- _html = value;
-
- COMPILE::JS
- {
- element.innerHTML = value;
- }
- }
-
COMPILE::JS
override protected function createElement():WrappedHTMLElement
{
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].