You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by jw...@apache.org on 2007/01/09 18:25:47 UTC
svn commit: r494508 - in
/incubator/adffaces/branches/jwaldman-portal/trinidad:
trinidad-demo/src/main/webapp/skins/purple/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/
Author: jwaldman
Date: Tue Jan 9 10:25:46 2007
New Revision: 494508
URL: http://svn.apache.org/viewvc?view=rev&rev=494508
Log:
ADFFACES-348 -tr-inhibit: all inhibits all after include styles in skin css files
committed to jwaldman-portal.
(This is needed in the portal work)
Modified:
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java
Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css?view=diff&rev=494508&r1=494507&r2=494508
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css Tue Jan 9 10:25:46 2007
@@ -571,3 +571,24 @@
af|inputText::content {background-color:pink}
}
}
+
+/* Test -tr-inhibit: all and -tr-inhibit a specific css property */
+
+/* this should end up with .portlet-form-input-field {padding: 8px} */
+.portlet-form-input-field {
+/* This should first inhibit all inherited styles. Then everything else
+ should be included.*/
+ -tr-inhibit: all;
+ padding: 8px;
+ /* This should inhibit the background-color that is inherited and/or included,
+ like in .AFLightAccentBackground:alias
+ The order of this does not matter. */
+ -tr-inhibit: background-color;
+ -tr-rule-ref: selector(".AFLightAccentBackground:alias");
+}
+
+/* This test inhibits the text-decoration property that is defined in the base skin */
+.PortletHeaderLink {
+ -tr-inhibit: text-decoration;
+ color: pink;
+}
\ No newline at end of file
Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java?view=diff&rev=494508&r1=494507&r2=494508
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java Tue Jan 9 10:25:46 2007
@@ -130,8 +130,6 @@
if(_INHIBIT_ALL_VALUE.equalsIgnoreCase(property))
{ // Case insensitivity for "all" value
_inhibitAll = true;
- _inhibitedProperties = null;
- break;
}
else
{
@@ -262,7 +260,7 @@
return _resetProperties;
}
- private boolean _inhibitAll;
+
private String _name;
private String _selector;
private PropertyNode[] _properties; // The property nodes
@@ -271,9 +269,12 @@
private IncludePropertyNode[] _includedProperties; // Included properties
private List<String> _inhibitedProperties; // Inhibited properties
- // This flag checks whether the style should inherit properties
+ // These flags checks whether the style should inherit properties
// from equivalent styles defined in earlier style sheets.
+ // This is xss-formatted skin files when resetProperties="true".
private boolean _resetProperties;
+ // This is css-formatted skin files when -tr-inhibit: all.
+ private boolean _inhibitAll;
private static final String _INHIBIT_ALL_VALUE = "all";
}
Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java?view=diff&rev=494508&r1=494507&r2=494508
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java Tue Jan 9 10:25:46 2007
@@ -521,7 +521,7 @@
// end.
// 0. Reset properties?
- if (node.__getResetProperties())
+ if (node.__getResetProperties() || node.isInhibitingAll())
entry.resetProperties();
// 1. Resolve included styles
@@ -672,18 +672,12 @@
}
// 4. Check inhibited properties
- if(node.isInhibitingAll())
+ Iterator<String> inhibitedProperties = node.getInhibitedProperties();
+ while (inhibitedProperties.hasNext())
{
- entry.resetProperties();
- }
- else
- {
- Iterator<String> properties = node.getInhibitedProperties();
- while (properties.hasNext())
- {
- entry.removeProperty(properties.next());
- }
+ entry.removeProperty(inhibitedProperties.next());
}
+
// 5. Add non-included properties
Iterator<PropertyNode> properties = node.getProperties();