Revision: 10145
Author: [email protected]
Date: Thu May 5 08:11:08 2011
Log: Update the flute jar to accept double colon notation in css
selectors, rename
it to version 2, and use it throughout gwt.
Review at http://gwt-code-reviews.appspot.com/1431801
Review by: [email protected]
http://code.google.com/p/google-web-toolkit/source/detail?r=10145
Modified:
/trunk/common.ant.xml
/trunk/dev/build.xml
/trunk/eclipse/servlet/.classpath
/trunk/eclipse/user/.classpath
/trunk/user/build.xml
/trunk/user/test/com/google/gwt/resources/client/CSSResourceTest.java
/trunk/user/test/com/google/gwt/resources/client/test.css
=======================================
--- /trunk/common.ant.xml Tue Mar 8 08:22:05 2011
+++ /trunk/common.ant.xml Thu May 5 08:11:08 2011
@@ -236,7 +236,7 @@
<pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
<pathelement
location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
<pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
- <pathelement
location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg1.jar" />
+ <pathelement
location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
<extraclasspaths />
</classpath>
=======================================
--- /trunk/dev/build.xml Tue Apr 19 11:27:51 2011
+++ /trunk/dev/build.xml Thu May 5 08:11:08 2011
@@ -39,7 +39,7 @@
<pathelement
location="${gwt.tools.lib}/jfreechart/jfreechart-1.0.3.jar" />
<pathelement
location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
<pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
- <pathelement
location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg1.jar" />
+ <pathelement
location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
<pathelement
location="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" />
<pathelement
location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final.jar"
/>
<pathelement
location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
=======================================
--- /trunk/eclipse/servlet/.classpath Tue Mar 8 08:22:05 2011
+++ /trunk/eclipse/servlet/.classpath Thu May 5 08:11:08 2011
@@ -6,7 +6,7 @@
<classpathentry kind="var"
path="GWT_TOOLS/lib/tomcat/servlet-api-2.4.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-user"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/>
- <classpathentry kind="var"
path="GWT_TOOLS/lib/w3c/flute/flute-1.3-gg1.jar"/>
+ <classpathentry kind="var"
path="GWT_TOOLS/lib/w3c/flute/flute-1.3-gg2.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/w3c/sac/sac-1.3.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
=======================================
--- /trunk/eclipse/user/.classpath Tue Apr 19 11:27:51 2011
+++ /trunk/eclipse/user/.classpath Thu May 5 08:11:08 2011
@@ -27,7 +27,7 @@
<classpathentry kind="var"
path="GWT_TOOLS/lib/xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/xerces/xerces-2_9_1/xml-apis.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/w3c/sac/sac-1.3.jar"/>
- <classpathentry kind="var"
path="GWT_TOOLS/lib/w3c/flute/flute-1.3-gg1.jar"/>
+ <classpathentry kind="var"
path="GWT_TOOLS/lib/w3c/flute/flute-1.3-gg2.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/cglib/cglib-2.2.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/objenesis/objenesis-1.2.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/easymock/easymock-3.0.jar"/>
=======================================
--- /trunk/user/build.xml Fri Mar 11 11:01:02 2011
+++ /trunk/user/build.xml Thu May 5 08:11:08 2011
@@ -98,7 +98,7 @@
<pathelement
location="${gwt.tools.lib}/jfreechart/jfreechart-1.0.3.jar" />
<pathelement
location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
<pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
- <pathelement
location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg1.jar" />
+ <pathelement
location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
<pathelement
location="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" />
<pathelement
location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
<!-- The source is included so validation is available from client
code -->
@@ -150,7 +150,7 @@
<fileset dir="${javac.out}" />
<zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.5.jar"
excludes="**/*.java"/>
<zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
- <zipfileset src="${gwt.tools.lib}/w3c/flute/flute-1.3-gg1.jar" />
+ <zipfileset src="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
</gwt.jar>
</target>
=======================================
--- /trunk/user/test/com/google/gwt/resources/client/CSSResourceTest.java
Thu Sep 2 06:12:48 2010
+++ /trunk/user/test/com/google/gwt/resources/client/CSSResourceTest.java
Thu May 5 08:11:08 2011
@@ -290,6 +290,8 @@
assertTrue(text.contains("with_underscore:_is_better"));
assertTrue(text.contains("ns\\:tag"));
assertTrue(text.contains("ns\\:tag:pseudo"));
+ assertTrue(text.contains("ns\\:tag::double-pseudo"));
+ assertTrue(text.contains("ns\\:tag::-webkit-scrollbar"));
// Check escaped string values
assertTrue(text.contains("\"Hello\\\\\\\" world\""));
=======================================
--- /trunk/user/test/com/google/gwt/resources/client/test.css Thu Jan 21
09:47:21 2010
+++ /trunk/user/test/com/google/gwt/resources/client/test.css Thu May 5
08:11:08 2011
@@ -128,6 +128,14 @@
ns\:tag:pseudo {
content : "blah";
}
+
+ns\:tag::double-pseudo {
+ content : "blah";
+}
+
+ns\:tag::-webkit-scrollbar {
+ content : "blah";
+}
/* Test merging / promotion functions*/
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
