This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/jewel_positioner
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/jewel_positioner by
this push:
new b48ca84 components that can remove directly positioner line according
to latest changes
b48ca84 is described below
commit b48ca84455ff30517f947a1ad8c3f744f5bcd674
Author: Carlos Rovira <[email protected]>
AuthorDate: Thu Mar 7 21:55:18 2019 +0100
components that can remove directly positioner line according to latest
changes
---
.../royale/org/apache/royale/core/StyledUIBase.as | 2 +-
.../royale/org/apache/royale/jewel/DropDownList.as | 1 -
.../royale/org/apache/royale/jewel/IconButton.as | 11 ++----
.../main/royale/org/apache/royale/jewel/Image.as | 1 -
.../royale/org/apache/royale/jewel/ImageButton.as | 1 -
.../org/apache/royale/jewel/NumericStepper.as | 1 -
.../main/royale/org/apache/royale/jewel/PopUp.as | 1 -
.../main/royale/org/apache/royale/jewel/Spinner.as | 3 +-
.../royale/org/apache/royale/jewel/ToggleButton.as | 46 +++++++++++-----------
9 files changed, 29 insertions(+), 38 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
index 35edd46..3c6604f 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
@@ -47,8 +47,8 @@ package org.apache.royale.core
*/
public function StyledUIBase()
{
- super();
classSelectorList = new ClassSelectorList(this);
+ super();
}
protected var classSelectorList:ClassSelectorList;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DropDownList.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DropDownList.as
index 9dd709c..6e403c1 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DropDownList.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DropDownList.as
@@ -284,7 +284,6 @@ package org.apache.royale.jewel
goog.events.listen(element, 'change', changeHandler);
- positioner = element;
return element;
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButton.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButton.as
index a95a2f6..f4be1a7 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButton.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButton.as
@@ -23,9 +23,8 @@ package org.apache.royale.jewel
import org.apache.royale.core.WrappedHTMLElement;
import org.apache.royale.html.util.addElementToWrapper;
}
-
- import org.apache.royale.core.IIconSupport;
import org.apache.royale.core.IIcon;
+ import org.apache.royale.core.IIconSupport;
public class IconButton extends Button implements IIconSupport
{
@@ -73,7 +72,7 @@ package org.apache.royale.jewel
{
_text = value;
textNode.nodeValue = value;
- this.dispatchEvent('textChange');
+ this.dispatchEvent(new Event('textChange'));
}
}
@@ -98,8 +97,8 @@ package org.apache.royale.jewel
COMPILE::SWF
{
- classSelectorList.toggle("icon", (_icon != null));
- // todo set up icon on swf
+ classSelectorList.toggle("icon", (_icon != null));
+ // todo set up icon on swf
}
}
@@ -155,8 +154,6 @@ package org.apache.royale.jewel
textNode = document.createTextNode(_text) as Text;
element.appendChild(textNode);
- positioner = element;
-
return element;
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Image.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Image.as
index ebd02b4..e9e1bc8 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Image.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Image.as
@@ -59,7 +59,6 @@ package org.apache.royale.jewel
override protected function createElement():WrappedHTMLElement
{
addElementToWrapper(this, 'img');
- positioner = element;
return element;
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ImageButton.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ImageButton.as
index 31501ac..8706969 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ImageButton.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ImageButton.as
@@ -62,7 +62,6 @@ package org.apache.royale.jewel
{
addElementToWrapper(this, 'input');
element.setAttribute('type', 'image');
- positioner = element;
return element;
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/NumericStepper.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/NumericStepper.as
index 33e33ac..954a335 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/NumericStepper.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/NumericStepper.as
@@ -184,7 +184,6 @@ package org.apache.royale.jewel
override protected function createElement():WrappedHTMLElement
{
addElementToWrapper(this, 'div');
- positioner = element;
return element;
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/PopUp.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/PopUp.as
index c95742b..9c6e9f8 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/PopUp.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/PopUp.as
@@ -151,7 +151,6 @@ package org.apache.royale.jewel
override protected function createElement():WrappedHTMLElement
{
addElementToWrapper(this, 'div');
- positioner = element;
return element;
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spinner.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spinner.as
index dd9f982..0c40525 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spinner.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spinner.as
@@ -175,8 +175,7 @@ package org.apache.royale.jewel
override protected function createElement():WrappedHTMLElement
{
addElementToWrapper(this,'div');
- positioner = element;
- return element;
+ return element;
}
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButton.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButton.as
index eb2f6d5..ce244d7 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButton.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButton.as
@@ -84,7 +84,7 @@ package org.apache.royale.jewel
COMPILE::SWF
{
- addEventListener(MouseEvent.CLICK, internalMouseHandler);
+ addEventListener(MouseEvent.CLICK, internalMouseHandler);
}
}
@@ -103,11 +103,11 @@ package org.apache.royale.jewel
{
COMPILE::SWF
{
- return IToggleButtonModel(model).selected;
+ return IToggleButtonModel(model).selected;
}
COMPILE::JS
{
- return _selected;
+ return _selected;
}
}
@@ -118,18 +118,18 @@ package org.apache.royale.jewel
{
COMPILE::SWF
{
- IToggleButtonModel(model).selected = value;
- internalSelected();
- dispatchEvent(new Event(Event.CHANGE));
+ IToggleButtonModel(model).selected = value;
+ internalSelected();
+ dispatchEvent(new Event(Event.CHANGE));
}
COMPILE::JS
{
- if (_selected != value)
- {
- _selected = value;
- internalSelected();
- dispatchEvent(new Event(Event.CHANGE));
- }
+ if (_selected != value)
+ {
+ _selected = value;
+ internalSelected();
+ dispatchEvent(new Event(Event.CHANGE));
+ }
}
}
@@ -181,17 +181,17 @@ package org.apache.royale.jewel
{
COMPILE::SWF
{
- if(!savedClassName == null)
- savedClassName = className;
- var name:String = savedClassName;
- if (selected)
- {
- className = "selected" + (name ? " " + name : "");
- }
- else
- {
- className = (name ? " " + name : "");
- }
+ if(!savedClassName == null)
+ savedClassName = className;
+ var name:String = savedClassName;
+ if (selected)
+ {
+ className = "selected" + (name ? " " + name : "");
+ }
+ else
+ {
+ className = (name ? " " + name : "");
+ }
}
var isToggleTextButtonSelected:Boolean = containsClass("selected");
