From commits-return-2823-archive-asf-public=cust-asf.ponee.io@royale.apache.org Tue Mar 13 16:21:51 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id C10EF18064F for ; Tue, 13 Mar 2018 16:21:50 +0100 (CET) Received: (qmail 62266 invoked by uid 500); 13 Mar 2018 15:21:49 -0000 Mailing-List: contact commits-help@royale.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@royale.apache.org Delivered-To: mailing list commits@royale.apache.org Received: (qmail 62257 invoked by uid 99); 13 Mar 2018 15:21:49 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2018 15:21:49 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 0A5858099E; Tue, 13 Mar 2018 15:21:48 +0000 (UTC) Date: Tue, 13 Mar 2018 15:21:48 +0000 To: "commits@royale.apache.org" Subject: [royale-asjs] branch feature/uibase-classlist updated: update classList to fix issues. Now work totaly as expected MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152095450891.321.12284325248985474928@gitbox.apache.org> From: carlosrovira@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: royale-asjs X-Git-Refname: refs/heads/feature/uibase-classlist X-Git-Reftype: branch X-Git-Oldrev: 5da7f0ebf5b2e76847928f35c9c2a7e3645dc61e X-Git-Newrev: 2f6296813d63ecd39857b5d5c65398cf01957ef7 X-Git-Rev: 2f6296813d63ecd39857b5d5c65398cf01957ef7 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch feature/uibase-classlist in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/feature/uibase-classlist by this push: new 2f62968 update classList to fix issues. Now work totaly as expected 2f62968 is described below commit 2f6296813d63ecd39857b5d5c65398cf01957ef7 Author: Carlos Rovira AuthorDate: Tue Mar 13 16:21:45 2018 +0100 update classList to fix issues. Now work totaly as expected --- .../main/royale/org/apache/royale/core/UIBase.as | 38 ++++++++++++++++++++-- .../main/royale/org/apache/royale/jewel/Button.as | 5 ++- .../royale/org/apache/royale/jewel/TextButton.as | 4 +-- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/core/UIBase.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/core/UIBase.as index 7abe638..2d279c0 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/core/UIBase.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/core/UIBase.as @@ -1025,8 +1025,39 @@ package org.apache.royale.core * * @royalesuppresspublicvarwarning */ - public var typeNames:String; + private var _typeNames:String; + /** + * The classname. Often used for CSS + * class selector lookups. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion Royale 0.0 + */ + public function get typeNames():String + { + return _typeNames; + } + + /** + * @private + */ + public function set typeNames(value:String):void + { + if (_typeNames !== value) + { + _typeNames = value; + + COMPILE::JS + { + element.className = ""; + setClassName(_typeNames); + } + } + } + private var _className:String; /** @@ -1054,7 +1085,7 @@ package org.apache.royale.core COMPILE::JS { - setClassName(_className); + setClassName(typeNames ? typeNames + " " + _className : _className); } dispatchEvent(new Event("classNameChanged")); @@ -1064,7 +1095,8 @@ package org.apache.royale.core COMPILE::JS protected function setClassName(value:String):void { - element.classList.add(value); + var classes:Array = value.split(" "); + element.classList.add.apply(element.classList, classes); } /** diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as index 224c789..53f58e4 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as @@ -59,9 +59,8 @@ package org.apache.royale.jewel { super(); - COMPILE::JS { - element.classList.add("jewel", "button"); - } + + typeNames = "jewel button"; } private var _primary:Boolean = false; diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextButton.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextButton.as index 23eb625..67fdcdd 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextButton.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextButton.as @@ -51,9 +51,7 @@ package org.apache.royale.jewel { super(); - COMPILE::JS { - element.classList.add("jewel", "textbutton"); - } + typeNames = "jewel textbutton"; } /** -- To stop receiving notification emails like this one, please contact carlosrovira@apache.org.