CSS Media types are comma separated.
Review at http://gwt-code-reviews.appspot.com/1861804
Review by: mdempsky@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@11367 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/resources/css/CssGenerationVisitor.java b/user/src/com/google/gwt/resources/css/CssGenerationVisitor.java
index 32f40a9..cc3065a 100644
--- a/user/src/com/google/gwt/resources/css/CssGenerationVisitor.java
+++ b/user/src/com/google/gwt/resources/css/CssGenerationVisitor.java
@@ -186,8 +186,15 @@
@Override
public boolean visit(CssMediaRule x, Context ctx) {
out.print("@media");
+ boolean isFirst = true;
for (String m : x.getMedias()) {
- out.print(" " + m);
+ if (isFirst) {
+ out.print(" ");
+ isFirst = false;
+ } else {
+ comma();
+ }
+ out.print(m);
}
spaceOpt();
out.print("{");
diff --git a/user/test/com/google/gwt/resources/css/CssNodeClonerTest.java b/user/test/com/google/gwt/resources/css/CssNodeClonerTest.java
index 1323e78..b2e8f8e 100644
--- a/user/test/com/google/gwt/resources/css/CssNodeClonerTest.java
+++ b/user/test/com/google/gwt/resources/css/CssNodeClonerTest.java
@@ -63,7 +63,7 @@
CssStylesheet cloned = CssNodeCloner.clone(CssStylesheet.class, sheet);
- assertEquals("@media print {\n}\n", cloned.toString());
+ assertEquals("@media print, standard {\n}\n", cloned.toString());
}
public void testCloneProperty() {
diff --git a/user/test/com/google/gwt/resources/css/media.css b/user/test/com/google/gwt/resources/css/media.css
index 05d1694..fef5ea5 100644
--- a/user/test/com/google/gwt/resources/css/media.css
+++ b/user/test/com/google/gwt/resources/css/media.css
@@ -14,4 +14,4 @@
* the License.
*/
-@media print {}
+@media print, standard {}
