You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by gc...@apache.org on 2014/05/21 23:03:25 UTC

svn commit: r1596683 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java

Author: gcrawford
Date: Wed May 21 21:03:24 2014
New Revision: 1596683

URL: http://svn.apache.org/r1596683
Log:
TRINIDAD-2472 skin properties mentioned inside client rule are getting applied

thanks anand

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java?rev=1596683&r1=1596682&r2=1596683&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java Wed May 21 21:03:24 2014
@@ -1000,6 +1000,13 @@ public class FileSystemStyleCache implem
     
     for (StyleNode styleNode : styleNodes)
     {
+      if (styleNode.hasClientRule())
+      {
+        // skin property is a server side concept and we do not know the client rule
+        // applicability. Therefore, we don't need to consider styles with client rules
+        continue;
+      }
+
       Collection<PropertyNode> skinPropertyNodes = styleNode.getSkinProperties();
       
       for (PropertyNode node : skinPropertyNodes)