]> source.dussan.org Git - vaadin-framework.git/commitdiff
Revert "Replaced css inject hack in TestUtils with Page.Styles.add() #11798"
authorLeif Åstrand <leif@vaadin.com>
Tue, 14 May 2013 12:22:39 +0000 (12:22 +0000)
committerVaadin Code Review <review@vaadin.com>
Tue, 14 May 2013 14:17:28 +0000 (14:17 +0000)
Removing this change to make the tests behave more nicely until #11848 has been fixed.

This reverts commit f2c2236cf8d0428f100e17586f7946095ffea158

Change-Id: I776699f5082273e9c4d11248cc35e7ed6b665873

uitest/src/com/vaadin/tests/util/TestUtils.java

index dcd28c34136e7d10204d24b2c83586a0a102b207..5c6315a23aa191c44e1858092d8ddafe867069b5 100644 (file)
@@ -99,13 +99,22 @@ public class TestUtils {
             "YE", "ZAMBIA", "ZM", "ZIMBABWE", "ZW" };
 
     /**
-     * Injects css into the current window. Can be used to keep tests css in
-     * source files.
+     * Crossbrowser hack to dynamically add css current window. Can be used to
+     * keep tests css in source files.
      * 
      * @param cssString
      */
     public static void injectCSS(UI w, String cssString) {
-        w.getPage().getStyles().add(cssString);
+        String script = "if ('\\v'=='v') /* ie only */ {\n"
+                + "        document.createStyleSheet().cssText = '"
+                + cssString
+                + "';\n"
+                + "    } else {var tag = document.createElement('style'); tag.type = 'text/css';"
+                + " document.getElementsByTagName('head')[0].appendChild(tag);tag[ (typeof "
+                + "document.body.style.WebkitAppearance=='string') /* webkit only */ ? 'innerText' "
+                + ": 'innerHTML'] = '" + cssString + "';}";
+
+        w.getPage().getJavaScript().execute(script);
     }
 
     public static void installPerformanceReporting(TextArea targetTextArea) {