You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2010/01/07 14:01:05 UTC
svn commit: r896869 - in
/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style:
util/NameUtils.java xml/parse/StyleSheetNodeParser.java
Author: matzew
Date: Thu Jan 7 13:00:03 2010
New Revision: 896869
URL: http://svn.apache.org/viewvc?rev=896869&view=rev
Log:
merging in the bug fix from jwaldman, rev: 896221 (check that revision for details)
Modified:
myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java
myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java
Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java?rev=896869&r1=896868&r2=896869&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java Thu Jan 7 13:00:03 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/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java?rev=896869&r1=896868&r2=896869&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java Thu Jan 7 13:00:03 2010
@@ -87,9 +87,11 @@
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,
null, // icons only supported in skin CSS - not XSS