removes workaround for element styles thanks to bugs apache/royale-co…

…mpiler#30 and apache/royale-compiler#32 solved
apache · Mar 27, 2018 · df9808d · df9808d
1 parent 5540a9c
commit df9808d
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 39 deletions.
diff --git a/examples/royale/JewelExample/src/main/resources/jewel-example-styles.css b/examples/royale/JewelExample/src/main/resources/jewel-example-styles.css
@@ -21,10 +21,13 @@
 
 @namespace "http://www.w3.org/1999/xhtml";
 
-
+body{
+    background: #fff; 
+}
 
 .container {
     background: #efefef;
     border-radius: 10px;
     padding: 20px;
-}
+}
+
diff --git a/examples/royale/JewelExample/src/main/royale/RadioButtonPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/RadioButtonPlayGround.mxml
@@ -30,7 +30,7 @@ limitations under the License.
 	<html:H3 text="Jewel RadioButton"/>
 
 	<j:RadioButton text="RadioButton 1" groupName="radios" value="Test 1"/>
-	<j:RadioButton text="RadioButton 2" groupName="radios" value="Test 2"/>
+	<j:RadioButton text="RadioButton 2" groupName="radios" value="Test 2" selected="true"/>
 	<j:RadioButton text="RadioButton 3" groupName="radios" value="Test 3"/>
 
 	<j:RadioButton text="Disabled">

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/CheckBox.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/CheckBox.as
@@ -99,11 +99,11 @@ package org.apache.royale.jewel
 
             input = addElementToWrapper(this,'input') as HTMLInputElement;
             input.type = 'checkbox';    
-            input.className = 'input';
+            //input.className = 'input';
             label.appendChild(input);
 
             checkbox = document.createElement('span') as HTMLSpanElement;
-            checkbox.className = 'span';
+            //checkbox.className = 'span';
             label.appendChild(checkbox);
 
             positioner = label as WrappedHTMLElement;

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/RadioButton.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/RadioButton.as
@@ -316,14 +316,14 @@ package org.apache.royale.jewel
 
             icon = addElementToWrapper(this,'input') as HTMLInputElement;
             icon.type = "radio";
-            icon.className = 'input';
+            //icon.className = 'input';
             icon.id = '_radio_' + + Math.random();
             label.appendChild(icon);
 
             textNode = document.createTextNode('') as Text;
 
             radio = document.createElement('span') as HTMLSpanElement;
-            radio.className = 'span';
+            //radio.className = 'span';
             radio.appendChild(textNode);
             label.appendChild(radio);
             //radio.addEventListener('mouseover', mouseOverHandler, false);

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Slider.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Slider.as
@@ -184,7 +184,7 @@ package org.apache.royale.jewel
 
             var input:HTMLInputElement = addElementToWrapper(this,'input') as HTMLInputElement;
             input.setAttribute('type', 'range');
-			input.className = "slider";
+			//input.className = "slider";
 
 			//attach input handler to dispatch royale change event when user write in textinput
             //goog.events.listen(element, 'change', killChangeHandler);

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextField.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextField.as
@@ -82,7 +82,7 @@ package org.apache.royale.jewel
 
             input = addElementToWrapper(this,'input') as HTMLInputElement;
             input.setAttribute('type', 'text');
-            input.className = "input";
+            //input.className = "input";
 
             //attach input handler to dispatch royale change event when user write in textinput
             //goog.events.listen(element, 'change', killChangeHandler);

diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_checkbox.sass b/frameworks/themes/JewelTheme/src/main/sass/components/_checkbox.sass
@@ -39,7 +39,7 @@ $checkbox-label-font-size: 16px
     height: $checkbox-button-size
 
     // -- INPUT
-    .input
+    input
         +appear(none)
         cursor: pointer
         display: inline-block
@@ -102,7 +102,7 @@ $checkbox-label-font-size: 16px
                 //background: $disabled-color
     
     // -- LABEL
-    .span
+    span
         cursor: pointer
         position: absolute
         margin: 0

diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_radiobutton.sass b/frameworks/themes/JewelTheme/src/main/sass/components/_radiobutton.sass
@@ -39,7 +39,7 @@ $radiobutton-label-font-size: 16px
     height: $radiobutton-button-size
 
     // -- INPUT
-    .input
+    input
         +appear(none)
         cursor: pointer
         display: inline-block
@@ -93,7 +93,7 @@ $radiobutton-label-font-size: 16px
                 background-attachment: fixed
 
     // -- LABEL
-    .span
+    span
         cursor: pointer
         position: absolute
         margin: 0

diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_slider.sass b/frameworks/themes/JewelTheme/src/main/sass/components/_slider.sass
@@ -19,7 +19,7 @@
 
 .jewel.slider
 
-    .slider
+    input
         -webkit-appearance: none
         width: 100%
         height: 15px

diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_textfield.sass b/frameworks/themes/JewelTheme/src/main/sass/components/_textfield.sass
@@ -32,7 +32,7 @@ $textfield-border-radius: 3px
 	position: relative
 	display: inline-flex
 
-	.input
+	input
 		margin: $textfield-margin
 		padding: $textfield-padding