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 642D1200BB6 for ; Fri, 4 Nov 2016 23:49:07 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 62E13160B11; Fri, 4 Nov 2016 22:49:07 +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 B209D160B07 for ; Fri, 4 Nov 2016 23:49:06 +0100 (CET) Received: (qmail 47500 invoked by uid 500); 4 Nov 2016 22:49:03 -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 47066 invoked by uid 99); 4 Nov 2016 22:49:02 -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; Fri, 04 Nov 2016 22:49:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D6253F0BE6; Fri, 4 Nov 2016 22:49:02 +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 Date: Fri, 04 Nov 2016 22:49:29 -0000 Message-Id: <649cd4ad555f4621803da56e093de319@git.apache.org> In-Reply-To: <333893bd332b4addafffbc6d3b3bf00f@git.apache.org> References: <333893bd332b4addafffbc6d3b3bf00f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [28/36] git commit: [flex-asjs] [refs/heads/feature/mdl] - Minor changes archived-at: Fri, 04 Nov 2016 22:49:07 -0000 Minor changes Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/272857bc Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/272857bc Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/272857bc Branch: refs/heads/feature/mdl Commit: 272857bcc480acae2ac485d6f53ab44e32cc2aa5 Parents: 77e03cf Author: Carlos Rovira Authored: Thu Oct 27 18:28:34 2016 +0200 Committer: Carlos Rovira Committed: Fri Nov 4 23:48:31 2016 +0100 ---------------------------------------------------------------------- examples/flexjs/MDLExample/pom.xml | 6 ++ .../flexjs/MDLExample/src/main/flex/App.mxml | 6 +- .../src/main/resources/mdl-styles.css | 20 ++--- .../main/flex/org/apache/flex/mdl/CheckBox.as | 85 ++++++-------------- .../flex/org/apache/flex/mdl/beads/Disabled.as | 20 ++++- .../src/main/resources/defaults.css | 7 +- 6 files changed, 66 insertions(+), 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/272857bc/examples/flexjs/MDLExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/pom.xml b/examples/flexjs/MDLExample/pom.xml index 3a31b25..1503b57 100644 --- a/examples/flexjs/MDLExample/pom.xml +++ b/examples/flexjs/MDLExample/pom.xml @@ -44,6 +44,12 @@ 20.0 App.mxml + + + defaults.css + ../src/main/resources/defaults.css + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/272857bc/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 472f556..9f76732 100644 --- a/examples/flexjs/MDLExample/src/main/flex/App.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/App.mxml @@ -53,20 +53,20 @@ limitations under the License. - + - + - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/272857bc/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css b/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css index 6a07905..3da8515 100644 --- a/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css +++ b/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css @@ -19,14 +19,16 @@ //////////////////////////////////////////////////////////////////////////////// */ -.demo-card-wide.mdl-card { - width: 512px; +@namespace "library://ns.apache.org/flexjs/basic"; + +.flexjs *, . flexjs *:before, . flexjs *:after { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; } -.demo-card-wide > .mdl-card__title { - color: #fff; - height: 176px; - background: url('welcome_card.jpg') center / cover; + +Application +{ + padding: 10px; + margin: 10px; } -.demo-card-wide > .mdl-card__menu { - color: #fff; -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/272857bc/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 4f2bf9e..a4d2a4c 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 @@ -73,64 +73,31 @@ package org.apache.flex.mdl */ override protected function createElement():WrappedHTMLElement { - label = document.createElement('label') as HTMLLabelElement; - element = label as WrappedHTMLElement; - - input = document.createElement('input') as HTMLInputElement; - input.type = 'checkbox'; - input.className = 'mdl-checkbox__input'; - //input.addEventListener('change', selectionChangeHandler, false); - label.appendChild(input); - - checkbox = document.createElement('span') as HTMLSpanElement; - checkbox.className = 'mdl-checkbox__label'; - //checkbox.addEventListener('mouseover', mouseOverHandler, false); - //checkbox.addEventListener('mouseout', mouseOutHandler, false); - label.appendChild(checkbox); - - textNode = document.createTextNode('') as Text; - checkbox.appendChild(textNode); - - positioner = element; - positioner.style.position = 'relative'; - (input as WrappedHTMLElement).flexjs_wrapper = this; - (checkbox as WrappedHTMLElement).flexjs_wrapper = this; - element.flexjs_wrapper = this; - - className = typeNames = 'mdl-checkbox mdl-js-checkbox'; + label = document.createElement('label') as HTMLLabelElement; + element = label as WrappedHTMLElement; + + input = document.createElement('input') as HTMLInputElement; + input.type = 'checkbox'; + input.className = 'mdl-checkbox__input'; + label.appendChild(input); + + checkbox = document.createElement('span') as HTMLSpanElement; + checkbox.className = 'mdl-checkbox__label'; + label.appendChild(checkbox); + + textNode = document.createTextNode('') as Text; + checkbox.appendChild(textNode); + + positioner = element; + positioner.style.position = 'relative'; + (input as WrappedHTMLElement).flexjs_wrapper = this; + (checkbox as WrappedHTMLElement).flexjs_wrapper = this; + element.flexjs_wrapper = this; + + className = typeNames = 'mdl-checkbox mdl-js-checkbox'; - return element; - }; - - - /** - */ - private function mouseOverHandler(event:Event):void - { - //checkbox.className = 'checkbox-icon-hover'; - } - - /** - */ - private function mouseOutHandler(event:Event):void - { - /*if (input.checked) - checkbox.className = 'checkbox-icon-checked'; - else - checkbox.className = 'checkbox-icon';*/ - } - - - /** - */ - private function selectionChangeHandler(event:Event):void - { - /*if (input.checked) - checkbox.className = 'checkbox-icon-checked'; - else - checkbox.className = 'checkbox-icon';*/ - } - + return element; + }; public function get text():String { @@ -150,10 +117,6 @@ package org.apache.flex.mdl public function set selected(value:Boolean):void { input.checked = value; - /*if (value) - checkbox.className = 'checkbox-icon-checked'; - else - checkbox.className = 'checkbox-icon';*/ } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/272857bc/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Disabled.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Disabled.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Disabled.as index 46067ff..fcec373 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Disabled.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Disabled.as @@ -46,6 +46,24 @@ package org.apache.flex.mdl.beads { } + private var _disabled:Boolean = true; + /** + * A boolean flag to enable or disable the host control. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get disabled():Boolean + { + return _disabled; + } + public function set disabled(value:Boolean):void + { + _disabled = value; + } + private var _strand:IStrand; /** @@ -69,7 +87,7 @@ package org.apache.flex.mdl.beads //if (host.element is HTMLInputElement) //{ input = host.element as HTMLInputElement; - input.disabled = "disabled"; + //input.disabled = _disabled ? "disabled" : ""; //} else //{ // throw new Error("Host element component in not type input"); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/272857bc/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css index ae61dc6..8e538a1 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css +++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css @@ -21,10 +21,9 @@ @namespace "library://ns.apache.org/flexjs/basic"; @namespace mdl "library://ns.apache.org/flexjs/mdl"; -.flexjs *, . flexjs *:before, . flexjs *:after { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; +mdl|CheckBox +{ + IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel"); }