From adffaces-commits-return-791-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Fri Sep 08 23:29:43 2006 Return-Path: Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org Received: (qmail 34581 invoked from network); 8 Sep 2006 23:29:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Sep 2006 23:29:38 -0000 Received: (qmail 42832 invoked by uid 500); 8 Sep 2006 23:29:37 -0000 Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org Received: (qmail 42810 invoked by uid 500); 8 Sep 2006 23:29:37 -0000 Mailing-List: contact adffaces-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: adffaces-dev@incubator.apache.org Delivered-To: mailing list adffaces-commits@incubator.apache.org Received: (qmail 42794 invoked by uid 99); 8 Sep 2006 23:29:37 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Sep 2006 16:29:37 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Sep 2006 16:29:36 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A73171A981A; Fri, 8 Sep 2006 16:29:16 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r441688 - /incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java Date: Fri, 08 Sep 2006 23:29:16 -0000 To: adffaces-commits@incubator.apache.org From: jwaldman@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060908232916.A73171A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jwaldman Date: Fri Sep 8 16:29:15 2006 New Revision: 441688 URL: http://svn.apache.org/viewvc?view=rev&rev=441688 Log: allow valid css-2 pseudo-classes, like :hover, to be appended to an icon skinning key. Before this change, if :hover was appended to an icon skinning key, the parser would not consider it an icon anymore, but a style. This sets the stage for renderers to have different icons on mouseover; they would have two keys: af|foo::some-icon and af|foo::some-icon:hover. Then on mouseover, they would use the af|foo::some-icon:hover icon. Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java?view=diff&rev=441688&r1=441687&r2=441688 ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java Fri Sep 8 16:29:15 2006 @@ -223,8 +223,12 @@ // not at the end which is how icons are determined. // our icon names look like .AFWarningIcon:alias // AFErrorIconStyle is a style. + // This supports pseudo-classes on icon definitions (e.g., + // foo-icon:hover- or FooIcon:alias:hover) + // -icon: is a condition because it could be -icon:hover. if (selectorName.endsWith("-icon") || - selectorName.endsWith("Icon:alias")) + (selectorName.indexOf("-icon:") > -1) || + selectorName.indexOf("Icon:alias") > -1) { // knock off the '.' if it is the first character. if (selectorName.charAt(0) == '.')