This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/jewel-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/jewel-ui-set by this
push:
new 198aa72 test that issue #133 is working right. Commented the
ViewBeads declarations since was only for testing, but left in the project so
we can reproduce at any time
198aa72 is described below
commit 198aa724c6e61a2e3e41c2de356b9aef9d1c1441
Author: Carlos Rovira <[email protected]>
AuthorDate: Wed Mar 28 16:29:04 2018 +0200
test that issue #133 is working right. Commented the ViewBeads declarations
since was only for testing, but left in the project so we can reproduce at any
time
---
.../{MainContent.mxml => LabelPlayGround.mxml} | 47 +++++++++-------------
.../JewelExample/src/main/royale/MainContent.mxml | 1 +
.../projects/Jewel/src/main/resources/defaults.css | 30 ++++++--------
.../Jewel/src/main/resources/jewel-manifest.xml | 1 +
.../jewel/beads/views/JewelLabelViewBead.mxml | 2 +-
.../projects/Jewel/src/main/sass/_global.sass | 2 +-
.../Jewel/src/main/sass/components/_checkbox.sass | 2 +-
.../Jewel/src/main/sass/components/_label.sass | 8 ++--
.../src/main/sass/components/_radiobutton.sass | 9 ++++-
.../Jewel/src/main/sass/components/_slider.sass | 15 +------
.../Jewel/src/main/sass/components/_textfield.sass | 5 ++-
frameworks/themes/JewelTheme/pom.xml | 14 +++++++
.../JewelTheme/src/main/resources/defaults.css | 2 +-
.../src/main/resources/jeweltheme-manifest.xml | 2 +-
.../src/main/royale/JewelThemeClasses.as | 2 +-
.../royale/jewel/beads/views/LabelViewBead.mxml | 5 ++-
.../themes/JewelTheme/src/main/sass/_global.sass | 2 +-
.../src/main/sass/components/_label.sass | 4 +-
18 files changed, 76 insertions(+), 77 deletions(-)
diff --git a/examples/royale/JewelExample/src/main/royale/MainContent.mxml
b/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
similarity index 56%
copy from examples/royale/JewelExample/src/main/royale/MainContent.mxml
copy to examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
index e10b472..a61d2f3 100644
--- a/examples/royale/JewelExample/src/main/royale/MainContent.mxml
+++ b/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
@@ -19,36 +19,25 @@ limitations under the License.
-->
<js:Group 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:j="library://ns.apache.org/royale/jewel"
- xmlns:local="*">
+ className="container">
- <js:beads>
- <j:HorizontalLayoutWithPaddingAndGap gap="10"/>
- </js:beads>
+ <fx:Script>
+ <![CDATA[
+ private function labelClick(event:Event):void
+ {
+ trace("jewel label clicked");
+ }
+ ]]>
+ </fx:Script>
- <js:Group>
- <js:beads>
- <j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </js:beads>
- <local:ButtonPlayGround/>
- <local:TextButtonPlayGround/>
- </js:Group>
-
- <js:Group>
- <js:beads>
- <j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </js:beads>
- <local:TextInputPlayGround/>
- <local:CheckBoxPlayGround/>
- <local:RadioButtonPlayGround/>
- </js:Group>
-
- <js:Group>
- <js:beads>
- <j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </js:beads>
- <local:SliderPlayGround/>
- <local:HeadingsAndText/>
- </js:Group>
-
+ <js:beads>
+ <j:VerticalLayoutWithPaddingAndGap gap="10"/>
+ </js:beads>
+
+ <html:H3 text="Jewel Label"/>
+
+ <j:Label text="This is a Label" click="labelClick(event)"/>
+
</js:Group>
diff --git a/examples/royale/JewelExample/src/main/royale/MainContent.mxml
b/examples/royale/JewelExample/src/main/royale/MainContent.mxml
index e10b472..b38b2e3 100644
--- a/examples/royale/JewelExample/src/main/royale/MainContent.mxml
+++ b/examples/royale/JewelExample/src/main/royale/MainContent.mxml
@@ -30,6 +30,7 @@ limitations under the License.
<js:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
</js:beads>
+ <local:LabelPlayGround/>
<local:ButtonPlayGround/>
<local:TextButtonPlayGround/>
</js:Group>
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 826be93..c99e1f8 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@namespace "library://ns.apache.org/royale/jewel";
+@namespace j "library://ns.apache.org/royale/jewel";
.layout.horizontal {
white-space: nowrap;
display: block;
@@ -31,7 +31,7 @@
}
@media -royale-swf {
- CheckBox {
+ j|CheckBox {
IBeadModel:
ClassReference("org.apache.royale.html.beads.models.ToggleButtonModel");
IBeadView: ClassReference("org.apache.royale.html.beads.CheckBoxView");
}
@@ -40,17 +40,23 @@
white-space: nowrap;
}
-Label {
- iBeadModel: ClassReference("org.apache.royale.html.beads.models.TextModel");
+j|Label {
+ IBeadModel: ClassReference("org.apache.royale.html.beads.models.TextModel");
}
+@media -royale-swf {
+ j|RadioButton {
+ IBeadModel:
ClassReference("org.apache.royale.html.beads.models.ValueToggleButtonModel");
+ IBeadView: ClassReference("org.apache.royale.jewel.beads.RadioButtonView");
+ }
+}
.jewel.slider {
width: 100px;
height: 30px;
position: relative;
}
-Slider {
+j|Slider {
IBeadModel:
ClassReference("org.apache.royale.jewel.beads.models.SliderRangeModel");
IBeadView: ClassReference("org.apache.royale.jewel.beads.SliderView");
IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalSliderLayout");
@@ -67,22 +73,12 @@ Slider {
}
@media -royale-swf {
- Slider {
+ j|Slider {
iThumbView:
ClassReference("org.apache.royale.jewel.beads.SliderThumbView");
iTrackView:
ClassReference("org.apache.royale.jewel.beads.SliderTrackView");
}
-
- RadioButton {
- IBeadModel:
ClassReference("org.apache.royale.html.beads.models.ValueToggleButtonModel");
- IBeadView: ClassReference("org.apache.royale.jewel.beads.RadioButtonView");
- }
-
- CheckBox {
- IBeadModel:
ClassReference("org.apache.royale.html.beads.models.ToggleButtonModel");
- IBeadView: ClassReference("org.apache.royale.html.beads.CheckBoxView");
- }
}
-TextField {
+j|TextField {
IBeadModel: ClassReference("org.apache.royale.html.beads.models.TextModel");
}
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 029c767..332b2eb 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -38,6 +38,7 @@
<component id="VerticalLayoutWithPaddingAndGap"
class="org.apache.royale.jewel.beads.layouts.VerticalLayoutWithPaddingAndGap"/>
<component id="HorizontalSliderLayout"
class="org.apache.royale.jewel.beads.layouts.HorizontalSliderLayout" />
+
<!-- <component id="JewelLabelViewBead"
class="org.apache.royale.jewel.beads.views.JewelLabelViewBead"/> -->
</componentPackage>
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
index 6489b46..4135138 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
@@ -38,7 +38,7 @@ limitations under the License.
<js:MXMLBeadViewDataBinding />
</js:beads>
- <j:TextButton id="textButton" text="A view bead" primary="true"/>
+ <j:TextButton id="textButton" text="JewelLabelViewBead" primary="true"/>
<!--
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass
b/frameworks/projects/Jewel/src/main/sass/_global.sass
index 9fa8336..56495a9 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -17,7 +17,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-@namespace "library://ns.apache.org/royale/jewel"
+@namespace j "library://ns.apache.org/royale/jewel"
.layout.horizontal
white-space: nowrap
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_checkbox.sass
b/frameworks/projects/Jewel/src/main/sass/components/_checkbox.sass
index f4369fe..f7885f3 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_checkbox.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_checkbox.sass
@@ -20,7 +20,7 @@
.jewel.checkbox
@media -royale-swf
- CheckBox
+ j|CheckBox
IBeadModel:
ClassReference("org.apache.royale.html.beads.models.ToggleButtonModel")
IBeadView:
ClassReference("org.apache.royale.html.beads.CheckBoxView")
//font-size: 11px
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_label.sass
b/frameworks/projects/Jewel/src/main/sass/components/_label.sass
index 628e3ca..4938afe 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_label.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_label.sass
@@ -20,8 +20,8 @@
.jewel.label
white-space: nowrap
-Label
- iBeadModel:
ClassReference("org.apache.royale.html.beads.models.TextModel")
- //iBeadView:
ClassReference("org.apache.royale.jewel.beads.views.JewelLabelViewBead")
- //iMeasurementBead:
ClassReference("org.apache.royale.html.beads.TextFieldLabelMeasurementBead")
+j|Label
+ IBeadModel:
ClassReference("org.apache.royale.html.beads.models.TextModel")
+ //IMeasurementBead:
ClassReference("org.apache.royale.html.beads.TextFieldLabelMeasurementBead")
+ //IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.JewelLabelViewBead")
diff --git
a/frameworks/projects/Jewel/src/main/sass/components/_radiobutton.sass
b/frameworks/projects/Jewel/src/main/sass/components/_radiobutton.sass
index e5ec802..822199f 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_radiobutton.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_radiobutton.sass
@@ -17,4 +17,11 @@
//
////////////////////////////////////////////////////////////////////////////////
-.jewel.radiobutton
\ No newline at end of file
+.jewel.radiobutton
+
+@media -royale-swf
+ j|RadioButton
+ IBeadModel:
ClassReference("org.apache.royale.html.beads.models.ValueToggleButtonModel")
+ IBeadView:
ClassReference("org.apache.royale.jewel.beads.RadioButtonView")
+ //font-size: 11px
+ //font-family: Arial
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_slider.sass
b/frameworks/projects/Jewel/src/main/sass/components/_slider.sass
index eab42ff..a7440ab 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_slider.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_slider.sass
@@ -22,7 +22,7 @@
height: 30px
position: relative
-Slider
+j|Slider
IBeadModel:
ClassReference("org.apache.royale.jewel.beads.models.SliderRangeModel")
IBeadView: ClassReference("org.apache.royale.jewel.beads.SliderView")
IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalSliderLayout")
@@ -36,18 +36,7 @@ Slider
border-radius: 15px
@media -royale-swf
- Slider
+ j|Slider
iThumbView:
ClassReference("org.apache.royale.jewel.beads.SliderThumbView")
iTrackView:
ClassReference("org.apache.royale.jewel.beads.SliderTrackView")
- RadioButton
- IBeadModel:
ClassReference("org.apache.royale.html.beads.models.ValueToggleButtonModel")
- IBeadView:
ClassReference("org.apache.royale.jewel.beads.RadioButtonView")
- //font-size: 11px
- //font-family: Arial
-
- CheckBox
- IBeadModel:
ClassReference("org.apache.royale.html.beads.models.ToggleButtonModel")
- IBeadView:
ClassReference("org.apache.royale.html.beads.CheckBoxView")
- //font-size: 11px
- //font-family: Arial
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_textfield.sass
b/frameworks/projects/Jewel/src/main/sass/components/_textfield.sass
index b1e8ea3..c6252cb 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_textfield.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_textfield.sass
@@ -17,9 +17,10 @@
//
////////////////////////////////////////////////////////////////////////////////
-TextField
+.jewel.textfield
+
+j|TextField
IBeadModel:
ClassReference("org.apache.royale.html.beads.models.TextModel")
//IBeadView:
ClassReference("org.apache.royale.html.beads.TextInputWithBorderView")
//IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.EditableTextKeyboardController")
-.jewel.textfield
diff --git a/frameworks/themes/JewelTheme/pom.xml
b/frameworks/themes/JewelTheme/pom.xml
index 4eda5c7..6fcfebd 100644
--- a/frameworks/themes/JewelTheme/pom.xml
+++ b/frameworks/themes/JewelTheme/pom.xml
@@ -133,6 +133,20 @@
<type>swc</type>
<classifier>js</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
</dependencies>
</project>
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index f3f5495..d32f737 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -22,7 +22,7 @@
box-sizing: border-box;
}
-.Application {
+j|Application {
font-family: "Lato", sans-serif;
color: #808080;
}
diff --git
a/frameworks/themes/JewelTheme/src/main/resources/jeweltheme-manifest.xml
b/frameworks/themes/JewelTheme/src/main/resources/jeweltheme-manifest.xml
index 95e305d..7e844ab 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/jeweltheme-manifest.xml
+++ b/frameworks/themes/JewelTheme/src/main/resources/jeweltheme-manifest.xml
@@ -21,6 +21,6 @@
<componentPackage>
- <!-- <component id="LabelViewBead"
class="org.apache.royale.beads.views.LabelViewBead"/> -->
+ <!-- <component id="LabelViewBead"
class="org.apache.royale.jewel.beads.views.LabelViewBead"/> -->
</componentPackage>
diff --git a/frameworks/themes/JewelTheme/src/main/royale/JewelThemeClasses.as
b/frameworks/themes/JewelTheme/src/main/royale/JewelThemeClasses.as
index 433d387..c24d694 100644
--- a/frameworks/themes/JewelTheme/src/main/royale/JewelThemeClasses.as
+++ b/frameworks/themes/JewelTheme/src/main/royale/JewelThemeClasses.as
@@ -27,7 +27,7 @@ package
*/
internal class JewelThemeClasses
{
- //import org.apache.royale.jewwl.beads.views.LabelViewBead;
LabelViewBead;
+ //import org.apache.royale.jewel.beads.views.LabelViewBead;
LabelViewBead;
}
}
\ No newline at end of file
diff --git
a/frameworks/themes/JewelTheme/src/main/royale/org/apache/royale/jewel/beads/views/LabelViewBead.mxml
b/frameworks/themes/JewelTheme/src/main/royale/org/apache/royale/jewel/beads/views/LabelViewBead.mxml
index e8963bb..bd47055 100644
---
a/frameworks/themes/JewelTheme/src/main/royale/org/apache/royale/jewel/beads/views/LabelViewBead.mxml
+++
b/frameworks/themes/JewelTheme/src/main/royale/org/apache/royale/jewel/beads/views/LabelViewBead.mxml
@@ -18,7 +18,8 @@ limitations under the License.
-->
<js:MXMLBeadView xmlns:fx="http://ns.adobe.com/mxml/2009";
- xmlns:js="library://ns.apache.org/royale/basic">
+ xmlns:js="library://ns.apache.org/royale/basic"
+ xmlns:j="library://ns.apache.org/royale/jewel">
<fx:Script>
<![CDATA[
@@ -35,7 +36,7 @@ limitations under the License.
]]>
</fx:Script>
- <js:TextButton text="LABELVIEWBEAD!!"/>
+ <j:TextButton text="THEME-LABELVIEWBEAD!!"/>
<!-- <js:beads>
<js:MXMLBeadViewDataBinding />
diff --git a/frameworks/themes/JewelTheme/src/main/sass/_global.sass
b/frameworks/themes/JewelTheme/src/main/sass/_global.sass
index d5c10c1..f0a1623 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/_global.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_global.sass
@@ -26,7 +26,7 @@
-webkit-box-sizing: border-box
box-sizing: border-box
-.Application
+j|Application
font:
family: $font-stack
color: $default-font-color
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_label.sass
b/frameworks/themes/JewelTheme/src/main/sass/components/_label.sass
index 8accaa7..7887e00 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components/_label.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components/_label.sass
@@ -17,9 +17,9 @@
//
////////////////////////////////////////////////////////////////////////////////
-Label
- //iBeadView:
ClassReference("org.apache.royale.jewel.beads.views.LabelViewBead")
+j|Label
//IBeadView:
ClassReference("org.apache.royale.html.beads.TextFieldView")
+ //IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.LabelViewBead")
.jewel.label
font:
--
To stop receiving notification emails like this one, please contact
[email protected].
