The Footer in the MDLExample seems to have the layout messed up. I don’t think it was caused by this commit, but I’m not sure.
It used to look better. Could someone (Piotr or Carlos?) take a look? Harbs > On Nov 26, 2017, at 1:26 AM, [email protected] wrote: > > This is an automated email from the ASF dual-hosted git repository. > > harbs pushed a commit to branch feature/html-namespace > in repository https://gitbox.apache.org/repos/asf/royale-asjs.git > > > The following commit(s) were added to refs/heads/feature/html-namespace by > this push: > new b8214c3 Fixed html namespace refs > b8214c3 is described below > > commit b8214c3ae0f738e56ee4efb99d51b3457a4f5dd1 > Author: Harbs <[email protected]> > AuthorDate: Sun Nov 26 01:26:01 2017 +0200 > > Fixed html namespace refs > > The layout of part of this example seems to be messed up. Not sure what > caused it. > --- > .../src/main/royale/BlogTemplate.mxml | 95 +++++++++++----------- > .../royale/MDLExample/src/main/royale/Badges.mxml | 17 ++-- > .../royale/MDLExample/src/main/royale/Cards.mxml | 13 +-- > .../royale/MDLExample/src/main/royale/Grids.mxml | 47 +++++------ > .../royale/MDLExample/src/main/royale/Tabs.mxml | 39 ++++----- > .../MDLExample/src/main/royale/TestDialog.mxml | 3 +- > .../ActorNameAndIconListItemRenderer.mxml | 5 +- > .../itemRenderers/ActorNameListItemRenderer.mxml | 5 +- > .../AvatarAndActionListItemRenderer.mxml | 9 +- > .../AvatarAndActionThreeLineListItemRenderer.mxml | 19 +++-- > .../AvatarAndActionTwoLineListItemRenderer.mxml | 23 +++--- > .../itemRenderers/CustomListItemRenderer.mxml | 5 +- > .../FooterMiniLinkListItemRenderer.mxml | 3 +- > 13 files changed, 148 insertions(+), 135 deletions(-) > > diff --git a/examples/royale/MDLBlogExample/src/main/royale/BlogTemplate.mxml > b/examples/royale/MDLBlogExample/src/main/royale/BlogTemplate.mxml > index a753cf9..996f1ad 100644 > --- a/examples/royale/MDLBlogExample/src/main/royale/BlogTemplate.mxml > +++ b/examples/royale/MDLBlogExample/src/main/royale/BlogTemplate.mxml > @@ -20,6 +20,7 @@ limitations under the License. > <mdl:NavigationLayout xmlns:fx="http://ns.adobe.com/mxml/2009"; > xmlns:js="library://ns.apache.org/royale/basic" > xmlns:mdl="library://ns.apache.org/royale/mdl" > + xmlns:html="library://ns.apache.org/royale/html" > xmlns:models="models.*" > className="demo-blog has-drawer"> > > @@ -46,9 +47,9 @@ limitations under the License. > </mdl:beads> > <mdl:CardMedia> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[<h3><a href="entry.html">Coffee > Pic</a></h3>]]> > - </js:InnerHTML> > + </html:InnerHTML> > <mdl:MdlTextColor textColor="grey-50"/> > </mdl:beads> > </mdl:CardMedia> > @@ -56,14 +57,14 @@ limitations under the License. > <mdl:beads> > <mdl:MdlTextColor textColor="grey-600"/> > </mdl:beads> > - <js:Div className="minilogo"/> > - <js:Div> > + <html:Div className="minilogo"/> > + <html:Div> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[<strong>The Newist</strong><span>2 > days ago</span>]]> > - </js:InnerHTML> > + </html:InnerHTML> > </mdl:beads> > - </js:Div> > + </html:Div> > </mdl:CardSupportingText> > </mdl:Card> > > @@ -80,9 +81,9 @@ limitations under the License. > </mdl:MaterialIcon> > </mdl:materialIcon>--> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[<i class="material-icons > mdl-color-text--white" role="presentation">add</i><span > class="visuallyhidden">add</span>]]> > - </js:InnerHTML> > + </html:InnerHTML> > </mdl:beads> > </mdl:Button> > <mdl:CardMedia> > @@ -91,19 +92,19 @@ limitations under the License. > <mdl:MdlTextColor textColor="grey-600"/> > </mdl:beads> > <js:Image src="images/logo.png"/> > - <js:TextNode text="+1,337"/> > + <html:TextNode text="+1,337"/> > </mdl:CardMedia> > <mdl:CardSupportingText className="meta meta-fill"> > <mdl:beads> > <mdl:MdlTextColor textColor="grey-600"/> > </mdl:beads> > - <js:Div> > + <html:Div> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[<strong>The Newist</strong>]]> > - </js:InnerHTML> > + </html:InnerHTML> > </mdl:beads> > - </js:Div> > + </html:Div> > <mdl:Menu dataMdlFor="menubtn" ripple="true" > bottom="true" left="false" > labelField="label" > className="customMenuItemRenderer"> > <mdl:beads> > @@ -115,9 +116,9 @@ limitations under the License. > </mdl:Menu> > <mdl:Button id="menubtn" icon="true" ripple="true"> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[<i class="material-icons > mdl-color-text--white" role="presentation">more_vert</i><span > class="visuallyhidden">show menu</span>]]> > - </js:InnerHTML> > + </html:InnerHTML> > </mdl:beads> > </mdl:Button> > </mdl:CardSupportingText> > @@ -129,29 +130,29 @@ limitations under the License. > </mdl:beads> > <mdl:CardMedia> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[<h3><a href="entry.html">On the road > again</a></h3>]]> > - </js:InnerHTML> > + </html:InnerHTML> > <mdl:MdlTextColor textColor="grey-50"/> > </mdl:beads> > </mdl:CardMedia> > <mdl:CardSupportingText> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[Enim labore aliqua consequat ut quis ad > occaecat aliquip incididunt. Sunt nulla eu enim irure enim nostrud aliqua > consectetur ad consectetur sunt ullamco officia. Ex officia laborum et > consequat duis.]]> > - </js:InnerHTML> > + </html:InnerHTML> > <mdl:MdlTextColor textColor="grey-600"/> > </mdl:beads> > </mdl:CardSupportingText> > <mdl:CardSupportingText className="meta"> > - <js:Div className="minilogo"/> > - <js:Div> > + <html:Div className="minilogo"/> > + <html:Div> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[<strong>The Newist</strong><span>2 > days ago</span>]]> > - </js:InnerHTML> > + </html:InnerHTML> > </mdl:beads> > - </js:Div> > + </html:Div> > </mdl:CardSupportingText> > </mdl:Card> > > @@ -161,29 +162,29 @@ limitations under the License. > </mdl:beads> > <mdl:CardTitle> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[<h3 class="quote"><a href="entry.html">I > couldn’t take any pictures but this was an amazing thing…</a></h3>]]> > - </js:InnerHTML> > + </html:InnerHTML> > <mdl:MdlTextColor textColor="grey-50"/> > </mdl:beads> > </mdl:CardTitle> > <mdl:CardSupportingText> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[Enim labore aliqua consequat ut quis ad > occaecat aliquip incididunt. Sunt nulla eu enim irure enim nostrud aliqua > consectetur ad consectetur sunt ullamco officia. Ex officia laborum et > consequat duis.]]> > - </js:InnerHTML> > + </html:InnerHTML> > <mdl:MdlTextColor textColor="grey-600"/> > </mdl:beads> > </mdl:CardSupportingText> > <mdl:CardSupportingText className="meta"> > - <js:Div className="minilogo"/> > - <js:Div> > + <html:Div className="minilogo"/> > + <html:Div> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[<strong>The Newist</strong><span>2 > days ago</span>]]> > - </js:InnerHTML> > + </html:InnerHTML> > </mdl:beads> > - </js:Div> > + </html:Div> > </mdl:CardSupportingText> > </mdl:Card> > > @@ -193,29 +194,29 @@ limitations under the License. > </mdl:beads> > <mdl:CardMedia> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[<h3><a > href="entry.html">Shopping</a></h3>]]> > - </js:InnerHTML> > + </html:InnerHTML> > <mdl:MdlTextColor textColor="grey-50"/> > </mdl:beads> > </mdl:CardMedia> > <mdl:CardSupportingText> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[Enim labore aliqua consequat ut quis ad > occaecat aliquip incididunt. Sunt nulla eu enim irure enim nostrud aliqua > consectetur ad consectetur sunt ullamco officia. Ex officia laborum et > consequat duis.]]> > - </js:InnerHTML> > + </html:InnerHTML> > <mdl:MdlTextColor textColor="grey-600"/> > </mdl:beads> > </mdl:CardSupportingText> > <mdl:CardSupportingText className="meta"> > - <js:Div className="minilogo"/> > - <js:Div> > + <html:Div className="minilogo"/> > + <html:Div> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[<strong>The Newist</strong><span>2 > days ago</span>]]> > - </js:InnerHTML> > + </html:InnerHTML> > </mdl:beads> > - </js:Div> > + </html:Div> > </mdl:CardSupportingText> > </mdl:Card> > > @@ -226,17 +227,17 @@ limitations under the License. > <mdl:FooterLeftSection> > <mdl:FooterSocialButton className="social-btn > social-btn__twitter"> > <mdl:beads> > - <js:InnerHTML><![CDATA[<span > class="visuallyhidden">Twitter</span>]]></js:InnerHTML> > + <html:InnerHTML><![CDATA[<span > class="visuallyhidden">Twitter</span>]]></html:InnerHTML> > </mdl:beads> > </mdl:FooterSocialButton> > <mdl:FooterSocialButton className="social-btn > social-btn__blogger"> > <mdl:beads> > - <js:InnerHTML><![CDATA[<span > class="visuallyhidden">Facebook</span>]]></js:InnerHTML> > + <html:InnerHTML><![CDATA[<span > class="visuallyhidden">Facebook</span>]]></html:InnerHTML> > </mdl:beads> > </mdl:FooterSocialButton> > <mdl:FooterSocialButton className="social-btn > social-btn__gplus"> > <mdl:beads> > - <js:InnerHTML><![CDATA[<span > class="visuallyhidden">Google Plus</span>]]></js:InnerHTML> > + <html:InnerHTML><![CDATA[<span > class="visuallyhidden">Google Plus</span>]]></html:InnerHTML> > </mdl:beads> > </mdl:FooterSocialButton> > </mdl:FooterLeftSection> > @@ -244,7 +245,7 @@ limitations under the License. > <mdl:FooterRightSection> > <mdl:FooterSocialButton className="social-btn > social-btn__share"> > <mdl:beads> > - <js:InnerHTML><![CDATA[<i class="material-icons" > role="presentation">share</i><span > class="visuallyhidden">share</span>]]></js:InnerHTML> > + <html:InnerHTML><![CDATA[<i > class="material-icons" role="presentation">share</i><span > class="visuallyhidden">share</span>]]></html:InnerHTML> > </mdl:beads> > </mdl:FooterSocialButton> > </mdl:FooterRightSection> > diff --git a/examples/royale/MDLExample/src/main/royale/Badges.mxml > b/examples/royale/MDLExample/src/main/royale/Badges.mxml > index 0380f2c..4050474 100644 > --- a/examples/royale/MDLExample/src/main/royale/Badges.mxml > +++ b/examples/royale/MDLExample/src/main/royale/Badges.mxml > @@ -20,6 +20,7 @@ limitations under the License. > <mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"; > xmlns:js="library://ns.apache.org/royale/basic" > xmlns:mdl="library://ns.apache.org/royale/mdl" > + xmlns:html="library://ns.apache.org/royale/html" > xmlns="http://www.w3.org/1999/xhtml";> > > <fx:Script> > @@ -37,29 +38,29 @@ limitations under the License. > <js:AllCSSStyles maxWidth="500"/> > </mdl:style> > <mdl:GridCell column="12"> > - <js:Div style="color: rgba(0, 0, 0, 0.24);" > className="material-icons" text="{MaterialIconType.ACCOUNT_BOX}"> > + <html:Div style="color: rgba(0, 0, 0, 0.24);" > className="material-icons" text="{MaterialIconType.ACCOUNT_BOX}"> > <js:beads> > <mdl:Badge dataBadge="2" overlap="true"/> > </js:beads> > - </js:Div> > + </html:Div> > > - <js:Span text="Inbox" style="color: rgba(0, 0, 0, 0.24);" > className="mdl-badge"> > + <html:Span text="Inbox" style="color: rgba(0, 0, 0, 0.24);" > className="mdl-badge"> > <js:beads> > <mdl:Badge dataBadge="4"/> > </js:beads> > - </js:Span> > + </html:Span> > > - <js:A id="badge1" text="Badge Normal" > href="http://royale.apache.org";> > + <html:A id="badge1" text="Badge Normal" > href="http://royale.apache.org";> > <js:beads> > <mdl:Badge dataBadge="1"/> > </js:beads> > - </js:A> > + </html:A> > > - <js:A text="Badge No Background" href="http://royale.apache.org";> > + <html:A text="Badge No Background" > href="http://royale.apache.org";> > <js:beads> > <mdl:Badge dataBadge="5" noBackground="true"/> > </js:beads> > - </js:A> > + </html:A> > </mdl:GridCell> > </mdl:Grid> > > diff --git a/examples/royale/MDLExample/src/main/royale/Cards.mxml > b/examples/royale/MDLExample/src/main/royale/Cards.mxml > index 68646bc..f1374b0 100644 > --- a/examples/royale/MDLExample/src/main/royale/Cards.mxml > +++ b/examples/royale/MDLExample/src/main/royale/Cards.mxml > @@ -20,6 +20,7 @@ limitations under the License. > <mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"; > xmlns:js="library://ns.apache.org/royale/basic" > xmlns:mdl="library://ns.apache.org/royale/mdl" > + xmlns:html="library://ns.apache.org/royale/html" > xmlns="http://www.w3.org/1999/xhtml";> > > <fx:Script> > @@ -40,9 +41,9 @@ limitations under the License. > </mdl:CardTitle> > <mdl:CardSupportingText> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[Lorem ipsum dolor sit <b>amet</b>, > consectetur <i>adipiscing elit</i>. Mauris sagittis pellentesque lacus > eleifend lacinia...]]> > - </js:InnerHTML> > + </html:InnerHTML> > </mdl:beads> > </mdl:CardSupportingText> > <mdl:CardActions border="true"> > @@ -62,7 +63,7 @@ limitations under the License. > <mdl:CardTitleText text="Update"/> > </mdl:CardTitle> > <mdl:CardSupportingText> > - <js:TextNode text="Lorem ipsum dolor sit amet, > consectetur adipiscing elit. Aenan convallis."/> > + <html:TextNode text="Lorem ipsum dolor sit amet, > consectetur adipiscing elit. Aenan convallis."/> > </mdl:CardSupportingText> > <mdl:CardActions border="true"> > <mdl:Button colored="true" ripple="true" text="View > Updates"/> > @@ -72,7 +73,7 @@ limitations under the License. > <mdl:Card width="256" height="256" shadow="2" style="background: > url('assets/image_card.jpg') center / cover"> > <mdl:CardTitle expand="true"/> > <mdl:CardActions style="height: 52px; padding: 16px; > background: rgba(0, 0, 0, 0.2);"> > - <js:Span text="Image.jpg" style="color: #fff; font-size: > 14px; font-weight: 500;"/> > + <html:Span text="Image.jpg" style="color: #fff; > font-size: 14px; font-weight: 500;"/> > </mdl:CardActions> > </mdl:Card> > > @@ -80,9 +81,9 @@ limitations under the License. > <mdl:CardTitle expand="true"> > <mdl:CardTitleText text="Welcome"> > <mdl:beads> > - <js:InnerHTML> > + <html:InnerHTML> > <![CDATA[<h4>Featured event:<br>May 24, > 2016<br>7-11pm</h4>]]> > - </js:InnerHTML> > + </html:InnerHTML> > </mdl:beads> > </mdl:CardTitleText> > </mdl:CardTitle> > diff --git a/examples/royale/MDLExample/src/main/royale/Grids.mxml > b/examples/royale/MDLExample/src/main/royale/Grids.mxml > index 8f02c11..701d564 100644 > --- a/examples/royale/MDLExample/src/main/royale/Grids.mxml > +++ b/examples/royale/MDLExample/src/main/royale/Grids.mxml > @@ -20,33 +20,34 @@ limitations under the License. > <mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"; > xmlns:js="library://ns.apache.org/royale/basic" > xmlns:mdl="library://ns.apache.org/royale/mdl" > + xmlns:html="library://ns.apache.org/royale/html" > xmlns="http://www.w3.org/1999/xhtml";> > - <js:Div className="demo-grid"> > + <html:Div className="demo-grid"> > <mdl:Grid> > - <mdl:GridCell column="1"><mdl:beads><js:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="1"><mdl:beads><js:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="1"><mdl:beads><js:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="1"><mdl:beads><js:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="1"><mdl:beads><js:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="1"><mdl:beads><js:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="1"><mdl:beads><js:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="1"><mdl:beads><js:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="1"><mdl:beads><js:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="1"><mdl:beads><js:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="1"><mdl:beads><js:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="1"><mdl:beads><js:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="1"><mdl:beads><html:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="1"><mdl:beads><html:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="1"><mdl:beads><html:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="1"><mdl:beads><html:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="1"><mdl:beads><html:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="1"><mdl:beads><html:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="1"><mdl:beads><html:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="1"><mdl:beads><html:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="1"><mdl:beads><html:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="1"><mdl:beads><html:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="1"><mdl:beads><html:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="1"><mdl:beads><html:InnerHTML > text="1"/></mdl:beads></mdl:GridCell> > > - <mdl:GridCell column="4"><mdl:beads><js:InnerHTML > text="4"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="4"><mdl:beads><js:InnerHTML > text="4"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="4"><mdl:beads><js:InnerHTML > text="4"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="4"><mdl:beads><html:InnerHTML > text="4"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="4"><mdl:beads><html:InnerHTML > text="4"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="4"><mdl:beads><html:InnerHTML > text="4"/></mdl:beads></mdl:GridCell> > > - <mdl:GridCell column="6"><mdl:beads><js:InnerHTML > text="6"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="4"><mdl:beads><js:InnerHTML > text="4"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="2"><mdl:beads><js:InnerHTML > text="2"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="6"><mdl:beads><html:InnerHTML > text="6"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="4"><mdl:beads><html:InnerHTML > text="4"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="2"><mdl:beads><html:InnerHTML > text="2"/></mdl:beads></mdl:GridCell> > > - <mdl:GridCell column="6" > columnTablet="8"><mdl:beads><js:InnerHTML text="6 (8 > Tablet)"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="4" > columnTablet="6"><mdl:beads><js:InnerHTML text="4 (6 > Tablet)"/></mdl:beads></mdl:GridCell> > - <mdl:GridCell column="2" > columnPhone="4"><mdl:beads><js:InnerHTML text="2 (4 > Phone)"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="6" > columnTablet="8"><mdl:beads><html:InnerHTML text="6 (8 > Tablet)"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="4" > columnTablet="6"><mdl:beads><html:InnerHTML text="4 (6 > Tablet)"/></mdl:beads></mdl:GridCell> > + <mdl:GridCell column="2" > columnPhone="4"><mdl:beads><html:InnerHTML text="2 (4 > Phone)"/></mdl:beads></mdl:GridCell> > </mdl:Grid> > - </js:Div> > + </html:Div> > </mdl:TabBarPanel> > diff --git a/examples/royale/MDLExample/src/main/royale/Tabs.mxml > b/examples/royale/MDLExample/src/main/royale/Tabs.mxml > index 05bc694..c499b9b 100644 > --- a/examples/royale/MDLExample/src/main/royale/Tabs.mxml > +++ b/examples/royale/MDLExample/src/main/royale/Tabs.mxml > @@ -20,6 +20,7 @@ limitations under the License. > <mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"; > xmlns:js="library://ns.apache.org/royale/basic" > xmlns:mdl="library://ns.apache.org/royale/mdl" > + xmlns:html="library://ns.apache.org/royale/html" > xmlns="http://www.w3.org/1999/xhtml"; > xmlns:models="models.*"> > > @@ -53,31 +54,31 @@ limitations under the License. > > <mdl:NavigationLayoutContent> > <mdl:TabBarPanel id="starks_panel" isActive="true"> > - <js:Ul> > - <js:Li><mdl:beads><js:InnerHTML > text="Eddard"/></mdl:beads></js:Li> > - <js:Li><js:Label text="Catelyn"/></js:Li> > - <js:Li><js:Label text="Robb"/></js:Li> > - <js:Li><js:Label text="Sansa"/></js:Li> > - <js:Li><js:Label text="Brandon"/></js:Li> > - <js:Li><js:Label text="Arya"/></js:Li> > - <js:Li><js:Label text="Rickon"/></js:Li> > - </js:Ul> > + <html:Ul> > + <html:Li><mdl:beads><html:InnerHTML > text="Eddard"/></mdl:beads></html:Li> > + <html:Li><js:Label text="Catelyn"/></html:Li> > + <html:Li><js:Label text="Robb"/></html:Li> > + <html:Li><js:Label text="Sansa"/></html:Li> > + <html:Li><js:Label text="Brandon"/></html:Li> > + <html:Li><js:Label text="Arya"/></html:Li> > + <html:Li><js:Label text="Rickon"/></html:Li> > + </html:Ul> > </mdl:TabBarPanel> > > <mdl:TabBarPanel id="lannisters_panel"> > - <js:Ul> > - <js:Li><js:Label text="Tywin"/></js:Li> > - <js:Li><js:Label text="Cersei"/></js:Li> > - <js:Li><js:Label text="Jamie"/></js:Li> > - <js:Li><js:Label text="Tyrion"/></js:Li> > - </js:Ul> > + <html:Ul> > + <html:Li><js:Label text="Tywin"/></html:Li> > + <html:Li><js:Label text="Cersei"/></html:Li> > + <html:Li><js:Label text="Jamie"/></html:Li> > + <html:Li><js:Label text="Tyrion"/></html:Li> > + </html:Ul> > </mdl:TabBarPanel> > > <mdl:TabBarPanel id="targaryens_panel"> > - <js:Ul> > - <js:Li><js:Label text="Viserys"/></js:Li> > - <js:Li><js:Label text="Daenerys"/></js:Li> > - </js:Ul> > + <html:Ul> > + <html:Li><js:Label text="Viserys"/></html:Li> > + <html:Li><js:Label text="Daenerys"/></html:Li> > + </html:Ul> > </mdl:TabBarPanel> > </mdl:NavigationLayoutContent> > </mdl:NavigationLayout> > diff --git a/examples/royale/MDLExample/src/main/royale/TestDialog.mxml > b/examples/royale/MDLExample/src/main/royale/TestDialog.mxml > index f5209dc..542e2a6 100644 > --- a/examples/royale/MDLExample/src/main/royale/TestDialog.mxml > +++ b/examples/royale/MDLExample/src/main/royale/TestDialog.mxml > @@ -20,12 +20,13 @@ limitations under the License. > <mdl:Dialog xmlns:fx="http://ns.adobe.com/mxml/2009"; > xmlns:js="library://ns.apache.org/royale/basic" > xmlns:mdl="library://ns.apache.org/royale/mdl" > + xmlns:html="library://ns.apache.org/royale/html" > xmlns="http://www.w3.org/1999/xhtml";> > > <mdl:DialogTitle text="Allow data collection?"/> > > <mdl:DialogContent> > - <js:P text="This is an example of the Material Design Lite dialog > component. Please use responsibly."/> > + <html:P text="This is an example of the Material Design Lite dialog > component. Please use responsibly."/> > </mdl:DialogContent> > > <mdl:DialogActions> > diff --git > a/examples/royale/MDLExample/src/main/royale/itemRenderers/ActorNameAndIconListItemRenderer.mxml > > b/examples/royale/MDLExample/src/main/royale/itemRenderers/ActorNameAndIconListItemRenderer.mxml > index 0e7384d..b2ff1f4 100644 > --- > a/examples/royale/MDLExample/src/main/royale/itemRenderers/ActorNameAndIconListItemRenderer.mxml > +++ > b/examples/royale/MDLExample/src/main/royale/itemRenderers/ActorNameAndIconListItemRenderer.mxml > @@ -20,6 +20,7 @@ limitations under the License. > <mdl:ListItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"; > xmlns:js="library://ns.apache.org/royale/basic" > xmlns:mdl="library://ns.apache.org/royale/mdl" > + xmlns:html="library://ns.apache.org/royale/html" > xmlns="http://www.w3.org/1999/xhtml";> > > <fx:Script> > @@ -40,12 +41,12 @@ limitations under the License. > <js:ItemRendererDataBinding /> > </mdl:beads> > > - <js:Span text="{actor.actorName}"> > + <html:Span text="{actor.actorName}"> > <js:beads> > <mdl:ListItemPrimaryContent/> > </js:beads> > <mdl:MaterialIcon text="{MaterialIconType.PERSON}" > listItemIcon="true"/> > - </js:Span> > + </html:Span> > > </mdl:ListItemRenderer> > > diff --git > a/examples/royale/MDLExample/src/main/royale/itemRenderers/ActorNameListItemRenderer.mxml > > b/examples/royale/MDLExample/src/main/royale/itemRenderers/ActorNameListItemRenderer.mxml > index c546323..4169dcf 100644 > --- > a/examples/royale/MDLExample/src/main/royale/itemRenderers/ActorNameListItemRenderer.mxml > +++ > b/examples/royale/MDLExample/src/main/royale/itemRenderers/ActorNameListItemRenderer.mxml > @@ -20,6 +20,7 @@ limitations under the License. > <mdl:ListItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"; > xmlns:js="library://ns.apache.org/royale/basic" > xmlns:mdl="library://ns.apache.org/royale/mdl" > + xmlns:html="library://ns.apache.org/royale/html" > xmlns="http://www.w3.org/1999/xhtml";> > > <fx:Script> > @@ -38,11 +39,11 @@ limitations under the License. > <js:ItemRendererDataBinding /> > </mdl:beads> > > - <js:Span text="{actor.actorName}"> > + <html:Span text="{actor.actorName}"> > <js:beads> > <mdl:ListItemPrimaryContent/> > </js:beads> > - </js:Span> > + </html:Span> > > </mdl:ListItemRenderer> > > diff --git > a/examples/royale/MDLExample/src/main/royale/itemRenderers/AvatarAndActionListItemRenderer.mxml > > b/examples/royale/MDLExample/src/main/royale/itemRenderers/AvatarAndActionListItemRenderer.mxml > index 0e95726..253ec53 100644 > --- > a/examples/royale/MDLExample/src/main/royale/itemRenderers/AvatarAndActionListItemRenderer.mxml > +++ > b/examples/royale/MDLExample/src/main/royale/itemRenderers/AvatarAndActionListItemRenderer.mxml > @@ -20,6 +20,7 @@ limitations under the License. > <mdl:ListItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"; > xmlns:js="library://ns.apache.org/royale/basic" > xmlns:mdl="library://ns.apache.org/royale/mdl" > + xmlns:html="library://ns.apache.org/royale/html" > xmlns="http://www.w3.org/1999/xhtml";> > > <fx:Script> > @@ -40,18 +41,18 @@ limitations under the License. > <js:ItemRendererDataBinding /> > </mdl:beads> > > - <js:Span text="{actor.actorName}"> > + <html:Span text="{actor.actorName}"> > <js:beads> > <mdl:ListItemPrimaryContent/> > </js:beads> > <mdl:MaterialIcon text="{MaterialIconType.PERSON}" > listItemAvatar="true"/> > - </js:Span> > - <js:A href="#"> > + </html:Span> > + <html:A href="#"> > <js:beads> > <mdl:ListItemSecondaryAction/> > </js:beads> > <mdl:MaterialIcon text="{MaterialIconType.STAR}"/> > - </js:A> > + </html:A> > > </mdl:ListItemRenderer> > > diff --git > a/examples/royale/MDLExample/src/main/royale/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml > > b/examples/royale/MDLExample/src/main/royale/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml > index 7bd1133..8e16681 100644 > --- > a/examples/royale/MDLExample/src/main/royale/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml > +++ > b/examples/royale/MDLExample/src/main/royale/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml > @@ -20,6 +20,7 @@ limitations under the License. > <mdl:ListItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"; > xmlns:js="library://ns.apache.org/royale/basic" > xmlns:mdl="library://ns.apache.org/royale/mdl" > + xmlns:html="library://ns.apache.org/royale/html" > xmlns="http://www.w3.org/1999/xhtml"; > threeLine="true"> > > @@ -41,30 +42,30 @@ limitations under the License. > <js:ItemRendererDataBinding /> > </mdl:beads> > > - <js:Span> > + <html:Span> > <js:beads> > <mdl:ListItemPrimaryContent/> > </js:beads> > <mdl:MaterialIcon text="{MaterialIconType.PERSON}" > listItemAvatar="true"/> > - <js:Span text="{actor.actorName}"/> > - <js:Span text="{actor.description}"> > + <html:Span text="{actor.actorName}"/> > + <html:Span text="{actor.description}"> > <js:beads> > <mdl:ListItemTextBody/> > </js:beads> > - </js:Span> > - </js:Span> > + </html:Span> > + </html:Span> > > - <js:Span> > + <html:Span> > <js:beads> > <mdl:ListItemSecondaryContent/> > </js:beads> > - <js:A href="#"> > + <html:A href="#"> > <js:beads> > <mdl:ListItemSecondaryAction/> > </js:beads> > <mdl:MaterialIcon text="{MaterialIconType.STAR}"/> > - </js:A> > - </js:Span> > + </html:A> > + </html:Span> > > </mdl:ListItemRenderer> > > diff --git > a/examples/royale/MDLExample/src/main/royale/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml > > b/examples/royale/MDLExample/src/main/royale/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml > index e287024..cf56081 100644 > --- > a/examples/royale/MDLExample/src/main/royale/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml > +++ > b/examples/royale/MDLExample/src/main/royale/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml > @@ -20,6 +20,7 @@ limitations under the License. > <mdl:ListItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"; > xmlns:js="library://ns.apache.org/royale/basic" > xmlns:mdl="library://ns.apache.org/royale/mdl" > + xmlns:html="library://ns.apache.org/royale/html" > xmlns="http://www.w3.org/1999/xhtml"; > twoLine="true"> > > @@ -47,35 +48,35 @@ limitations under the License. > <js:ItemRendererDataBinding /> > </mdl:beads> > > - <js:Span> > + <html:Span> > <js:beads> > <mdl:ListItemPrimaryContent/> > <mdl:MaterialIcon text="{MaterialIconType.PERSON}" > listItemAvatar="true"/> > </js:beads> > - <js:Span text="{actor.actorName}"/> > - <js:Span text="{actor.episodes}"> > + <html:Span text="{actor.actorName}"/> > + <html:Span text="{actor.episodes}"> > <js:beads> > <mdl:ListItemSubTitle/> > </js:beads> > - </js:Span> > - </js:Span> > + </html:Span> > + </html:Span> > > - <js:Span> > + <html:Span> > <js:beads> > <mdl:ListItemSecondaryContent/> > </js:beads> > - <js:Span id="ir" visible="false" text="Actor"> > + <html:Span id="ir" visible="false" text="Actor"> > <js:beads> > <mdl:ListItemSecondaryInfo/> > </js:beads> > - </js:Span> > - <js:A href="#"> > + </html:Span> > + <html:A href="#"> > <js:beads> > <mdl:ListItemSecondaryAction/> > </js:beads> > <mdl:MaterialIcon text="{MaterialIconType.STAR}"/> > - </js:A> > - </js:Span> > + </html:A> > + </html:Span> > > </mdl:ListItemRenderer> > > diff --git > a/examples/royale/MDLExample/src/main/royale/itemRenderers/CustomListItemRenderer.mxml > > b/examples/royale/MDLExample/src/main/royale/itemRenderers/CustomListItemRenderer.mxml > index 0da4f04..86765a3 100644 > --- > a/examples/royale/MDLExample/src/main/royale/itemRenderers/CustomListItemRenderer.mxml > +++ > b/examples/royale/MDLExample/src/main/royale/itemRenderers/CustomListItemRenderer.mxml > @@ -20,6 +20,7 @@ limitations under the License. > <mdl:ListItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"; > xmlns:js="library://ns.apache.org/royale/basic" > xmlns:mdl="library://ns.apache.org/royale/mdl" > + xmlns:html="library://ns.apache.org/royale/html" > xmlns="http://www.w3.org/1999/xhtml";> > > <fx:Script> > @@ -38,11 +39,11 @@ limitations under the License. > <js:ItemRendererDataBinding /> > </mdl:beads> > > - <js:Span text="{product.label}"> > + <html:Span text="{product.label}"> > <js:beads> > <mdl:ListItemPrimaryContent/> > </js:beads> > - </js:Span> > + </html:Span> > > </mdl:ListItemRenderer> > > diff --git > a/examples/royale/MDLExample/src/main/royale/itemRenderers/FooterMiniLinkListItemRenderer.mxml > > b/examples/royale/MDLExample/src/main/royale/itemRenderers/FooterMiniLinkListItemRenderer.mxml > index c8b7886..c85afd9 100644 > --- > a/examples/royale/MDLExample/src/main/royale/itemRenderers/FooterMiniLinkListItemRenderer.mxml > +++ > b/examples/royale/MDLExample/src/main/royale/itemRenderers/FooterMiniLinkListItemRenderer.mxml > @@ -20,13 +20,14 @@ limitations under the License. > <mdl:FooterLinkItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"; > xmlns:js="library://ns.apache.org/royale/basic" > xmlns:mdl="library://ns.apache.org/royale/mdl" > + xmlns:html="library://ns.apache.org/royale/html" > xmlns="http://www.w3.org/1999/xhtml";> > > <mdl:beads> > <js:ItemRendererDataBinding /> > </mdl:beads> > > - <js:A text="{String(data)}"/> > + <html:A text="{String(data)}"/> > > </mdl:FooterLinkItemRenderer> > > > -- > To stop receiving notification emails like this one, please contact > ['"[email protected]" <[email protected]>'].
