Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5E50E200BF2 for ; Mon, 19 Dec 2016 03:05:48 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5CBC5160B36; Mon, 19 Dec 2016 02:05:48 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 19904160B30 for ; Mon, 19 Dec 2016 03:05:45 +0100 (CET) Received: (qmail 63926 invoked by uid 500); 19 Dec 2016 02:05:45 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 63918 invoked by uid 99); 19 Dec 2016 02:05:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Dec 2016 02:05:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D91B5DFB01; Mon, 19 Dec 2016 02:05:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: carlosrovira@apache.org To: commits@flex.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: [flex-asjs] [refs/heads/develop] - Change MaterialIcon from bead to normal component so it could be placed in MXML and support ordering between the rest of other elements Date: Mon, 19 Dec 2016 02:05:44 +0000 (UTC) archived-at: Mon, 19 Dec 2016 02:05:48 -0000 Repository: flex-asjs Updated Branches: refs/heads/develop 543939783 -> 35c462084 Change MaterialIcon from bead to normal component so it could be placed in MXML and support ordering between the rest of other elements Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/35c46208 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/35c46208 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/35c46208 Branch: refs/heads/develop Commit: 35c4620840358c9982afa08b8f757858a246fc0a Parents: 5439397 Author: Carlos Rovira Authored: Mon Dec 19 03:05:40 2016 +0100 Committer: Carlos Rovira Committed: Mon Dec 19 03:05:40 2016 +0100 ---------------------------------------------------------------------- .../MDLExample/src/main/flex/Buttons.mxml | 8 ++- .../flexjs/MDLExample/src/main/flex/Cards.mxml | 8 +-- .../flexjs/MDLExample/src/main/flex/Chips.mxml | 18 ++++-- .../src/main/flex/MainNavigation.mxml | 6 +- .../ActorNameAndIconListItemRenderer.mxml | 2 +- .../AvatarAndActionListItemRenderer.mxml | 5 +- ...vatarAndActionThreeLineListItemRenderer.mxml | 4 +- .../AvatarAndActionTwoLineListItemRenderer.mxml | 7 +- .../src/main/flex/org/apache/flex/html/A.as | 41 +++++------- .../src/main/flex/org/apache/flex/html/Span.as | 4 +- .../src/main/flex/org/apache/flex/mdl/Button.as | 26 +++++++- .../main/flex/org/apache/flex/mdl/ButtonChip.as | 68 ++++++++++++-------- .../src/main/flex/org/apache/flex/mdl/Chip.as | 67 ++++++++++--------- .../org/apache/flex/mdl/beads/DeletableChip.as | 11 ++-- .../apache/flex/mdl/beads/DeletableLinkChip.as | 11 ++-- .../mdl/beads/materialIcons/MaterialIconAdd.as | 52 --------------- .../beads/materialIcons/MaterialIconCancel.as | 52 --------------- .../beads/materialIcons/MaterialIconEvent.as | 52 --------------- .../beads/materialIcons/MaterialIconPerson.as | 52 --------------- .../beads/materialIcons/MaterialIconShare.as | 52 --------------- .../mdl/beads/materialIcons/MaterialIconStar.as | 52 --------------- .../beads/materialIcons/MaterialIconsType.as | 30 --------- .../flex/mdl/materialIcons/MaterialIconAdd.as | 52 +++++++++++++++ .../mdl/materialIcons/MaterialIconCancel.as | 52 +++++++++++++++ .../flex/mdl/materialIcons/MaterialIconEvent.as | 52 +++++++++++++++ .../flex/mdl/materialIcons/MaterialIconFace.as | 52 +++++++++++++++ .../mdl/materialIcons/MaterialIconMoreVert.as | 52 +++++++++++++++ .../mdl/materialIcons/MaterialIconPerson.as | 52 +++++++++++++++ .../flex/mdl/materialIcons/MaterialIconShare.as | 52 +++++++++++++++ .../flex/mdl/materialIcons/MaterialIconStar.as | 52 +++++++++++++++ .../flex/mdl/materialIcons/MaterialIconsType.as | 32 +++++++++ .../flex/mdl/supportClasses/MaterialIconBase.as | 62 ++++++++---------- .../src/main/resources/mdl-manifest.xml | 14 ++-- 33 files changed, 651 insertions(+), 501 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml index e06bde7..d9a2adb 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml @@ -33,16 +33,20 @@ limitations under the License. - + + + - face + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/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 6e3b75b..6369d42 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Cards.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Cards.mxml @@ -40,9 +40,9 @@ limitations under the License. - + - + @@ -77,11 +77,9 @@ limitations under the License. - - - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/examples/flexjs/MDLExample/src/main/flex/Chips.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/Chips.mxml b/examples/flexjs/MDLExample/src/main/flex/Chips.mxml index 1664ace..facc5a9 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Chips.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Chips.mxml @@ -29,17 +29,21 @@ limitations under the License. - + + + - + + + @@ -57,18 +61,22 @@ limitations under the License. - + + + - + - + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml index ed39a99..632c332 100644 --- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml @@ -67,7 +67,7 @@ limitations under the License. - + @@ -109,7 +109,9 @@ limitations under the License. - more_vert + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml index 423e35d..67a22bd 100644 --- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml @@ -41,8 +41,8 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml index 40b8163..6f932c9 100644 --- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml @@ -41,16 +41,15 @@ limitations under the License. - + - + - http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml index da139f3..1193d91 100644 --- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml @@ -42,8 +42,8 @@ limitations under the License. - + @@ -59,8 +59,8 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml index 1c4badd..9f3e577 100644 --- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml @@ -71,13 +71,10 @@ limitations under the License. - + - - - - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as index fd8f9b5..6b080db 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html { - import org.apache.flex.core.UIBase; + import org.apache.flex.core.ContainerBase; COMPILE::JS { @@ -34,7 +34,7 @@ package org.apache.flex.html * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public class A extends UIBase + public class A extends ContainerBase { /** * constructor. @@ -61,30 +61,25 @@ package org.apache.flex.html */ public function get text():String { - COMPILE::SWF - { - return _text; - } - COMPILE::JS - { - return textNode.nodeValue; - } + return _text; } - - public function set text(value:String):void + public function set text(value:String):void { - COMPILE::SWF - { - _text = value; - } - COMPILE::JS - { - textNode.nodeValue = value; - } + _text = value; + + COMPILE::JS + { + if(textNode == null) + { + textNode = document.createTextNode('') as Text; + element.appendChild(textNode); + } + + textNode.nodeValue = value; + } } private var _href:String = "#"; - /** * the link url * @@ -97,7 +92,6 @@ package org.apache.flex.html { return _href; } - public function set href(value:String):void { _href = value; @@ -121,9 +115,6 @@ package org.apache.flex.html var a:HTMLElement = document.createElement('a') as HTMLElement; a.setAttribute('href', href); - textNode = document.createTextNode('') as Text; - a.appendChild(textNode); - element = a as WrappedHTMLElement; positioner = element; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as index b466824..b137ca8 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as @@ -63,7 +63,6 @@ package org.apache.flex.html { return _text; } - public function set text(value:String):void { _text = value; @@ -78,11 +77,10 @@ package org.apache.flex.html textNode.nodeValue = value; } - } COMPILE::JS - private var textNode:Text; + protected var textNode:Text; /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Button.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Button.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Button.as index 98c0970..6935531 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Button.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Button.as @@ -18,7 +18,8 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.html.TextButton; + import org.apache.flex.html.TextButton; + import org.apache.flex.mdl.supportClasses.MaterialIconBase; COMPILE::JS { @@ -68,6 +69,29 @@ package org.apache.flex.mdl return element; } + private var _materialIcon:MaterialIconBase; + /** + * A material icon. Optional + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get materialIcon():MaterialIconBase + { + return _materialIcon; + } + public function set materialIcon(value:MaterialIconBase):void + { + _materialIcon = value; + + COMPILE::JS + { + addElement(_materialIcon); + } + } + private var _fab:Boolean = false; /** * A boolean flag to activate "mdl-button--fab" effect selector. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/ButtonChip.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/ButtonChip.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/ButtonChip.as index f462349..df0574b 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/ButtonChip.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/ButtonChip.as @@ -18,15 +18,11 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - COMPILE::SWF - { - import org.apache.flex.html.TextButton; - } + import org.apache.flex.mdl.supportClasses.MaterialIconBase; COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; - import org.apache.flex.core.UIBase; } /** @@ -38,51 +34,67 @@ package org.apache.flex.mdl * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::SWF - public class ButtonChip extends TextButton - { - public function ButtonChip() - { - super(); - } - } - - COMPILE::JS - public class ButtonChip extends UIBase + public class ButtonChip extends Button { public function ButtonChip() { super(); - + className = ""; } + COMPILE::JS private var chip:HTMLButtonElement; - private var textNode:Text; + COMPILE::JS private var _chipTextSpan:HTMLSpanElement; + COMPILE::JS public function get chipTextSpan():HTMLSpanElement { return _chipTextSpan; } - public function get text():String - { - return textNode.nodeValue; - } - - public function set text(value:String):void - { - textNode.nodeValue = value; - } - + private var _text:String = ""; + /** + * The text of the link + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + override public function get text():String + { + return _text; + } + override public function set text(value:String):void + { + _text = value; + + COMPILE::JS + { + if(textNode == null) + { + textNode = document.createTextNode('') as Text; + element.appendChild(textNode); + } + + textNode.nodeValue = value; + } + } + + COMPILE::JS + protected var textNode:Text; + + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement * @flexjsignorecoercion HTMLSpanElement * @flexjsignorecoercion HTMLButtonElement * @flexjsignorecoercion Text */ + COMPILE::JS override protected function createElement():WrappedHTMLElement { typeNames = "mdl-chip"; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Chip.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Chip.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Chip.as index 14e7557..f6173cc 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Chip.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Chip.as @@ -18,15 +18,9 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - COMPILE::SWF - { - import org.apache.flex.html.TextButton; - } - COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; - import org.apache.flex.core.UIBase; } /** @@ -38,17 +32,7 @@ package org.apache.flex.mdl * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::SWF - public class Chip extends TextButton - { - public function Chip() - { - super(); - } - } - - COMPILE::JS - public class Chip extends UIBase + public class Chip extends Button { public function Chip() { @@ -57,31 +41,56 @@ package org.apache.flex.mdl className = ""; } + COMPILE::JS private var chip:HTMLSpanElement; - private var textNode:Text; - + + COMPILE::JS private var _chipTextSpan:HTMLSpanElement; + COMPILE::JS public function get chipTextSpan():HTMLSpanElement { return _chipTextSpan; } - public function get text():String - { - return textNode.nodeValue; - } - - public function set text(value:String):void - { - textNode.nodeValue = value; - } - + private var _text:String = ""; + /** + * The text of the link + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + override public function get text():String + { + return _text; + } + override public function set text(value:String):void + { + _text = value; + + COMPILE::JS + { + if(textNode == null) + { + textNode = document.createTextNode('') as Text; + element.appendChild(textNode); + } + + textNode.nodeValue = value; + } + } + + COMPILE::JS + protected var textNode:Text; + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement * @flexjsignorecoercion HTMLSpanElement * @flexjsignorecoercion Text */ + COMPILE::JS override protected function createElement():WrappedHTMLElement { typeNames = "mdl-chip"; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableChip.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableChip.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableChip.as index 1799531..5b153d6 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableChip.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableChip.as @@ -25,6 +25,8 @@ package org.apache.flex.mdl.beads import org.apache.flex.mdl.supportClasses.MaterialIconBase; import org.apache.flex.utils.StrandUtils; + //import org.apache.flex.mdl.Chip; + /** * The DeletableChip bead class is a specialty bead that can be used to add additional * button to Chip MDL control. @@ -92,14 +94,15 @@ package org.apache.flex.mdl.beads COMPILE::JS private function createDeleteButton():Button { - var iconBead:IBead = StrandUtils.loadBead(MaterialIconBase, "MaterialIconBase", _strand); - if (iconBead == null) + var materialIcon:MaterialIconBase = Button(_strand).materialIcon; //this could be Chip or ButtonChip, + //maybe add an Interface for both since is not really a Button + if (materialIcon == null) { - throw new Error("Missing material icon bead"); + throw new Error("Missing material icon"); } var delButton:Button = new Button(); - delButton.addBead(iconBead); + delButton.materialIcon = materialIcon; var htmlButton:HTMLElement = (delButton.element as HTMLElement); htmlButton.classList.remove("mdl-button", "mdl-js-button"); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableLinkChip.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableLinkChip.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableLinkChip.as index 19cf733..6f7d2fb 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableLinkChip.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableLinkChip.as @@ -25,6 +25,8 @@ package org.apache.flex.mdl.beads import org.apache.flex.mdl.supportClasses.MaterialIconBase; import org.apache.flex.utils.StrandUtils; + import org.apache.flex.mdl.Button; + /** * The DeletableLinkChip bead class is a specialty bead that can be used to add additional * link button to Chip MDL control. @@ -99,14 +101,15 @@ package org.apache.flex.mdl.beads COMPILE::JS private function createLinkElement():NavigationLink { - var iconBead:IBead = StrandUtils.loadBead(MaterialIconBase, "MaterialIconBase", _strand); - if (iconBead == null) + var materialIcon:MaterialIconBase = Button(_strand).materialIcon; //this could be Chip or ButtonChip, + //maybe add an Interface for both since is not really a Button + if (materialIcon == null) { - throw new Error("Missing material icon bead"); + throw new Error("Missing material icon"); } var link:NavigationLink = new NavigationLink(); - link.addBead(iconBead); + link.addElement(materialIcon); var linkElement:HTMLElement = (link.element as HTMLElement); linkElement.classList.remove("mdl-navigation__link"); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconAdd.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconAdd.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconAdd.as deleted file mode 100644 index ed2d8e2..0000000 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconAdd.as +++ /dev/null @@ -1,52 +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.mdl.beads.materialIcons -{ - import org.apache.flex.mdl.supportClasses.MaterialIconBase; - - /** - * The MaterialIconCancel bead class is a specialty bead that add "add" icon - * to component taken from "material-icons" - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public class MaterialIconAdd extends MaterialIconBase - { - /** - * constructor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function MaterialIconAdd() - { - super(); - } - - override protected function get iconText():String - { - return MaterialIconsType.ADD; - } - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconCancel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconCancel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconCancel.as deleted file mode 100644 index 828f067..0000000 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconCancel.as +++ /dev/null @@ -1,52 +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.mdl.beads.materialIcons -{ - import org.apache.flex.mdl.supportClasses.MaterialIconBase; - - /** - * The MaterialIconCancel bead class is a specialty bead that add "cancel" icon - * to component taken from "material-icons" - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public class MaterialIconCancel extends MaterialIconBase - { - /** - * constructor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function MaterialIconCancel() - { - super(); - } - - override protected function get iconText():String - { - return MaterialIconsType.CANCEL; - } - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconEvent.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconEvent.as deleted file mode 100644 index 60e833b..0000000 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconEvent.as +++ /dev/null @@ -1,52 +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.mdl.beads.materialIcons -{ - import org.apache.flex.mdl.supportClasses.MaterialIconBase; - - /** - * The MaterialIconEvent bead class is a specialty bead that add "star" icon - * to component taken from "material-icons" - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public class MaterialIconEvent extends MaterialIconBase - { - /** - * constructor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function MaterialIconEvent() - { - super(); - } - - override protected function get iconText():String - { - return MaterialIconsType.EVENT; - } - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconPerson.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconPerson.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconPerson.as deleted file mode 100644 index 0881364..0000000 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconPerson.as +++ /dev/null @@ -1,52 +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.mdl.beads.materialIcons -{ - import org.apache.flex.mdl.supportClasses.MaterialIconBase; - - /** - * The MaterialIconPerson bead class is a specialty bead that add "person" icon - * to component taken from "material-icons" - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public class MaterialIconPerson extends MaterialIconBase - { - /** - * constructor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function MaterialIconPerson() - { - super(); - } - - override protected function get iconText():String - { - return MaterialIconsType.PERSON; - } - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconShare.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconShare.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconShare.as deleted file mode 100644 index cc751db..0000000 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconShare.as +++ /dev/null @@ -1,52 +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.mdl.beads.materialIcons -{ - import org.apache.flex.mdl.supportClasses.MaterialIconBase; - - /** - * The MaterialIconShare bead class is a specialty bead that add "add" icon - * to component taken from "material-icons" - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public class MaterialIconShare extends MaterialIconBase - { - /** - * constructor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function MaterialIconShare() - { - super(); - } - - override protected function get iconText():String - { - return MaterialIconsType.SHARE; - } - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconStar.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconStar.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconStar.as deleted file mode 100644 index 6befded..0000000 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconStar.as +++ /dev/null @@ -1,52 +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.mdl.beads.materialIcons -{ - import org.apache.flex.mdl.supportClasses.MaterialIconBase; - - /** - * The MaterialIconStar bead class is a specialty bead that add "star" icon - * to component taken from "material-icons" - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public class MaterialIconStar extends MaterialIconBase - { - /** - * constructor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function MaterialIconStar() - { - super(); - } - - override protected function get iconText():String - { - return MaterialIconsType.STAR; - } - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconsType.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconsType.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconsType.as deleted file mode 100644 index fd92da3..0000000 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/materialIcons/MaterialIconsType.as +++ /dev/null @@ -1,30 +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.mdl.beads.materialIcons -{ - public class MaterialIconsType - { - public static const CANCEL:String = "cancel"; - public static const ADD:String = "add"; - public static const PERSON:String = "person"; - public static const STAR:String = "star"; - public static const SHARE:String = "share"; - public static const EVENT:String = "event"; - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconAdd.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconAdd.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconAdd.as new file mode 100644 index 0000000..addc056 --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconAdd.as @@ -0,0 +1,52 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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.mdl.materialIcons +{ + import org.apache.flex.mdl.supportClasses.MaterialIconBase; + + /** + * The MaterialIconCancel bead class is a specialty bead that add "add" icon + * to component taken from "material-icons" + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public class MaterialIconAdd extends MaterialIconBase + { + /** + * constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function MaterialIconAdd() + { + super(); + } + + override protected function get iconText():String + { + return MaterialIconsType.ADD; + } + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconCancel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconCancel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconCancel.as new file mode 100644 index 0000000..264bfef --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconCancel.as @@ -0,0 +1,52 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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.mdl.materialIcons +{ + import org.apache.flex.mdl.supportClasses.MaterialIconBase; + + /** + * The MaterialIconCancel bead class is a specialty bead that add "cancel" icon + * to component taken from "material-icons" + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public class MaterialIconCancel extends MaterialIconBase + { + /** + * constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function MaterialIconCancel() + { + super(); + } + + override protected function get iconText():String + { + return MaterialIconsType.CANCEL; + } + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconEvent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconEvent.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconEvent.as new file mode 100644 index 0000000..b5d371f --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconEvent.as @@ -0,0 +1,52 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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.mdl.materialIcons +{ + import org.apache.flex.mdl.supportClasses.MaterialIconBase; + + /** + * The MaterialIconEvent bead class is a specialty bead that add "star" icon + * to component taken from "material-icons" + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public class MaterialIconEvent extends MaterialIconBase + { + /** + * constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function MaterialIconEvent() + { + super(); + } + + override protected function get iconText():String + { + return MaterialIconsType.EVENT; + } + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFace.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFace.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFace.as new file mode 100644 index 0000000..6f9d305 --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFace.as @@ -0,0 +1,52 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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.mdl.materialIcons +{ + import org.apache.flex.mdl.supportClasses.MaterialIconBase; + + /** + * The MaterialIconFace bead class is a specialty bead that add "face" icon + * to component taken from "material-icons" + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public class MaterialIconFace extends MaterialIconBase + { + /** + * constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function MaterialIconFace() + { + super(); + } + + override protected function get iconText():String + { + return MaterialIconsType.FACE; + } + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconMoreVert.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconMoreVert.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconMoreVert.as new file mode 100644 index 0000000..f56b9ad --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconMoreVert.as @@ -0,0 +1,52 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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.mdl.materialIcons +{ + import org.apache.flex.mdl.supportClasses.MaterialIconBase; + + /** + * The MaterialIconMoreVert bead class is a specialty bead that add "more_vert" icon + * to component taken from "material-icons" + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public class MaterialIconMoreVert extends MaterialIconBase + { + /** + * constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function MaterialIconMoreVert() + { + super(); + } + + override protected function get iconText():String + { + return MaterialIconsType.MORE_VERT; + } + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconPerson.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconPerson.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconPerson.as new file mode 100644 index 0000000..fb55c9e --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconPerson.as @@ -0,0 +1,52 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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.mdl.materialIcons +{ + import org.apache.flex.mdl.supportClasses.MaterialIconBase; + + /** + * The MaterialIconPerson bead class is a specialty bead that add "person" icon + * to component taken from "material-icons" + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public class MaterialIconPerson extends MaterialIconBase + { + /** + * constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function MaterialIconPerson() + { + super(); + } + + override protected function get iconText():String + { + return MaterialIconsType.PERSON; + } + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconShare.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconShare.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconShare.as new file mode 100644 index 0000000..2a27799 --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconShare.as @@ -0,0 +1,52 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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.mdl.materialIcons +{ + import org.apache.flex.mdl.supportClasses.MaterialIconBase; + + /** + * The MaterialIconShare bead class is a specialty bead that add "add" icon + * to component taken from "material-icons" + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public class MaterialIconShare extends MaterialIconBase + { + /** + * constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function MaterialIconShare() + { + super(); + } + + override protected function get iconText():String + { + return MaterialIconsType.SHARE; + } + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconStar.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconStar.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconStar.as new file mode 100644 index 0000000..5bf7407 --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconStar.as @@ -0,0 +1,52 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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.mdl.materialIcons +{ + import org.apache.flex.mdl.supportClasses.MaterialIconBase; + + /** + * The MaterialIconStar bead class is a specialty bead that add "star" icon + * to component taken from "material-icons" + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public class MaterialIconStar extends MaterialIconBase + { + /** + * constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function MaterialIconStar() + { + super(); + } + + override protected function get iconText():String + { + return MaterialIconsType.STAR; + } + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as new file mode 100644 index 0000000..0f2fc1e --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as @@ -0,0 +1,32 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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.mdl.materialIcons +{ + public class MaterialIconsType + { + public static const CANCEL:String = "cancel"; + public static const ADD:String = "add"; + public static const PERSON:String = "person"; + public static const STAR:String = "star"; + public static const SHARE:String = "share"; + public static const EVENT:String = "event"; + public static const FACE:String = "face"; + public static const MORE_VERT:String = "more_vert"; + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/MaterialIconBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/MaterialIconBase.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/MaterialIconBase.as index da5b9d8..f7b51ff 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/MaterialIconBase.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/MaterialIconBase.as @@ -18,10 +18,12 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl.supportClasses { - import org.apache.flex.core.IBead; - import org.apache.flex.core.IStrand; import org.apache.flex.core.UIBase; - import org.apache.flex.html.I; + + COMPILE::JS + { + import org.apache.flex.core.WrappedHTMLElement; + } /** * Provide common features for all material icons type @@ -31,7 +33,7 @@ package org.apache.flex.mdl.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public class MaterialIconBase implements IBead + public class MaterialIconBase extends UIBase { /** * constructor. @@ -45,33 +47,34 @@ package org.apache.flex.mdl.supportClasses */ public function MaterialIconBase() { - COMPILE::JS - { - materialIcon = new I(); - element.classList.add("material-icons"); - } + super(); + + className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - private var _strand:IStrand; + COMPILE::JS + protected var textNode:Text; /** - * @flexjsignorecoercion HTMLElement - * - * @param value + * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement + * @flexjsignorecoercion HTMLElement */ - public function set strand(value:IStrand):void + COMPILE::JS + override protected function createElement():WrappedHTMLElement { - _strand = value; - - COMPILE::JS - { - var host:UIBase = value as UIBase; - var htmlElement:HTMLElement = host.element as HTMLElement; - - materialIcon.text = iconText; - - htmlElement.appendChild(element); - } + typeNames = "material-icons"; + + var i:HTMLElement = document.createElement('i') as HTMLElement; + + textNode = document.createTextNode(iconText) as Text; + i.appendChild(textNode); + + element = i as WrappedHTMLElement; + + positioner = element; + element.flexjs_wrapper = this; + + return element; } protected function get iconText():String @@ -79,15 +82,6 @@ package org.apache.flex.mdl.supportClasses return ""; } - COMPILE::JS - protected var materialIcon:I; - - COMPILE::JS - public function get element():HTMLElement - { - return materialIcon.element as HTMLElement; - } - private var _size:Number = 24; /** * Although the icons in the font can be scaled to any size, http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/35c46208/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml index c2a69ab..69059bd 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml +++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml @@ -71,12 +71,14 @@ - - - - - - + + + + + + + +