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/01/05 22:17:30 UTC
svn commit: r896221 - in
/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style:
util/NameUtils.java xml/parse/StyleSheetNodeParser.java
Author: jwaldman
Date: Tue Jan 5 21:17:30 2010
New Revision: 896221
URL: http://svn.apache.org/viewvc?rev=896221&view=rev
Log:
fix bug where the css file was missing most of the selectors from the .xss skinning files.
The reason was that the AgentAtRuleMatcher was being checked, even for StyleSheetNode's that did not have browsers specified.
Therefore only the StyleSheetNodes with browsers specified and that matched the user's browser were being included in the css.
Modified:
myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java
myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java
Modified: myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java?rev=896221&r1=896220&r2=896221&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java (original)
+++ myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java Tue Jan 5 21:17:30 2010
@@ -600,6 +600,11 @@
return new boolean[] { true, true };
}
}
+ else
+ {
+ // no agent matcher, so all agents match
+ browserMatched = true;
+ }
}
return new boolean[] { browserMatched, false };
Modified: myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java?rev=896221&r1=896220&r2=896221&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java (original)
+++ myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java Tue Jan 5 21:17:30 2010
@@ -87,8 +87,10 @@
styles = new StyleNode[_styles.size()];
_styles.copyInto(styles);
}
-
- AgentAtRuleMatcher agentMatcher = new AgentAtRuleMatcher(_browsers, _versions);
+ // Do not create an agentMatcher if there are no browsers or versions to compare against.
+ // This way a styleSheetNode will match any browser if it hasn't specified a specific browser.
+ AgentAtRuleMatcher agentMatcher =
+ (_browsers.isEmpty()) ? null : new AgentAtRuleMatcher(_browsers, _versions);
return new StyleSheetNode(
styles,