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
commit 9a92912f43582ce6dd4abb46a107a3cd05ae6bd9 Author: Carlos Rovira <[email protected]> AuthorDate: Wed Mar 6 23:49:27 2019 +0100 start the positioner refactor --- .../royale/org/apache/royale/core/StyledUIBase.as | 23 +++------------------- .../main/royale/org/apache/royale/jewel/Button.as | 23 ++++++++++------------ .../main/royale/org/apache/royale/jewel/Label.as | 8 +++----- 3 files changed, 16 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 70a8dd6..35edd46 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 @@ -18,14 +18,13 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.royale.core { - import org.apache.royale.utils.ClassSelectorList; - import org.apache.royale.utils.IClassSelectorListSupport; - COMPILE::JS { import org.apache.royale.core.WrappedHTMLElement; import org.apache.royale.html.util.addElementToWrapper; } + import org.apache.royale.utils.ClassSelectorList; + import org.apache.royale.utils.IClassSelectorListSupport; /** * The StyledUIBase is the base class for UIBase components that makes @@ -48,23 +47,8 @@ package org.apache.royale.core */ public function StyledUIBase() { - classSelectorList = new ClassSelectorList(this); super(); - } - - COMPILE::JS - private var _positioner:WrappedHTMLElement; - - COMPILE::JS - override public function get positioner():WrappedHTMLElement - { - return _positioner; - } - - COMPILE::JS - override public function set positioner(value:WrappedHTMLElement):void - { - _positioner = value; + classSelectorList = new ClassSelectorList(this); } protected var classSelectorList:ClassSelectorList; @@ -164,7 +148,6 @@ package org.apache.royale.core 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/Button.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as index 9ac3a2d..01dc0f0 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as @@ -18,24 +18,23 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.royale.jewel { - import org.apache.royale.utils.ClassSelectorList; - import org.apache.royale.core.ITextModel; - import org.apache.royale.core.IStrand; - import org.apache.royale.core.IUIBase; - import org.apache.royale.events.IEventDispatcher; - COMPILE::SWF { import org.apache.royale.core.UIButtonBase; - import org.apache.royale.utils.IClassSelectorListSupport; + import org.apache.royale.utils.IClassSelectorListSupport; } COMPILE::JS { - import org.apache.royale.core.WrappedHTMLElement; import org.apache.royale.core.StyledUIBase; + import org.apache.royale.core.WrappedHTMLElement; import org.apache.royale.html.util.addElementToWrapper; } + import org.apache.royale.core.IStrand; + import org.apache.royale.core.ITextModel; + import org.apache.royale.core.IUIBase; + import org.apache.royale.events.IEventDispatcher; + import org.apache.royale.utils.ClassSelectorList; //-------------------------------------- // Events @@ -393,7 +392,7 @@ package org.apache.royale.jewel public function set text(value:String):void { (element as HTMLButtonElement).innerHTML = value; - this.dispatchEvent('textChange'); + this.dispatchEvent(new Event('textChange')); } [Bindable("htmlChange")] @@ -416,7 +415,7 @@ package org.apache.royale.jewel public function set html(value:String):void { (element as HTMLButtonElement).innerHTML = value; - this.dispatchEvent('textChange'); + this.dispatchEvent(new Event('textChange')); } private var _emphasis:String; @@ -458,9 +457,7 @@ package org.apache.royale.jewel { addElementToWrapper(this, 'button'); element.setAttribute('type', 'button'); - positioner = element; - - + return element; } } 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 d97a92a..19531f3 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 @@ -112,7 +112,7 @@ package org.apache.royale.jewel { _text = value; textNode.nodeValue = value; - this.dispatchEvent('textChange'); + dispatchEvent(new Event('textChange')); } } @@ -150,8 +150,8 @@ package org.apache.royale.jewel } COMPILE::JS { - this.element.innerHTML = value; - this.dispatchEvent('textChange'); + element.innerHTML = value; + dispatchEvent(new Event('textChange')); } } @@ -201,8 +201,6 @@ package org.apache.royale.jewel textNode = document.createTextNode(_text) as Text; element.appendChild(textNode); - positioner = element; - return element; }
