Revision: 7425
Author: [email protected]
Date: Tue Jan 19 05:26:56 2010
Log: Merged tr...@7316 to prevent !important from being ignored when
merging CSS rules.
$ svn merge -c 7316 --ignore-ancestry
https://google-web-toolkit.googlecode.com/svn/trunk
http://code.google.com/p/google-web-toolkit/source/detail?r=7425
Modified:
/releases/2.0/branch-info.txt
/releases/2.0/user/src/com/google/gwt/resources/css/MergeRulesByContentVisitor.java
/releases/2.0/user/test/com/google/gwt/resources/css/propertyMerging_expected.css
/releases/2.0/user/test/com/google/gwt/resources/css/propertyMerging_test.css
=======================================
--- /releases/2.0/branch-info.txt Fri Jan 15 18:03:38 2010
+++ /releases/2.0/branch-info.txt Tue Jan 19 05:26:56 2010
@@ -1249,3 +1249,8 @@
tr...@7422 was merged into this branch
Fixes issue 4431 UiBinder with Generic Types fails compilation with error
svn merge --ignore-ancestry -c 7422
http://google-web-toolkit.googlecode.com/svn/trunk .
+
+tr...@7316 was merged into this branch
+ Fix issue 4304 where !important was ignored when merging CSS rules.
+ svn merge -c 7316 --ignore-ancestry
https://google-web-toolkit.googlecode.com/svn/trunk
+
=======================================
---
/releases/2.0/user/src/com/google/gwt/resources/css/MergeRulesByContentVisitor.java
Mon Nov 2 12:44:54 2009
+++
/releases/2.0/user/src/com/google/gwt/resources/css/MergeRulesByContentVisitor.java
Tue Jan 19 05:26:56 2010
@@ -55,6 +55,9 @@
StringBuilder b = new StringBuilder();
for (CssProperty p : x.getProperties()) {
b.append(p.getName()).append(":").append(p.getValues().getExpression());
+ if (p.isImportant()) {
+ b.append("!important");
+ }
}
String content = b.toString();
=======================================
---
/releases/2.0/user/test/com/google/gwt/resources/css/propertyMerging_expected.css
Tue Sep 29 13:58:11 2009
+++
/releases/2.0/user/test/com/google/gwt/resources/css/propertyMerging_expected.css
Tue Jan 19 05:26:56 2010
@@ -35,6 +35,14 @@
.f {
unrelated: six;
}
+
+.noMergeImportant1 {
+ property: is;
+}
+
+.noMergeImportant2 {
+ property: is !important;
+}
.noMergeExact1 {
group: three;
=======================================
---
/releases/2.0/user/test/com/google/gwt/resources/css/propertyMerging_test.css
Tue Sep 29 13:58:11 2009
+++
/releases/2.0/user/test/com/google/gwt/resources/css/propertyMerging_test.css
Tue Jan 19 05:26:56 2010
@@ -44,6 +44,14 @@
.g {
group: five;
}
+
+.noMergeImportant1 {
+ property: is;
+}
+
+.noMergeImportant2 {
+ property: is !important;
+}
.noMergeExact1 {
group: three;
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
