You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2019/11/27 17:56:41 UTC
[royale-asjs] branch develop updated: tour-de-jewel: fix child
namespaces (royale/royale-compiler#101)
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 b0e85cf tour-de-jewel: fix child namespaces (royale/royale-compiler#101)
b0e85cf is described below
commit b0e85cf1f9c78802bb1b89fcb03aec48cc33866c
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Nov 27 18:56:30 2019 +0100
tour-de-jewel: fix child namespaces (royale/royale-compiler#101)
---
.../src/main/royale/AdvancedListPlayGround.mxml | 8 +--
.../src/main/royale/ButtonPlayGround.mxml | 36 ++++++------
.../src/main/royale/ComboBoxPlayGround.mxml | 8 +--
.../src/main/royale/DateComponentsPlayGround.mxml | 4 +-
.../src/main/royale/DropDownListPlayGround.mxml | 8 +--
.../src/main/royale/GridPlayGround.mxml | 4 +-
.../src/main/royale/ImagePlayGround.mxml | 4 +-
.../src/main/royale/LabelPlayGround.mxml | 4 +-
.../src/main/royale/ListPlayGround.mxml | 8 +--
.../src/main/royale/MiscelaneaPlayGound.mxml | 4 +-
.../src/main/royale/PopUpPlayGround.mxml | 4 +-
.../src/main/royale/SliderPlayGround.mxml | 65 +++++++++++-----------
.../src/main/royale/SnackbarPlayGround.mxml | 6 +-
.../src/main/royale/TabBarPlayGround.mxml | 4 +-
.../src/main/royale/TablePlayGround.mxml | 8 +--
.../src/main/royale/TextInputPlayGround.mxml | 24 ++++----
.../src/main/royale/WelcomeSection.mxml | 4 +-
.../src/main/royale/WizardPlayGround.mxml | 28 +++++-----
.../TableCellCloseIconItemRenderer.mxml | 4 +-
.../itemRenderers/TableStyleListItemRenderer.mxml | 10 ++--
20 files changed, 124 insertions(+), 121 deletions(-)
diff --git a/examples/royale/TourDeJewel/src/main/royale/AdvancedListPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/AdvancedListPlayGround.mxml
index fecfdfc..86e9b92 100644
--- a/examples/royale/TourDeJewel/src/main/royale/AdvancedListPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/AdvancedListPlayGround.mxml
@@ -156,13 +156,13 @@ limitations under the License.
]]>
</fx:Script>
- <j:model>
+ <c:model>
<models:ListsModel id="listModel"/>
- </j:model>
+ </c:model>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
diff --git a/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml
index 456ea88..776b8c9 100644
--- a/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml
@@ -38,9 +38,9 @@ limitations under the License.
]]>
</fx:Script>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
<j:GridCell desktopNumerator="1" desktopDenominator="2" tabletNumerator="1" tabletDenominator="2" phoneNumerator="1" phoneDenominator="1">
@@ -189,45 +189,45 @@ limitations under the License.
<html:H3 text="Buttons with Badges"/>
<j:Button text="Badge Top-Right">
- <js:beads>
+ <j:beads>
<j:Badge text="tr" emphasis="secondary"/>
- </js:beads>
+ </j:beads>
</j:Button>
<j:Button text="Badge Bottom-Right">
- <js:beads>
+ <j:beads>
<j:Badge text="br" emphasis="secondary" subindex="true"/>
- </js:beads>
+ </j:beads>
</j:Button>
<j:Button text="Badge Top-Left">
- <js:beads>
+ <j:beads>
<j:Badge text="tl" emphasis="secondary" preindex="true"/>
- </js:beads>
+ </j:beads>
</j:Button>
<j:Button text="Badge Bottom-Left">
- <js:beads>
+ <j:beads>
<j:Badge text="bl" emphasis="secondary" subindex="true" preindex="true"/>
- </js:beads>
+ </j:beads>
</j:Button>
<j:Button text="Badge Top-Right (Overlap)" emphasis="primary">
- <js:beads>
+ <j:beads>
<j:Badge text="tr" emphasis="emphasized" overlap="true"/>
- </js:beads>
+ </j:beads>
</j:Button>
<j:Button text="Badge Bottom-Right (Overlap)" emphasis="primary">
- <js:beads>
+ <j:beads>
<j:Badge text="br" emphasis="emphasized" subindex="true" overlap="true"/>
- </js:beads>
+ </j:beads>
</j:Button>
<j:Button text="Badge Top-Left (Overlap)" emphasis="primary">
- <js:beads>
+ <j:beads>
<j:Badge text="tl" emphasis="emphasized" preindex="true" overlap="true"/>
- </js:beads>
+ </j:beads>
</j:Button>
<j:Button text="Badge Bottom-Left (Overlap)" emphasis="primary">
- <js:beads>
+ <j:beads>
<j:Badge text="bl" emphasis="emphasized" subindex="true" preindex="true" overlap="true"/>
- </js:beads>
+ </j:beads>
</j:Button>
</j:Card>
</j:GridCell>
diff --git a/examples/royale/TourDeJewel/src/main/royale/ComboBoxPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/ComboBoxPlayGround.mxml
index cf3d558..44ea4b2 100644
--- a/examples/royale/TourDeJewel/src/main/royale/ComboBoxPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/ComboBoxPlayGround.mxml
@@ -70,13 +70,13 @@ limitations under the License.
]]>
</fx:Script>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
- <j:model>
+ <c:model>
<models:ListsModel id="listModel"/>
- </j:model>
+ </c:model>
<j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
diff --git a/examples/royale/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml
index 51ee711..ba5c32e 100644
--- a/examples/royale/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml
@@ -88,9 +88,9 @@ limitations under the License.
]]>
</fx:Script>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<j:Grid gap="true">
<j:GridCell desktopNumerator="1" desktopDenominator="2" tabletNumerator="1" tabletDenominator="2" phoneNumerator="1" phoneDenominator="1">
diff --git a/examples/royale/TourDeJewel/src/main/royale/DropDownListPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/DropDownListPlayGround.mxml
index 04cadbc..44d7468 100644
--- a/examples/royale/TourDeJewel/src/main/royale/DropDownListPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/DropDownListPlayGround.mxml
@@ -51,13 +51,13 @@ limitations under the License.
]]>
</fx:Script>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
- <j:model>
+ <c:model>
<models:ListsModel id="listModel"/>
- </j:model>
+ </c:model>
<j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
diff --git a/examples/royale/TourDeJewel/src/main/royale/GridPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/GridPlayGround.mxml
index 7583569..106d651 100644
--- a/examples/royale/TourDeJewel/src/main/royale/GridPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/GridPlayGround.mxml
@@ -30,9 +30,9 @@ limitations under the License.
]]>
</fx:Script>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<html:H3 text="Grids"/>
<j:CheckBox text="Turn Gap on/off" change="useGap = !useGap;" selected="true"/>
diff --git a/examples/royale/TourDeJewel/src/main/royale/ImagePlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/ImagePlayGround.mxml
index 7527daf..977ea63 100644
--- a/examples/royale/TourDeJewel/src/main/royale/ImagePlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/ImagePlayGround.mxml
@@ -35,9 +35,9 @@ limitations under the License.
]]>
</fx:Script>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
<j:GridCell desktopNumerator="1" desktopDenominator="2" tabletNumerator="1" tabletDenominator="2" phoneNumerator="1" phoneDenominator="1">
diff --git a/examples/royale/TourDeJewel/src/main/royale/LabelPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/LabelPlayGround.mxml
index 1949054..f1b2711 100644
--- a/examples/royale/TourDeJewel/src/main/royale/LabelPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/LabelPlayGround.mxml
@@ -37,9 +37,9 @@ limitations under the License.
]]>
</fx:Script>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<j:Card width="350">
<html:H3 text="Jewel Label"/>
diff --git a/examples/royale/TourDeJewel/src/main/royale/ListPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/ListPlayGround.mxml
index 397c9a2..501fc02 100644
--- a/examples/royale/TourDeJewel/src/main/royale/ListPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/ListPlayGround.mxml
@@ -126,13 +126,13 @@ limitations under the License.
]]>
</fx:Script>
- <j:model>
+ <c:model>
<models:ListsModel id="listModel"/>
- </j:model>
+ </c:model>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
<j:GridCell desktopNumerator="1" desktopDenominator="2" tabletNumerator="1" tabletDenominator="2" phoneNumerator="1" phoneDenominator="1">
diff --git a/examples/royale/TourDeJewel/src/main/royale/MiscelaneaPlayGound.mxml b/examples/royale/TourDeJewel/src/main/royale/MiscelaneaPlayGound.mxml
index 569766b..9ad6a66 100644
--- a/examples/royale/TourDeJewel/src/main/royale/MiscelaneaPlayGound.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/MiscelaneaPlayGound.mxml
@@ -23,9 +23,9 @@ limitations under the License.
xmlns:js="library://ns.apache.org/royale/basic"
xmlns:c="components.*" sourceCodeUrl="MiscelaneaPlayGound.mxml">
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<j:Group>
<j:beads>
diff --git a/examples/royale/TourDeJewel/src/main/royale/PopUpPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/PopUpPlayGround.mxml
index 0acfe95..45e8a5c 100644
--- a/examples/royale/TourDeJewel/src/main/royale/PopUpPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/PopUpPlayGround.mxml
@@ -38,9 +38,9 @@ limitations under the License.
]]>
</fx:Script>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
<j:GridCell desktopNumerator="1" desktopDenominator="2" tabletNumerator="1" tabletDenominator="1" phoneNumerator="1" phoneDenominator="1">
diff --git a/examples/royale/TourDeJewel/src/main/royale/SliderPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/SliderPlayGround.mxml
index 34fc934..7edada3 100644
--- a/examples/royale/TourDeJewel/src/main/royale/SliderPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/SliderPlayGround.mxml
@@ -74,41 +74,42 @@ limitations under the License.
]]>
</fx:Script>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
-<j:Group>
- <j:beads>
- <j:HorizontalCenteredLayout gap="3"/>
- </j:beads>
- <j:Card width="450">
- <html:H3 text="Jewel HSlider"/>
-
- <j:HSlider localId="slider_w" width="250" value="250" minimum="100" maximum="420" change="onChange(event)" input="onInput(event)" valueChange="onValueChange(event)"/>
- <j:HSlider localId="slider_h" width="250" value="80" minimum="40" maximum="300" change="onChange(event)" input="onInput(event)" valueChange="onValueChange(event)"/>
-
- <j:HSlider localId="slider_dis" width="250" value="70" minimum="0" maximum="100">
- <j:beads>
- <j:Disabled/>
- </j:beads>
- </j:HSlider>
-
- <j:Button localId="button1" text="HSlider to 400x200" width="250" height="80" emphasis="{Button.PRIMARY}" click="clickHandler(event)"/>
-
- </j:Card>
- <j:Card width="350" height="400">
- <html:H3 text="Jewel VSlider"/>
- <j:HGroup localId="hg" gap="3" width="300">
- <j:VSlider localId="vslider_w" height="250" value="150" minimum="50" maximum="220" change="onChange(event)" input="onInput(event)" valueChange="onValueChange(event)"/>
- <j:VSlider localId="vslider_h" height="250" value="80" minimum="40" maximum="300" change="onChange(event)" input="onInput(event)" valueChange="onValueChange(event)"/>
- <j:VSlider localId="vslider_dis" height="250" value="70" minimum="0" maximum="300">
+ </c:beads>
+
+ <j:Group>
+ <j:beads>
+ <j:HorizontalCenteredLayout gap="3"/>
+ </j:beads>
+ <j:Card width="450">
+ <html:H3 text="Jewel HSlider"/>
+
+ <j:HSlider localId="slider_w" width="250" value="250" minimum="100" maximum="420" change="onChange(event)" input="onInput(event)" valueChange="onValueChange(event)"/>
+ <j:HSlider localId="slider_h" width="250" value="80" minimum="40" maximum="300" change="onChange(event)" input="onInput(event)" valueChange="onValueChange(event)"/>
+
+ <j:HSlider localId="slider_dis" width="250" value="70" minimum="0" maximum="100">
<j:beads>
<j:Disabled/>
</j:beads>
- </j:VSlider>
- <j:Button localId="button2" text="VSlider to 190x160" width="150" height="80" emphasis="{Button.PRIMARY}" click="clickHandler(event)"/>
- </j:HGroup>
- </j:Card>
-</j:Group>
+ </j:HSlider>
+
+ <j:Button localId="button1" text="HSlider to 400x200" width="250" height="80" emphasis="{Button.PRIMARY}" click="clickHandler(event)"/>
+
+ </j:Card>
+ <j:Card width="350" height="400">
+ <html:H3 text="Jewel VSlider"/>
+ <j:HGroup localId="hg" gap="3" width="300">
+ <j:VSlider localId="vslider_w" height="250" value="150" minimum="50" maximum="220" change="onChange(event)" input="onInput(event)" valueChange="onValueChange(event)"/>
+ <j:VSlider localId="vslider_h" height="250" value="80" minimum="40" maximum="300" change="onChange(event)" input="onInput(event)" valueChange="onValueChange(event)"/>
+ <j:VSlider localId="vslider_dis" height="250" value="70" minimum="0" maximum="300">
+ <j:beads>
+ <j:Disabled/>
+ </j:beads>
+ </j:VSlider>
+ <j:Button localId="button2" text="VSlider to 190x160" width="150" height="80" emphasis="{Button.PRIMARY}" click="clickHandler(event)"/>
+ </j:HGroup>
+ </j:Card>
+ </j:Group>
</c:ExampleAndSourceCodeTabbedSectionContent>
diff --git a/examples/royale/TourDeJewel/src/main/royale/SnackbarPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/SnackbarPlayGround.mxml
index d68d707..941abb1 100644
--- a/examples/royale/TourDeJewel/src/main/royale/SnackbarPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/SnackbarPlayGround.mxml
@@ -44,9 +44,11 @@ limitations under the License.
}
]]>
</fx:Script>
- <j:beads>
+
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
+
<j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
<j:GridCell desktopNumerator="1" desktopDenominator="2" tabletNumerator="1" tabletDenominator="1" phoneNumerator="1" phoneDenominator="1">
<j:Card>
diff --git a/examples/royale/TourDeJewel/src/main/royale/TabBarPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/TabBarPlayGround.mxml
index bde8257..39840cf 100644
--- a/examples/royale/TourDeJewel/src/main/royale/TabBarPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/TabBarPlayGround.mxml
@@ -82,9 +82,9 @@ limitations under the License.
]]>
</fx:Script>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
<j:GridCell desktopNumerator="1" desktopDenominator="1" tabletNumerator="1" tabletDenominator="1" phoneNumerator="1" phoneDenominator="1">
diff --git a/examples/royale/TourDeJewel/src/main/royale/TablePlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/TablePlayGround.mxml
index 7d60102..ad5a643 100644
--- a/examples/royale/TourDeJewel/src/main/royale/TablePlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/TablePlayGround.mxml
@@ -24,13 +24,13 @@ limitations under the License.
xmlns:c="components.*"
xmlns:models="models.*" sourceCodeUrl="TablePlayGround.mxml">
- <j:model>
+ <c:model>
<models:TablesModel id="tablesModel"/>
- </j:model>
+ </c:model>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
<j:GridCell desktopNumerator="1" desktopDenominator="1" tabletNumerator="1" tabletDenominator="1" phoneNumerator="1" phoneDenominator="1">
diff --git a/examples/royale/TourDeJewel/src/main/royale/TextInputPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/TextInputPlayGround.mxml
index 8458c5b..7846336 100644
--- a/examples/royale/TourDeJewel/src/main/royale/TextInputPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/TextInputPlayGround.mxml
@@ -44,9 +44,9 @@ limitations under the License.
]]>
</fx:Script>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
<j:GridCell wideScreenNumerator="1" wideScreenDenominator="2" desktopNumerator="1" desktopDenominator="1" tabletNumerator="1" tabletDenominator="1" phoneNumerator="1" phoneDenominator="1">
@@ -101,32 +101,32 @@ limitations under the License.
<j:VGroup gap="3">
<j:TextInput text="Bead for text UPPER case">
- <js:beads>
+ <j:beads>
<j:UpperCase/>
- </js:beads>
+ </j:beads>
</j:TextInput>
<j:TextInput text="Bead for text LOWER case">
- <js:beads>
+ <j:beads>
<j:LowerCase/>
- </js:beads>
+ </j:beads>
</j:TextInput>
<j:TextInput>
- <js:beads>
+ <j:beads>
<j:TextPrompt prompt="Only characters"/>
<j:Restrict pattern="[^a-zA-Z]"/>
- </js:beads>
+ </j:beads>
</j:TextInput>
<j:TextInput>
- <js:beads>
+ <j:beads>
<j:TextPrompt prompt="Only numbers"/>
<j:Restrict pattern="[^0-9]"/>
- </js:beads>
+ </j:beads>
</j:TextInput>
<j:TextInput>
- <js:beads>
+ <j:beads>
<j:TextPrompt prompt="Only letters and numbers"/>
<j:Restrict pattern="[^0-9a-zA-Z]"/>
- </js:beads>
+ </j:beads>
</j:TextInput>
</j:VGroup>
</j:Card>
diff --git a/examples/royale/TourDeJewel/src/main/royale/WelcomeSection.mxml b/examples/royale/TourDeJewel/src/main/royale/WelcomeSection.mxml
index aff9bb7..16b54fd 100644
--- a/examples/royale/TourDeJewel/src/main/royale/WelcomeSection.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/WelcomeSection.mxml
@@ -29,9 +29,9 @@ limitations under the License.
]]>
</fx:Script>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<j:Group>
<j:beads>
diff --git a/examples/royale/TourDeJewel/src/main/royale/WizardPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/WizardPlayGround.mxml
index bec3cea..36e0040 100644
--- a/examples/royale/TourDeJewel/src/main/royale/WizardPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/WizardPlayGround.mxml
@@ -48,9 +48,9 @@ limitations under the License.
]]>
</fx:Script>
- <j:beads>
+ <c:beads>
<js:ContainerDataBinding/>
- </j:beads>
+ </c:beads>
<j:Card width="600">
<j:Wizard id="wizard" width="100%" height="500">
@@ -75,9 +75,9 @@ limitations under the License.
</j:nextButton>
<j:WizardPage name="page1" exitPage="formaExample.formValidator.removeAllErrorTips()">
- <views:step>
+ <j:step>
<j:WizardStep name="page1" nextStep="page2" initialPage="true" stepLabel="Page 1"/>
- </views:step>
+ </j:step>
<j:Group>
<j:beads>
@@ -89,9 +89,9 @@ limitations under the License.
</j:WizardPage>
<j:WizardPage name="page2">
- <views:step>
+ <j:step>
<j:WizardStep id="sl" name="page2" previousStep="page1" nextStep="page3" stepLabel="Page 2"/>
- </views:step>
+ </j:step>
<j:Group>
<j:beads>
@@ -104,9 +104,9 @@ limitations under the License.
</j:WizardPage>
<j:WizardPage name="page3" localId="page3">
- <views:step>
+ <j:step>
<j:WizardStep name="page3" previousStep="page2" nextStep="page4" stepLabel="Page 3"/>
- </views:step>
+ </j:step>
<j:Group>
<j:beads>
@@ -124,9 +124,9 @@ limitations under the License.
</j:WizardPage>
<j:WizardPage localId="page4" name="page4">
- <views:step>
+ <j:step>
<j:WizardStep name="page4" previousStep="page3" nextStep="page5" stepLabel="Page 4"/>
- </views:step>
+ </j:step>
<j:Group>
<j:beads>
@@ -140,9 +140,9 @@ limitations under the License.
</j:WizardPage>
<j:WizardPage name="page5">
- <views:step>
+ <j:step>
<j:WizardStep name="page5" previousStep="page4" nextStep="page6" stepLabel="Page 5"/>
- </views:step>
+ </j:step>
<j:beads>
<j:ScrollingViewport/>
@@ -167,9 +167,9 @@ limitations under the License.
</j:WizardPage>
<j:WizardPage name="page6">
- <views:step>
+ <j:step>
<j:WizardStep name="page6" previousStep="page5" stepLabel="Page 6"/>
- </views:step>
+ </j:step>
<j:beads>
<j:ScrollingViewport/>
diff --git a/examples/royale/TourDeJewel/src/main/royale/itemRenderers/TableCellCloseIconItemRenderer.mxml b/examples/royale/TourDeJewel/src/main/royale/itemRenderers/TableCellCloseIconItemRenderer.mxml
index c585082..0b928d2 100644
--- a/examples/royale/TourDeJewel/src/main/royale/itemRenderers/TableCellCloseIconItemRenderer.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/itemRenderers/TableCellCloseIconItemRenderer.mxml
@@ -37,9 +37,9 @@ limitations under the License.
]]>
</fx:Script>
- <mdl:beads>
+ <j:beads>
<js:ItemRendererDataBinding/>
- </mdl:beads>
+ </j:beads>
<j:IconButton emphasis="primary" width="24" height="24" style="padding: 0px; border-radius: 50%" click="clickCloseButton()">
<j:icon>
diff --git a/examples/royale/TourDeJewel/src/main/royale/itemRenderers/TableStyleListItemRenderer.mxml b/examples/royale/TourDeJewel/src/main/royale/itemRenderers/TableStyleListItemRenderer.mxml
index 8a02c77..5f0c5e3 100644
--- a/examples/royale/TourDeJewel/src/main/royale/itemRenderers/TableStyleListItemRenderer.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/itemRenderers/TableStyleListItemRenderer.mxml
@@ -17,20 +17,20 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-<itemRenderers:IconListItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
+<ir:IconListItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:j="library://ns.apache.org/royale/jewel"
xmlns:js="library://ns.apache.org/royale/basic"
- xmlns:itemRenderers="itemRenderers.*">
+ xmlns:ir="itemRenderers.*">
- <j:beads>
+ <ir:beads>
<js:ItemRendererDataBinding />
<j:HorizontalLayout/>
- </j:beads>
+ </ir:beads>
<js:FontIcon text="{iconList ? iconList.icon : ''}" material="true" visible="{iconList ? iconList.icon != null : false}" click="clickCloseButton()" width="100"/>
<j:Label html="{text}" multiline="true" width="300"/>
<j:Label html="Third field" multiline="true" width="100"/>
<j:Label html="Fourth field" multiline="true" width="200"/>
-</itemRenderers:IconListItemRenderer>
+</ir:IconListItemRenderer>