You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2010/07/27 01:15:12 UTC
svn commit: r979484 - in /myfaces/trinidad/trunk:
trinidad-examples/trinidad-demo/src/main/webapp/skins/purple/purpleBigFontSkin.css
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java
Author: jwaldman
Date: Mon Jul 26 23:15:11 2010
New Revision: 979484
URL: http://svn.apache.org/viewvc?rev=979484&view=rev
Log:
TRINIDAD-1866 -tr-inhibit does not work with icon skinning selectors
since we already added merging of styles for TRINIDAD-636 (Skinning an icon does not pick up base skin's non-overridden properties), this was an easy fix.
Modified:
myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/skins/purple/purpleBigFontSkin.css
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/skins/purple/purpleBigFontSkin.css
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/skins/purple/purpleBigFontSkin.css?rev=979484&r1=979483&r2=979484&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/skins/purple/purpleBigFontSkin.css (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/skins/purple/purpleBigFontSkin.css Mon Jul 26 23:15:11 2010
@@ -29,5 +29,5 @@
af|selectOrderShuttle::reorder-up-icon {
content: url(/skins/purple/images/prev.png);
-tr-rule-ref: selector(".AFDefaultFont:alias");
- border: 2px solid purple;
+ -tr-inhibit: border;
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java?rev=979484&r1=979483&r2=979484&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java Mon Jul 26 23:15:11 2010
@@ -230,6 +230,7 @@ class SkinStyleSheetParserUtils
selectorName,
noTrPropertyList,
resolvedProperties.getTrRuleRefList(),
+ resolvedProperties.getInhibitedProperties(),
iconNodeList);
if (!hasContentProperty)
@@ -425,6 +426,7 @@ class SkinStyleSheetParserUtils
String selectorName,
List<PropertyNode> noTrPropertyNodeList,
List<String> trRuleRefList,
+ Set<String> inhibitedProperties,
List<IconNode> iconNodeList)
{
@@ -536,7 +538,7 @@ class SkinStyleSheetParserUtils
propertyNodeArray,
null, // TODO includeStyleNodes.toArray(new IncludeStyleNode[0]), TRINIDAD-17
null, //TODO jmw includePropertyNodes
- null // TODO jmw inhibitedProperties
+ inhibitedProperties
);
// Create a new IconNode.