Reviewers: Ray Ryan, Message: Review requested.
Description: This patch makes MergeRulesByContentVisitor respect the !important attribute. http://code.google.com/p/google-web-toolkit/issues/detail?id=4304 Please review this at http://gwt-code-reviews.appspot.com/125802 Affected files: M user/src/com/google/gwt/resources/css/MergeRulesByContentVisitor.java M user/test/com/google/gwt/resources/css/propertyMerging_expected.css M user/test/com/google/gwt/resources/css/propertyMerging_test.css Index: user/src/com/google/gwt/resources/css/MergeRulesByContentVisitor.java diff --git a/user/src/com/google/gwt/resources/css/MergeRulesByContentVisitor.java b/user/src/com/google/gwt/resources/css/MergeRulesByContentVisitor.java index ea3e276caf2a810fcc039ce7896a0fd0ad2adf6e..17e949da9549bb170b96a2cead2936b02f8d9f4e 100644 --- a/user/src/com/google/gwt/resources/css/MergeRulesByContentVisitor.java +++ b/user/src/com/google/gwt/resources/css/MergeRulesByContentVisitor.java @@ -55,6 +55,9 @@ public class MergeRulesByContentVisitor extends CssModVisitor { 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(); Index: user/test/com/google/gwt/resources/css/propertyMerging_expected.css diff --git a/user/test/com/google/gwt/resources/css/propertyMerging_expected.css b/user/test/com/google/gwt/resources/css/propertyMerging_expected.css index 823be8acc5a523f0f1ab10f65f4b741bd8308dfa..284df73513acd7f8909f1b68d9b8dbd7884464ed 100644 --- a/user/test/com/google/gwt/resources/css/propertyMerging_expected.css +++ b/user/test/com/google/gwt/resources/css/propertyMerging_expected.css @@ -36,6 +36,14 @@ unrelated: six; } +.noMergeImportant1 { + property: is; +} + +.noMergeImportant2 { + property: is !important; +} + .noMergeExact1 { group: three; border: blue; Index: user/test/com/google/gwt/resources/css/propertyMerging_test.css diff --git a/user/test/com/google/gwt/resources/css/propertyMerging_test.css b/user/test/com/google/gwt/resources/css/propertyMerging_test.css index c4e5e11c515619a9a4b1c8b277102a8e33cc040a..f9cb49b21e0c7813b1e3957852feadb34255fd9e 100644 --- a/user/test/com/google/gwt/resources/css/propertyMerging_test.css +++ b/user/test/com/google/gwt/resources/css/propertyMerging_test.css @@ -45,6 +45,14 @@ group: five; } +.noMergeImportant1 { + property: is; +} + +.noMergeImportant2 { + property: is !important; +} + .noMergeExact1 { group: three; border: blue; -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
