Repository: flex-asjs Updated Branches: refs/heads/develop 300938934 -> 72b41e53f
Add ContactImageBead - display image in ContactChip Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/72b41e53 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/72b41e53 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/72b41e53 Branch: refs/heads/develop Commit: 72b41e53f1e44baffd8fd66c7fc13150f71c5beb Parents: 3009389 Author: piotrz <[email protected]> Authored: Wed Dec 7 06:14:54 2016 +0100 Committer: piotrz <[email protected]> Committed: Wed Dec 7 06:14:54 2016 +0100 ---------------------------------------------------------------------- .../flexjs/MDLExample/src/main/flex/Chips.mxml | 2 +- .../org/apache/flex/mdl/beads/ContactChip.as | 74 ++++++++------- .../apache/flex/mdl/beads/ContactImageChip.as | 94 ++++++++++++++++++++ .../src/main/resources/mdl-manifest.xml | 3 +- 4 files changed, 137 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72b41e53/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 a0861e3..e03b4c7 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Chips.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Chips.mxml @@ -61,7 +61,7 @@ limitations under the License. <mdl:GridCell column="5"> <mdl:Chip text="Contact Link Chip"> <mdl:beads> - <mdl:ContactChip contactText="L" color="teal" textColor="white"/> + <mdl:ContactImageChip /> <mdl:MaterialIconCancel /> <mdl:DeletableLinkChip href="http://flex.apache.org/"/> </mdl:beads> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72b41e53/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactChip.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactChip.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactChip.as index cd162a3..27da3ec 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactChip.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactChip.as @@ -144,42 +144,34 @@ package org.apache.flex.mdl.beads public function set strand(value:IStrand):void { _strand = value; + + var host:UIBase = value as UIBase; + var element:HTMLElement = host.element as HTMLElement; + var isValidElement:Boolean = element is HTMLSpanElement || element is HTMLButtonElement; - COMPILE::JS + if (isValidElement && element.className.search("mdl-chip") > -1) { - var host:UIBase = value as UIBase; - var element:HTMLElement = host.element as HTMLElement; - var isValidElement:Boolean = element is HTMLSpanElement || element is HTMLButtonElement; - - if (isValidElement && element.className.search("mdl-chip") > -1) - { - element.classList.add("mdl-chip--contact"); - - textNode = document.createTextNode('') as Text; - textNode.nodeValue = _contactText; - - contact = document.createElement("span") as HTMLSpanElement; - contact.classList.add("mdl-chip__contact"); - - var contactColor:String = _colorWeight ? - "mdl-color--".concat(_color, "-", _colorWeight) : - "mdl-color--".concat(_color); - - var contactTextColor:String = _textColorWeight ? - "mdl-color-text--".concat(_textColor, "-", _textColorWeight) : - "mdl-color-text--".concat(_textColor); - - contact.classList.toggle(contactColor, _color); - contact.classList.toggle(contactTextColor, _textColor); - - contact.appendChild(textNode); - - element.insertBefore(contact, host["chipTextSpan"]); - } - else - { - throw new Error("Host component must be an MDL Host for Chips."); - } + element.classList.add("mdl-chip--contact"); + + textNode = document.createTextNode('') as Text; + textNode.nodeValue = _contactText; + + contact = document.createElement("span") as HTMLSpanElement; + contact.classList.add("mdl-chip__contact"); + + var contactColor:String = getContactColor(); + var contactTextColor:String = getContactTextColor(); + + contact.classList.toggle(contactColor, _color); + contact.classList.toggle(contactTextColor, _textColor); + + contact.appendChild(textNode); + + element.insertBefore(contact, host["chipTextSpan"]); + } + else + { + throw new Error("Host component must be an MDL Host for Chips."); } } @@ -239,5 +231,19 @@ package org.apache.flex.mdl.beads { _textColorWeight = value; } + + private function getContactColor():String + { + return _colorWeight ? + "mdl-color--".concat(_color, "-", _colorWeight) : + "mdl-color--".concat(_color); + } + + private function getContactTextColor():String + { + return _textColorWeight ? + "mdl-color-text--".concat(_textColor, "-", _textColorWeight) : + "mdl-color-text--".concat(_textColor); + } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72b41e53/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactImageChip.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactImageChip.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactImageChip.as new file mode 100644 index 0000000..2027802 --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactImageChip.as @@ -0,0 +1,94 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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 +{ + import org.apache.flex.core.IBead; + import org.apache.flex.core.IStrand; + import org.apache.flex.core.UIBase; + import org.apache.flex.html.Image; + + /** + * The ContactImageChip bead class is a specialty bead that can be used to add additional + * button to Chip MDL control. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + COMPILE::SWF + public class ContactImageChip + { + private var _source:String; + + public function ContactImageChip() + { + + } + + public function set source(value:String):void + { + _source = value; + } + } + + COMPILE::JS + public class ContactImageChip implements IBead + { + public function ContactImageChip() + { + super(); + } + + private var _source:String = ""; + private var _strand:IStrand; + + private var contact:Image; + + public function set strand(value:IStrand):void + { + _strand = value; + + var host:UIBase = value as UIBase; + var element:HTMLElement = host.element as HTMLElement; + var isValidElement:Boolean = element is HTMLSpanElement || element is HTMLButtonElement; + + if (isValidElement && element.className.search("mdl-chip") > -1) + { + element.classList.add("mdl-chip--contact"); + + contact = new Image(); + contact["applyImageData"](_source); + + contact["imageElement"].classList.add("mdl-chip__contact"); + + element.insertBefore(contact["imageElement"], host["chipTextSpan"]); + } + else + { + throw new Error("Host component must be an MDL Host for Chips."); + } + } + + public function set source(value:String):void + { + _source = value; + } + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72b41e53/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 5810af8..041d8a3 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml +++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml @@ -66,6 +66,7 @@ <component id="DeletableLinkChip" class="org.apache.flex.mdl.beads.DeletableLinkChip"/> <component id="MaterialIconCancel" class="org.apache.flex.mdl.beads.materialIcons.MaterialIconCancel"/> <component id="MaterialIconAdd" class="org.apache.flex.mdl.beads.materialIcons.MaterialIconAdd"/> - <component id="Tooltip" class="org.apache.flex.mdl.Tooltip"/> <component id="ContactChip" class="org.apache.flex.mdl.beads.ContactChip"/> + <component id="ContactImageChip" class="org.apache.flex.mdl.beads.ContactImageChip"/> + <component id="Tooltip" class="org.apache.flex.mdl.Tooltip"/> </componentPackage>
