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 2018/06/09 06:00:04 UTC
[royale-asjs] branch develop updated: all jewel components extend
StyledUIBase
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 dba49ec all jewel components extend StyledUIBase
dba49ec is described below
commit dba49eca3080945f14c12ed08457ee572f76fd2f
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat Jun 9 07:59:50 2018 +0200
all jewel components extend StyledUIBase
---
.../royale/org/apache/royale/jewel/Application.as | 6 +++---
.../main/royale/org/apache/royale/jewel/CheckBox.as | 19 +++++++------------
.../src/main/royale/org/apache/royale/jewel/Label.as | 16 +++-------------
.../royale/org/apache/royale/jewel/RadioButton.as | 13 ++-----------
.../src/main/royale/org/apache/royale/jewel/Slider.as | 16 +++-------------
5 files changed, 18 insertions(+), 52 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
index d2fcbc6..85f5d7d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
@@ -392,9 +392,9 @@ package org.apache.royale.jewel
*/
public function generateMXMLAttributes(data:Array):void
{
- // move the initialView to be the last thing to be
- // the last thing instantiated so all other properties
- // are set up first. This more closely mimics the
+ // move the initialView to be the last thing
+ // instantiated so all other properties
+ // are set up first. This more closely mimics the
// Flex timing
var propCount:int = data[0];
var n:int = data.length;
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
index 709fdd6..b1d19ea 100644
--- 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
@@ -19,9 +19,9 @@
package org.apache.royale.jewel
{
import org.apache.royale.core.IToggleButtonModel;
- import org.apache.royale.utils.ClassSelectorList;
import org.apache.royale.events.Event;
import org.apache.royale.jewel.supportClasses.CheckBoxIcon;
+ import org.apache.royale.utils.ClassSelectorList;
COMPILE::SWF
{
@@ -35,7 +35,7 @@ package org.apache.royale.jewel
{
import org.apache.royale.core.WrappedHTMLElement;
import org.apache.royale.html.util.addElementToWrapper;
- import org.apache.royale.core.UIBase;
+ import org.apache.royale.core.StyledUIBase;
}
//--------------------------------------
@@ -77,9 +77,13 @@ package org.apache.royale.jewel
{
super();
+ classSelectorList = new ClassSelectorList(this);
+
addEventListener(org.apache.royale.events.MouseEvent.CLICK, internalMouseHandler);
}
+ protected var classSelectorList:ClassSelectorList;
+
/**
* The text label for the CheckBox.
*
@@ -157,7 +161,7 @@ package org.apache.royale.jewel
* @productversion Royale 0.9.3
*/
COMPILE::JS
- public class CheckBox extends UIBase
+ public class CheckBox extends StyledUIBase
{
/**
* Constructor.
@@ -171,18 +175,9 @@ package org.apache.royale.jewel
{
super();
- classSelectorList = new ClassSelectorList(this);
typeNames = "jewel checkbox";
}
- protected var classSelectorList:ClassSelectorList;
-
- COMPILE::JS
- override protected function setClassName(value:String):void
- {
- classSelectorList.addNames(value);
- }
-
private var _label:WrappedHTMLElement;
private var _icon:CheckBoxIcon;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Label.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Label.as
index 17c9d8e..dff96bc 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Label.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Label.as
@@ -19,11 +19,10 @@
package org.apache.royale.jewel
{
import org.apache.royale.core.ITextModel;
- import org.apache.royale.core.UIBase;
+ import org.apache.royale.core.StyledUIBase;
import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.utils.ClassSelectorList;
COMPILE::JS
{
import org.apache.royale.core.WrappedHTMLElement;
@@ -58,7 +57,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public class Label extends UIBase
+ public class Label extends StyledUIBase
{
/**
* Constructor.
@@ -71,18 +70,9 @@ package org.apache.royale.jewel
public function Label()
{
super();
- classSelectorList = new ClassSelectorList(this);
typeNames = "jewel label";
}
- protected var classSelectorList:ClassSelectorList;
-
- COMPILE::JS
- override protected function setClassName(value:String):void
- {
- classSelectorList.addNames(value);
- }
-
COMPILE::JS
protected var textNode:Text;
@@ -188,7 +178,7 @@ package org.apache.royale.jewel
if (_multiline != value)
{
_multiline = value;
- classSelectorList.toggle("multiline", _multiline);
+ toggleClass("multiline", _multiline);
}
}
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
index 4874d10..01a4e7f 100644
--- 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
@@ -32,7 +32,7 @@ package org.apache.royale.jewel
COMPILE::JS
{
- import org.apache.royale.core.UIBase;
+ import org.apache.royale.core.StyledUIBase;
import org.apache.royale.core.WrappedHTMLElement;
import org.apache.royale.html.util.addElementToWrapper;
}
@@ -286,7 +286,7 @@ package org.apache.royale.jewel
* @productversion Royale 0.9.3
*/
COMPILE::JS
- public class RadioButton extends UIBase
+ public class RadioButton extends StyledUIBase
{
/**
* Constructor.
@@ -300,17 +300,8 @@ package org.apache.royale.jewel
{
super();
- classSelectorList = new ClassSelectorList(this);
typeNames = "jewel radiobutton";
}
-
- protected var classSelectorList:ClassSelectorList;
-
- COMPILE::JS
- override protected function setClassName(value:String):void
- {
- classSelectorList.addNames(value);
- }
/**
* Provides unique name
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
index 707a8fe..adc6fa0 100644
--- 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
@@ -19,9 +19,8 @@
package org.apache.royale.jewel
{
import org.apache.royale.core.IRangeModel;
- import org.apache.royale.core.UIBase;
+ import org.apache.royale.core.StyledUIBase;
import org.apache.royale.events.Event;
- import org.apache.royale.utils.ClassSelectorList;
COMPILE::JS
{
@@ -79,7 +78,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public class Slider extends UIBase
+ public class Slider extends StyledUIBase
{
/**
* constructor.
@@ -93,8 +92,7 @@ package org.apache.royale.jewel
{
super();
- classSelectorList = new ClassSelectorList(this);
- typeNames = "jewel slider";
+ typeNames = "jewel slider";
IRangeModel(model).value = 0;
IRangeModel(model).minimum = 0;
@@ -103,8 +101,6 @@ package org.apache.royale.jewel
IRangeModel(model).snapInterval = 1;
}
- protected var classSelectorList:ClassSelectorList;
-
/**
* The current value of the Slider.
*
@@ -229,11 +225,5 @@ package org.apache.royale.jewel
return element;
}
-
- COMPILE::JS
- override protected function setClassName(value:String):void
- {
- classSelectorList.addNames(value);
- }
}
}
--
To stop receiving notification emails like this one, please contact
carlosrovira@apache.org.