Repository: flex-asjs Updated Branches: refs/heads/develop 5f3c1015b -> b68a3f9f0
Renamed InnerText to InnerHTML Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b68a3f9f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b68a3f9f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b68a3f9f Branch: refs/heads/develop Commit: b68a3f9f045448cd4c42bf09287ee6e1d2393fc7 Parents: 5f3c101 Author: Carlos Rovira <[email protected]> Authored: Sun Dec 11 10:03:27 2016 +0100 Committer: Carlos Rovira <[email protected]> Committed: Sun Dec 11 10:03:27 2016 +0100 ---------------------------------------------------------------------- .../flexjs/MDLExample/src/main/flex/Cards.mxml | 6 +- .../org/apache/flex/html/beads/InnerHTML.as | 98 ++++++++++++++++++++ .../org/apache/flex/html/beads/InnerText.as | 98 -------------------- .../HTML/src/main/resources/basic-manifest.xml | 2 +- 4 files changed, 102 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b68a3f9f/examples/flexjs/MDLExample/src/main/flex/Cards.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/Cards.mxml b/examples/flexjs/MDLExample/src/main/flex/Cards.mxml index 72296cd..df0763e 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Cards.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Cards.mxml @@ -30,11 +30,11 @@ limitations under the License. </mdl:CardTitle> <mdl:CardSupportingText> <js:beads> - <js:InnerText> + <js:InnerHTML> <![CDATA[ Lorem ipsum dolor sit <b>amet</b>, consectetur <i>adipiscing elit</i>. Mauris sagittis pellentesque lacus eleifend lacinia... ]]> - </js:InnerText> + </js:InnerHTML> </js:beads> </mdl:CardSupportingText> <mdl:CardActions border="true"> @@ -53,7 +53,7 @@ limitations under the License. </mdl:CardTitle> <mdl:CardSupportingText> <js:beads> - <js:InnerText text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenan convallis."/> + <js:InnerHTML text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenan convallis."/> </js:beads> </mdl:CardSupportingText> <mdl:CardActions border="true"> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b68a3f9f/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/InnerHTML.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/InnerHTML.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/InnerHTML.as new file mode 100644 index 0000000..1deb588 --- /dev/null +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/InnerHTML.as @@ -0,0 +1,98 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to You under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +//////////////////////////////////////////////////////////////////////////////// +package org.apache.flex.html.beads +{ + import org.apache.flex.core.IBead; + import org.apache.flex.core.IStrand; + import org.apache.flex.core.UIBase; + + [DefaultProperty("text")] + + /** + * The InnerText bead class adds innetHTML text to a html tag. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public class InnerHTML implements IBead + { + /** + * constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function InnerHTML() + { + super(); + } + + private var _text:String = null; + + /** + * The text of the heading + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get text():String + { + return _text; + } + + public function set text(value:String):void + { + _text = value; + } + + private var host:UIBase; + + private var _strand:IStrand; + /** + * @copy org.apache.flex.core.IBead#strand + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + * @flexjsignorecoercion org.apache.flex.mdl.TextInput; + */ + public function set strand(value:IStrand):void + { + _strand = value; + + host = value as UIBase; + + if(_text != null && _text != "" && host != null) + { + COMPILE::JS + { + var e:HTMLElement = host.element as HTMLElement; + e.innerHTML = _text; + } + } + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b68a3f9f/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/InnerText.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/InnerText.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/InnerText.as deleted file mode 100644 index fe1097d..0000000 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/InnerText.as +++ /dev/null @@ -1,98 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -//////////////////////////////////////////////////////////////////////////////// -package org.apache.flex.html.beads -{ - import org.apache.flex.core.IBead; - import org.apache.flex.core.IStrand; - import org.apache.flex.core.UIBase; - - [DefaultProperty("text")] - - /** - * The InnerText bead class adds innetHTML text to a html tag. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public class InnerText implements IBead - { - /** - * constructor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function InnerText() - { - super(); - } - - private var _text:String = null; - - /** - * The text of the heading - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get text():String - { - return _text; - } - - public function set text(value:String):void - { - _text = value; - } - - private var host:UIBase; - - private var _strand:IStrand; - /** - * @copy org.apache.flex.core.IBead#strand - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - * @flexjsignorecoercion org.apache.flex.mdl.TextInput; - */ - public function set strand(value:IStrand):void - { - _strand = value; - - host = value as UIBase; - - if(_text != null && _text != "" && host != null) - { - COMPILE::JS - { - var e:HTMLElement = host.element as HTMLElement; - e.innerHTML = _text; - } - } - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b68a3f9f/frameworks/projects/HTML/src/main/resources/basic-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/resources/basic-manifest.xml b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml index 443e42b..aeb558d 100644 --- a/frameworks/projects/HTML/src/main/resources/basic-manifest.xml +++ b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml @@ -151,6 +151,6 @@ <component id="Ul" class="org.apache.flex.html.Ul" /> <component id="Li" class="org.apache.flex.html.Li" /> - <component id="InnerText" class="org.apache.flex.html.beads.InnerText" /> + <component id="InnerHTML" class="org.apache.flex.html.beads.InnerHTML" /> </componentPackage>
