This is an automated email from the ASF dual-hosted git repository. harbs 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 1689270 Changed default as coercion in HTML project 1689270 is described below commit 1689270250e11179a65f978da8cd4c02d1d79b28 Author: Harbs <ha...@in-tools.com> AuthorDate: Sat Nov 25 23:29:37 2017 +0200 Changed default as coercion in HTML project Input should use “value” instead of “text” --- frameworks/js/projects/HTMLJS/build.xml | 1 + frameworks/projects/HTML/build.xml | 1 + .../src/main/royale/org/apache/royale/html/A.as | 4 --- .../src/main/royale/org/apache/royale/html/Code.as | 4 --- .../src/main/royale/org/apache/royale/html/H1.as | 4 --- .../src/main/royale/org/apache/royale/html/H2.as | 4 --- .../src/main/royale/org/apache/royale/html/H3.as | 4 --- .../src/main/royale/org/apache/royale/html/H4.as | 4 --- .../src/main/royale/org/apache/royale/html/H5.as | 4 --- .../src/main/royale/org/apache/royale/html/H6.as | 4 --- .../src/main/royale/org/apache/royale/html/I.as | 4 --- .../main/royale/org/apache/royale/html/Input.as | 31 ++++++++++------------ .../src/main/royale/org/apache/royale/html/Li.as | 4 --- .../src/main/royale/org/apache/royale/html/Ol.as | 3 --- .../main/royale/org/apache/royale/html/Option.as | 4 --- .../src/main/royale/org/apache/royale/html/P.as | 3 --- .../src/main/royale/org/apache/royale/html/PRE.as | 3 --- .../main/royale/org/apache/royale/html/Select.as | 4 --- .../src/main/royale/org/apache/royale/html/Span.as | 3 --- .../src/main/royale/org/apache/royale/html/Td.as | 3 --- .../main/royale/org/apache/royale/html/TextNode.as | 3 --- .../src/main/royale/org/apache/royale/html/Th.as | 3 --- .../src/main/royale/org/apache/royale/html/Ul.as | 3 --- .../org/apache/royale/html/beads/InnerHTML.as | 1 - frameworks/projects/TLF/build.xml | 1 + 25 files changed, 17 insertions(+), 90 deletions(-) diff --git a/frameworks/js/projects/HTMLJS/build.xml b/frameworks/js/projects/HTMLJS/build.xml index a37e7f5..a863a8a 100644 --- a/frameworks/js/projects/HTMLJS/build.xml +++ b/frameworks/js/projects/HTMLJS/build.xml @@ -59,6 +59,7 @@ <jvmarg value="-Droyalelib=${ROYALE_HOME}/frameworks" /> <arg value="+royalelib=${ROYALE_HOME}/frameworks" /> <arg value="-compiler.strict-xml=true" /> + <arg value="-js-output-optimization=skipAsCoercions"/> <arg value="-compiler.targets=SWF,JSRoyale" /> <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${ROYALE_HOME}/frameworks/js-config.xml" /> diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml index 83c450e..1b395cf 100644 --- a/frameworks/projects/HTML/build.xml +++ b/frameworks/projects/HTML/build.xml @@ -88,6 +88,7 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-compiler.strict-xml=true" /> + <arg value="-js-output-optimization=skipAsCoercions"/> <arg value="-compiler.targets=SWF,JSRoyale" /> <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${basedir}/src/main/config/compile-swf-config.xml" /> diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/A.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/A.as index 140d738..6d42078 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/A.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/A.as @@ -105,10 +105,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - * @royaleignorecoercion HTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Code.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Code.as index 9e6e332..647390c 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Code.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Code.as @@ -81,10 +81,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - * @royaleignorecoercion HTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H1.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H1.as index 7098b48..a73ba30 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H1.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H1.as @@ -88,10 +88,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - * @royaleignorecoercion HTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H2.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H2.as index ea5574f..ef6ce0c 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H2.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H2.as @@ -88,10 +88,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - * @royaleignorecoercion HTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H3.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H3.as index 1e37845..9767474 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H3.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H3.as @@ -88,10 +88,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - * @royaleignorecoercion HTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H4.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H4.as index 3003278..f2b94f4 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H4.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H4.as @@ -88,10 +88,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - * @royaleignorecoercion HTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H5.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H5.as index 1497380..0861229 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H5.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H5.as @@ -88,10 +88,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - * @royaleignorecoercion HTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H6.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H6.as index 47e3b32..12e498a 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H6.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/H6.as @@ -88,10 +88,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - * @royaleignorecoercion HTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/I.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/I.as index ec38406..40509b9 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/I.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/I.as @@ -88,10 +88,6 @@ package org.apache.royale.html COMPILE::JS private var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - * @royaleignorecoercion HTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Input.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Input.as index e9d245f..689ed9f 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Input.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Input.as @@ -54,14 +54,14 @@ package org.apache.royale.html private var _text:String = ""; /** - * The text of the element + * The current value of the control * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 - * @productversion Royale 0.0 + * @productversion Royale 0.9 */ - public function get text():String + public function get value():String { COMPILE::SWF { @@ -69,11 +69,11 @@ package org.apache.royale.html } COMPILE::JS { - return textNode.nodeValue; + return (element as HTMLInputElement).value; } } - public function set text(value:String):void + public function set value(value:String):void { COMPILE::SWF { @@ -81,11 +81,19 @@ package org.apache.royale.html } COMPILE::JS { - textNode.nodeValue = value; + (element as HTMLInputElement).value = value; } } private var _type:String; + /** + * The input type + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion Royale 0.9 + */ public function get type():String { return _type; @@ -101,22 +109,11 @@ package org.apache.royale.html } COMPILE::JS - private var textNode:Text; - - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - * @royaleignorecoercion HTMLElement - */ - COMPILE::JS override protected function createElement():WrappedHTMLElement { addElementToWrapper(this,'input'); if(_type) element.setAttribute('type', _type); - - textNode = document.createTextNode('') as Text; - element.appendChild(textNode); - return element; } } diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Li.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Li.as index c2aab3c..abd88df 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Li.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Li.as @@ -49,10 +49,6 @@ package org.apache.royale.html super(); } - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - * @royaleignorecoercion HTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Ol.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Ol.as index 2e8a122..793fa32 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Ol.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Ol.as @@ -49,9 +49,6 @@ package org.apache.royale.html super(); } - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Option.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Option.as index 51643b5..1100efd 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Option.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Option.as @@ -88,10 +88,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - * @royaleignorecoercion HTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/P.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/P.as index c90dfce..4324751 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/P.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/P.as @@ -106,9 +106,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/PRE.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/PRE.as index 08bf64f..14b106a 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/PRE.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/PRE.as @@ -106,9 +106,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.flex.core.WrappedHTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Select.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Select.as index a7849f9..a9d80ab 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Select.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Select.as @@ -51,10 +51,6 @@ package org.apache.royale.html super(); } - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - * @royaleignorecoercion HTMLSelectElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Span.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Span.as index 6b255ed..ab286b6 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Span.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Span.as @@ -82,9 +82,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Td.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Td.as index 9686abf..122f4b1 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Td.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Td.as @@ -82,9 +82,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/TextNode.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/TextNode.as index 37f0852..23ac5d5 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/TextNode.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/TextNode.as @@ -81,9 +81,6 @@ package org.apache.royale.html COMPILE::JS private var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Th.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Th.as index f3dc5d3..10232a8 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Th.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Th.as @@ -82,9 +82,6 @@ package org.apache.royale.html COMPILE::JS protected var textNode:Text; - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Ul.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Ul.as index de3da40..fd4d303 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Ul.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/Ul.as @@ -49,9 +49,6 @@ package org.apache.royale.html super(); } - /** - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement - */ COMPILE::JS override protected function createElement():WrappedHTMLElement { diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/beads/InnerHTML.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/beads/InnerHTML.as index dedb86c..836bd04 100644 --- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/beads/InnerHTML.as +++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/beads/InnerHTML.as @@ -81,7 +81,6 @@ package org.apache.royale.html.beads * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion Royale 0.0 - * @royaleignorecoercion org.apache.royale.mdl.TextInput; */ public function set strand(value:IStrand):void { diff --git a/frameworks/projects/TLF/build.xml b/frameworks/projects/TLF/build.xml index 191c460..8e1260b 100644 --- a/frameworks/projects/TLF/build.xml +++ b/frameworks/projects/TLF/build.xml @@ -88,6 +88,7 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-compiler.strict-xml=true" /> + <arg value="-js-output-optimization=skipAsCoercions"/> <arg value="-compiler.targets=SWF,JSRoyale" /> <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${basedir}/src/main/config/compile-swf-config.xml" /> -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].