Remove effect beads to reduce verbosity
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/65ff7585 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/65ff7585 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/65ff7585 Branch: refs/heads/develop Commit: 65ff7585b6ae9529fc91949701540017ebb8a0ee Parents: 5a5d97d Author: Carlos Rovira <carlosrov...@apache.org> Authored: Sat Nov 5 01:51:13 2016 +0100 Committer: Carlos Rovira <carlosrov...@apache.org> Committed: Sun Nov 6 13:15:38 2016 +0100 ---------------------------------------------------------------------- .../flexjs/MDLExample/src/main/flex/App.mxml | 50 +--- .../src/main/flex/org/apache/flex/mdl/Button.as | 169 +++++++++++++- .../main/flex/org/apache/flex/mdl/CheckBox.as | 40 +++- .../flex/org/apache/flex/mdl/RadioButton.as | 39 +++- .../main/flex/org/apache/flex/mdl/TextInput.as | 48 +++- .../org/apache/flex/mdl/beads/ButtonEffect.as | 228 ------------------- .../flex/org/apache/flex/mdl/beads/MDLEffect.as | 105 --------- .../apache/flex/mdl/beads/TextInputEffect.as | 97 -------- .../src/main/resources/mdl-manifest.xml | 3 - 9 files changed, 300 insertions(+), 479 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65ff7585/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 f0bae30..3393a5e 100644 --- a/examples/flexjs/MDLExample/src/main/flex/App.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/App.mxml @@ -39,38 +39,24 @@ limitations under the License. <mdl:Button/> <!-- Fab button --> - <mdl:Button> - <js:beads> - <mdl:ButtonEffect fab="true" colored="true"/> - </js:beads> + <mdl:Button fab="true" colored="true"> <i class="material-icons">add</i> </mdl:Button> <!-- Fab with Ripple --> - <mdl:Button> - <js:beads> - <mdl:ButtonEffect fab="true" ripple="true"/> - </js:beads> + <mdl:Button fab="true" ripple="true"> <i class="material-icons md-48">face</i> </mdl:Button> <!-- Raised button --> - <mdl:Button text="COLORED"> - <js:beads> - <mdl:ButtonEffect raised="true" colored="true"/> - </js:beads> - </mdl:Button> + <mdl:Button text="COLORED" raised="true" colored="true"/> <!-- Raised button with ripple --> - <mdl:Button text="ACCENT"> - <js:beads> - <mdl:ButtonEffect raised="true" ripple="true" accent="true"/> - </js:beads> - </mdl:Button> + <mdl:Button text="ACCENT" raised="true" ripple="true" accent="true"/> + <!-- Raised disabled button--> - <mdl:Button text="DISABLED"> + <mdl:Button text="DISABLED" raised="true"> <js:beads> - <mdl:ButtonEffect raised="true"/> <mdl:Disabled/> </js:beads> </mdl:Button> @@ -82,26 +68,18 @@ limitations under the License. <mdl:TextPrompt prompt="Normal Text Field..."/> </js:beads> </mdl:TextInput> - <mdl:TextInput> + <mdl:TextInput floatingLabel= "true"> <js:beads> - <mdl:TextInputEffect floatingLabel= "true"/> <mdl:TextPrompt prompt="Floating Label"/> </js:beads> </mdl:TextInput> <!-- Toggles :: https://getmdl.io/components/index.html#toggles-section --> <mdl:CheckBox id="mdlchk" text="Disabled at start" /> - <mdl:CheckBox id="mdlchk1" text="Selected and with Ripple" selected="true"> - <js:beads> - <mdl:MDLEffect ripple="true"/> - </js:beads> - </mdl:CheckBox> + <mdl:CheckBox id="mdlchk1" text="Selected and with Ripple" selected="true" ripple="true"/> + <mdl:RadioButton groupName="g1" text="Black"/> - <mdl:RadioButton groupName="g1" text="Ripple"> - <js:beads> - <mdl:MDLEffect ripple="true"/> - </js:beads> - </mdl:RadioButton> + <mdl:RadioButton groupName="g1" text="Ripple" ripple="true"/> <mdl:RadioButton groupName="g1" text="Red"/> <mdl:Slider/> @@ -139,7 +117,7 @@ limitations under the License. <js:beads> <mdl:CardEffect shadow="2"/> </js:beads> - <mdl:CardTitle style="color: #666;height: 176px; background-image: url('../../../../src/main/resources/Unknown.jpeg') center / cover;"> + <mdl:CardTitle style="color: #666;height: 176px; backgroundImage: url('../../../../src/main/resources/Unknown.jpeg') center / cover;"> <js:H2 text="Welcome" className="mdl-card__title-text"/> </mdl:CardTitle> <mdl:CardMedia> @@ -152,11 +130,7 @@ limitations under the License. <js:beads> <mdl:CardInnerEffect border="true"/> </js:beads> - <mdl:Button text="Get Started"> - <js:beads> - <mdl:ButtonEffect ripple="true" colored="true"/> - </js:beads> - </mdl:Button> + <mdl:Button text="Get Started" ripple="true" colored="true"/> </mdl:CardActions> </mdl:Card> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65ff7585/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 27116c4..e1fa441 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,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.html.TextButton; + import org.apache.flex.html.TextButton; COMPILE::JS { @@ -48,7 +48,7 @@ package org.apache.flex.mdl { super(); } - + /** * @private * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement @@ -57,15 +57,174 @@ package org.apache.flex.mdl override protected function createElement():WrappedHTMLElement { element = document.createElement('button') as WrappedHTMLElement; - //element.setAttribute('type', 'button'); positioner = element; positioner.style.position = 'relative'; element.flexjs_wrapper = this; - className = typeNames = "mdl-button mdl-js-button"; - + className = "mdl-button mdl-js-button"; + return element; } + + private var _fab:Boolean = false; + /** + * A boolean flag to activate "mdl-button--fab" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get fab():Boolean + { + return _fab; + } + public function set fab(value:Boolean):void + { + _fab = value; + + className += (_fab ? " mdl-button--fab" : "" ); + } + + private var _raised:Boolean = false; + /** + * A boolean flag to activate "mdl-button--raised" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get raised():Boolean + { + return _raised; + } + public function set raised(value:Boolean):void + { + _raised = value; + + className += (_raised ? " mdl-button--raised" : "" ); + } + + private var _colored:Boolean = false; + /** + * A boolean flag to activate "mdl-button--colored" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get colored():Boolean + { + return _colored; + } + public function set colored(value:Boolean):void + { + _colored = value; + + className += (_colored ? " mdl-button--colored" : ""); + } + + private var _accent:Boolean = false; + /** + * A boolean flag to activate "mdl-button--accent" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get accent():Boolean + { + return _accent; + } + public function set accent(value:Boolean):void + { + _accent = value; + + className += (_accent ? " mdl-button--accent" : ""); + } + + private var _primary:Boolean = false; + /** + * A boolean flag to activate "mdl-button--primary" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get primary():Boolean + { + return _primary; + } + public function set primary(value:Boolean):void + { + _primary = value; + + className += (_primary ? " mdl-button--primary" : ""); + } + + private var _minifab:Boolean = false; + /** + * A boolean flag to activate "mdl-button--mini-fab" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get minifab():Boolean + { + return _minifab; + } + public function set minifab(value:Boolean):void + { + _minifab = value; + + className += (_minifab ? " mdl-button--mini-fab" : ""); + } + + private var _icon:Boolean = false; + /** + * A boolean flag to activate "mdl-button--icon" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get icon():Boolean + { + return _icon; + } + public function set icon(value:Boolean):void + { + _icon = value; + + className += (_icon ? " mdl-button--icon" : ""); + } + + protected var _ripple:Boolean = false; + /** + * A boolean flag to activate "mdl-js-ripple-effect" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get ripple():Boolean + { + return _ripple; + } + public function set ripple(value:Boolean):void + { + _ripple = value; + + className += (_ripple ? " mdl-js-ripple-effect" : ""); + } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65ff7585/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as index a4d2a4c..b8f1194 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as @@ -53,6 +53,24 @@ package org.apache.flex.mdl { super(); } + + protected var _ripple:Boolean = false; + /** + * A boolean flag to activate "mdl-js-ripple-effect" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get ripple():Boolean + { + return _ripple; + } + public function set ripple(value:Boolean):void + { + _ripple = value; + } } COMPILE::JS @@ -94,10 +112,30 @@ package org.apache.flex.mdl (checkbox as WrappedHTMLElement).flexjs_wrapper = this; element.flexjs_wrapper = this; - className = typeNames = 'mdl-checkbox mdl-js-checkbox'; + className = 'mdl-checkbox mdl-js-checkbox'; return element; }; + + protected var _ripple:Boolean = false; + /** + * A boolean flag to activate "mdl-js-ripple-effect" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get ripple():Boolean + { + return _ripple; + } + public function set ripple(value:Boolean):void + { + _ripple = value; + + className += (_ripple ? " mdl-js-ripple-effect" : ""); + } public function get text():String { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65ff7585/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as index e0933d2..2ebd9fe 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as @@ -53,6 +53,24 @@ package org.apache.flex.mdl { super(); } + + protected var _ripple:Boolean = false; + /** + * A boolean flag to activate "mdl-js-ripple-effect" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get ripple():Boolean + { + return _ripple; + } + public function set ripple(value:Boolean):void + { + _ripple = value; + } } COMPILE::JS @@ -103,11 +121,30 @@ package org.apache.flex.mdl (icon.element as WrappedHTMLElement).flexjs_wrapper = this; (radio as WrappedHTMLElement).flexjs_wrapper = this; - className = typeNames = 'mdl-radio mdl-js-radio'; + className = 'mdl-radio mdl-js-radio'; return element; }; + protected var _ripple:Boolean = false; + /** + * A boolean flag to activate "mdl-js-ripple-effect" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get ripple():Boolean + { + return _ripple; + } + public function set ripple(value:Boolean):void + { + _ripple = value; + + className += (_ripple ? " mdl-js-ripple-effect" : ""); + } /** * @param e The event object. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65ff7585/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextInput.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextInput.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextInput.as index a53f31e..fac0607 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextInput.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextInput.as @@ -105,6 +105,52 @@ package org.apache.flex.mdl element.flexjs_wrapper = this; return element; - } + } + + private var _floatingLabel:Boolean = false; + /** + * A boolean flag to activate "mdl-textfield--floating-label" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get floatingLabel():Boolean + { + return _floatingLabel; + } + public function set floatingLabel(value:Boolean):void + { + _floatingLabel = value; + + COMPILE::JS + { + positioner.className += (_floatingLabel ? " mdl-textfield--floating-label" : ""); + } + } + + protected var _ripple:Boolean = false; + /** + * A boolean flag to activate "mdl-js-ripple-effect" effect selector. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get ripple():Boolean + { + return _ripple; + } + public function set ripple(value:Boolean):void + { + _ripple = value; + + COMPILE::JS + { + positioner.className += (_ripple ? " mdl-js-ripple-effect" : ""); + } + } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65ff7585/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ButtonEffect.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ButtonEffect.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ButtonEffect.as deleted file mode 100644 index e33d5ef..0000000 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ButtonEffect.as +++ /dev/null @@ -1,228 +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.mdl.beads.MDLEffect; - import org.apache.flex.mdl.Button; - - /** - * The ButtonEffect class is a specialty bead that can be used with - * an MDL button control to apply some MDL complementary effect. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public class ButtonEffect extends MDLEffect - { - /** - * constructor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function ButtonEffect() - { - } - - private var _fab:String = ""; - /** - * A boolean flag to activate "mdl-button--fab" effect selector. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get fab():Boolean - { - return _fab; - } - public function set fab(value:Boolean):void - { - if(value) { - _fab = " mdl-button--fab"; - } else { - _fab = ""; - } - } - - private var _raised:String = ""; - /** - * A boolean flag to activate "mdl-button--raised" effect selector. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get raised():Boolean - { - return _raised; - } - public function set raised(value:Boolean):void - { - if(value) { - _raised = " mdl-button--raised"; - } else { - _raised = ""; - } - } - - private var _colored:String = ""; - /** - * A boolean flag to activate "mdl-button--colored" effect selector. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get colored():Boolean - { - return _colored; - } - public function set colored(value:Boolean):void - { - if(value) { - _colored = " mdl-button--colored"; - } else { - _colored = ""; - } - } - - private var _accent:String = ""; - /** - * A boolean flag to activate "mdl-button--accent" effect selector. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get accent():Boolean - { - return _accent; - } - public function set accent(value:Boolean):void - { - if(value) { - _accent = " mdl-button--accent"; - } else { - _accent = ""; - } - } - - private var _primary:String = ""; - /** - * A boolean flag to activate "mdl-button--primary" effect selector. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get primary():Boolean - { - return _primary; - } - public function set primary(value:Boolean):void - { - if(value) { - _primary = " mdl-button--primary"; - } else { - _primary = ""; - } - } - - private var _minifab:String = ""; - /** - * A boolean flag to activate "mdl-button--mini-fab" effect selector. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get minifab():Boolean - { - return _minifab; - } - public function set minifab(value:Boolean):void - { - if(value) { - _minifab = " mdl-button--mini-fab"; - } else { - _minifab = ""; - } - } - - private var _icon:String = ""; - /** - * A boolean flag to activate "mdl-button--icon" effect selector. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get icon():Boolean - { - return _icon; - } - public function set icon(value:Boolean):void - { - if(value) { - _icon = " mdl-button--icon"; - } else { - _icon = ""; - } - } - - 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.Button; - */ - override public function set strand(value:IStrand):void - { - _strand = value; - - COMPILE::JS - { - if (value is Button) { - var button:Button = value as Button; - button.className = _fab + _raised + _colored + _ripple + _accent + _primary + _minifab + _icon; - } else { - throw new Error("Host component must be an MDL Button."); - } - } - } - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65ff7585/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MDLEffect.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MDLEffect.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MDLEffect.as deleted file mode 100644 index 4694507..0000000 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MDLEffect.as +++ /dev/null @@ -1,105 +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.IBead; - import org.apache.flex.core.IStrand; - import org.apache.flex.core.UIBase; - import org.apache.flex.mdl.Button; - import org.apache.flex.mdl.TextInput; - - /** - * The EffectBead class is a specialty bead that can be used with - * any MDL control to apply some MDL complementary effect. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public class MDLEffect implements IBead - { - /** - * constructor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function MDLEffect() - { - } - - protected var _ripple:String = ""; - /** - * A boolean flag to activate "mdl-js-ripple-effect" effect selector. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get ripple():Boolean - { - return _ripple; - } - public function set ripple(value:Boolean):void - { - if(value) { - _ripple = " mdl-js-ripple-effect"; - } else { - _ripple = ""; - } - } - - 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 HTMLInputElement - * @flexjsignorecoercion org.apache.flex.core.UIBase; - */ - public function set strand(value:IStrand):void - { - _strand = value; - - COMPILE::JS - { - if (value is Button) { - var button:Button = value as Button; - button.className = _ripple; - } else if (value is TextInput) { - var mdTi:TextInput = value as TextInput; - mdTi.positioner.className = mdTi.positioner.className + _ripple; - } else if (value is UIBase) { - var host:UIBase = value as UIBase; - host.className = _ripple; - } else { - throw new Error("Host component must be an MDL control."); - } - } - } - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65ff7585/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextInputEffect.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextInputEffect.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextInputEffect.as deleted file mode 100644 index c66c49a..0000000 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextInputEffect.as +++ /dev/null @@ -1,97 +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.mdl.beads.MDLEffect; - import org.apache.flex.mdl.TextInput; - - - /** - * The TextInputEffect class is a specialty bead that can be used with - * a MDL TextInput control to apply some MDL complementary effect. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public class TextInputEffect extends MDLEffect - { - /** - * constructor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function TextInputEffect() - { - } - - private var _floatingLabel:String = ""; - /** - * A boolean flag to activate "mdl-textfield--floating-label" effect selector. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get floatingLabel():Boolean - { - return _floatingLabel; - } - public function set floatingLabel(value:Boolean):void - { - if(value) { - _floatingLabel = " mdl-textfield--floating-label"; - } else { - _floatingLabel = ""; - } - } - - 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; - */ - override public function set strand(value:IStrand):void - { - _strand = value; - - COMPILE::JS - { - if (value is TextInput) { - var textinput:TextInput = value as TextInput; - textinput.positioner.className = textinput.positioner.className + _floatingLabel; - } else { - throw new Error("Host component must be an MDL TextInput."); - } - } - } - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65ff7585/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 bd2d9ec..e45ef84 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml +++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml @@ -26,9 +26,6 @@ <component id="CheckBox" class="org.apache.flex.mdl.CheckBox"/> <component id="RadioButton" class="org.apache.flex.mdl.RadioButton"/> <component id="TextPrompt" class="org.apache.flex.mdl.beads.TextPrompt"/> - <component id="MDLEffect" class="org.apache.flex.mdl.beads.MDLEffect"/> - <component id="ButtonEffect" class="org.apache.flex.mdl.beads.ButtonEffect"/> - <component id="TextInputEffect" class="org.apache.flex.mdl.beads.TextInputEffect"/> <component id="Disabled" class="org.apache.flex.mdl.beads.Disabled"/> <component id="Slider" class="org.apache.flex.mdl.Slider"/> <component id="Badge" class="org.apache.flex.mdl.beads.Badge"/>
