Remove CardInnerEffect and set border in CardInner. Remove typeNames in the rest of components
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/88400583 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/88400583 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/88400583 Branch: refs/heads/feature/mdl Commit: 884005838486c4cab328912ca7e1a2e95ae2c9ca Parents: 793c3eb Author: Carlos Rovira <carlosrov...@apache.org> Authored: Sat Nov 5 14:41:30 2016 +0100 Committer: Carlos Rovira <carlosrov...@apache.org> Committed: Sun Nov 6 02:28:52 2016 +0100 ---------------------------------------------------------------------- .../flexjs/MDLExample/src/main/flex/App.mxml | 5 +- .../src/main/flex/org/apache/flex/mdl/Card.as | 2 +- .../flex/org/apache/flex/mdl/CardActions.as | 2 +- .../main/flex/org/apache/flex/mdl/CardMedia.as | 2 +- .../org/apache/flex/mdl/CardSupportingText.as | 2 +- .../main/flex/org/apache/flex/mdl/CardTitle.as | 2 +- .../apache/flex/mdl/beads/CardInnerEffect.as | 98 -------------------- .../apache/flex/mdl/supportClasses/CardInner.as | 25 ++++- .../src/main/resources/mdl-manifest.xml | 3 +- 9 files changed, 30 insertions(+), 111 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88400583/examples/flexjs/MDLExample/src/main/flex/App.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/App.mxml b/examples/flexjs/MDLExample/src/main/flex/App.mxml index 9b3f6fe..50f8ee9 100644 --- a/examples/flexjs/MDLExample/src/main/flex/App.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/App.mxml @@ -123,10 +123,7 @@ limitations under the License. <mdl:CardSupportingText> <js:MultilineLabel text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris sagittis pellentesque lacus eleifend lacinia..."/> </mdl:CardSupportingText> - <mdl:CardActions> - <js:beads> - <mdl:CardInnerEffect border="true"/> - </js:beads> + <mdl:CardActions border="true"> <mdl:Button text="Get Started" ripple="true" colored="true"/> </mdl:CardActions> </mdl:Card> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88400583/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as index 3835d86..fbfde40 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as @@ -73,7 +73,7 @@ package org.apache.flex.mdl positioner.style.position = 'relative'; element.flexjs_wrapper = this; - className = typeNames = "mdl-card"; + className = "mdl-card"; return element; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88400583/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardActions.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardActions.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardActions.as index c821a2b..01703b1 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardActions.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardActions.as @@ -72,7 +72,7 @@ package org.apache.flex.mdl positioner.style.position = 'relative'; element.flexjs_wrapper = this; - className = typeNames = "mdl-card__actions"; + className = "mdl-card__actions"; return element; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88400583/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardMedia.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardMedia.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardMedia.as index 278fb52..96489e6 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardMedia.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardMedia.as @@ -72,7 +72,7 @@ package org.apache.flex.mdl positioner.style.position = 'relative'; element.flexjs_wrapper = this; - className = typeNames = "mdl-card__media"; + className = "mdl-card__media"; return element; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88400583/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardSupportingText.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardSupportingText.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardSupportingText.as index b087135..b39e64f 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardSupportingText.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardSupportingText.as @@ -72,7 +72,7 @@ package org.apache.flex.mdl positioner.style.position = 'relative'; element.flexjs_wrapper = this; - className = typeNames = "mdl-card__supporting-text"; + className = "mdl-card__supporting-text"; return element; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88400583/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardTitle.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardTitle.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardTitle.as index c2398a3..8e9339b 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardTitle.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CardTitle.as @@ -72,7 +72,7 @@ package org.apache.flex.mdl positioner.style.position = 'relative'; element.flexjs_wrapper = this; - className = typeNames = "mdl-card__title"; + className = "mdl-card__title"; return element; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88400583/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/CardInnerEffect.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/CardInnerEffect.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/CardInnerEffect.as deleted file mode 100644 index 91b366b..0000000 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/CardInnerEffect.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.mdl.beads -{ - import org.apache.flex.core.IStrand; - import org.apache.flex.core.IBead; - import org.apache.flex.mdl.supportClasses.CardInner; - - - /** - * The CardInnerEffect class is a specialty bead that can be used with - * a MDL Card Inner container to apply some MDL complementary effect. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public class CardInnerEffect implements IBead - { - /** - * constructor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function CardInnerEffect() - { - } - - private var _border:String = ""; - /** - * A boolean flag to activate "mdl-card--border" effect selector. - * Adds a border to the card section that it's applied to - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get border():Boolean - { - return _border; - } - public function set border(value:Boolean):void - { - if(value) { - _border = " mdl-card--border"; - } else { - _border = ""; - } - } - - 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; - - COMPILE::JS - { - if (value is CardInner) { - var card:CardInner = value as CardInner; - card.className = _border; - } else { - throw new Error("Host component must be an MDL CardInner."); - } - } - } - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88400583/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as index e420f2d..6a57ae1 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as @@ -73,9 +73,30 @@ package org.apache.flex.mdl.supportClasses positioner.style.position = 'relative'; element.flexjs_wrapper = this; - className = typeNames = "mdl-card"; + className = "mdl-card"; return element; - } + } + + private var _border:Boolean = false; + /** + * A boolean flag to activate "mdl-card--border" effect selector. + * Adds a border to the card section that it's applied to + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get border():Boolean + { + return _border; + } + public function set border(value:Boolean):void + { + _border = value; + + className += (_border ? " mdl-card--border" : ""); + } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88400583/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 0bcb2c7..0064d51 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml +++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml @@ -35,6 +35,5 @@ <component id="CardSupportingText" class="org.apache.flex.mdl.CardSupportingText"/> <component id="CardMedia" class="org.apache.flex.mdl.CardMedia"/> <component id="CardActions" class="org.apache.flex.mdl.CardActions"/> - <component id="CardInnerEffect" class="org.apache.flex.mdl.beads.CardInnerEffect"/> - + </componentPackage>
