Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 764A81060F for ; Tue, 23 Dec 2014 07:41:25 +0000 (UTC) Received: (qmail 11763 invoked by uid 500); 23 Dec 2014 07:41:25 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 11682 invoked by uid 500); 23 Dec 2014 07:41:24 -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 11459 invoked by uid 99); 23 Dec 2014 07:41:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Dec 2014 07:41:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7EB3DA348B3; Tue, 23 Dec 2014 07:41:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aharui@apache.org To: commits@flex.apache.org Date: Tue, 23 Dec 2014 07:41:31 -0000 Message-Id: In-Reply-To: <2a66ba97e000400dba6d916b65e53f0b@git.apache.org> References: <2a66ba97e000400dba6d916b65e53f0b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/28] git commit: [flex-asjs] [refs/heads/develop] - maintain type selectors when setting class selectors maintain type selectors when setting class selectors Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c6aa3477 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c6aa3477 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c6aa3477 Branch: refs/heads/develop Commit: c6aa347787ed2f0d949e671089681f198267881b Parents: 0e5eab0 Author: Alex Harui Authored: Wed Dec 17 17:55:22 2014 -0800 Committer: Alex Harui Committed: Wed Dec 17 17:55:22 2014 -0800 ---------------------------------------------------------------------- frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js | 9 ++++++++- frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6aa3477/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js index c5c9204..5035b8c 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js @@ -675,6 +675,13 @@ org.apache.flex.core.UIBase.prototype.set_id = function(value) { * @expose * @type {string} */ +org.apache.flex.core.UIBase.prototype.typeNames = ''; + + +/** + * @expose + * @type {string} + */ org.apache.flex.core.UIBase.prototype.className = ''; @@ -694,7 +701,7 @@ org.apache.flex.core.UIBase.prototype.get_className = function() { org.apache.flex.core.UIBase.prototype.set_className = function(value) { if (this.className !== value) { - this.element.className = value; + this.element.className = this.typeNames ? value + " " + this.typeNames : value; this.className = value; this.dispatchEvent('classNameChanged'); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6aa3477/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js index 50f1607..446845b 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js @@ -116,6 +116,7 @@ org.apache.flex.html.Panel.prototype.createElement = this.element = document.createElement('div'); this.element.className = 'Panel'; + this.typeNames = "Panel"; this.contentArea = document.createElement('div'); this.contentArea.flexjs_wrapper = this;