Ticket #1958: style-fix.patch

Users/peller/Documents/workspace-dojo/0.4.1_working/src/html/style.js

@@ -444 +444 @@
         if(URI){// fix paths in cssStr
                 cssStr = dojo.html.fixPathsInCssText(cssStr, URI);
         }
-        var style = doc.createElement("style");
-        style.setAttribute("type", "text/css");
-        // IE is b0rken enough to require that we add the element to the doc
-        // before changing it's properties
-        var head = doc.getElementsByTagName("head")[0];
-        if(!head){ // must have a head tag 
-                dojo.debug("No head tag in document, aborting styles");
-                return; //      HTMLStyleElement
-        }else{
-                head.appendChild(style);
-        }
-        if(style.styleSheet){// IE
-                var setFunc = function(){ 
-                        try{
-                                style.styleSheet.cssText = cssStr;
-                        }catch(e){ dojo.debug(e); }
-                };
-                if(style.styleSheet.disabled){
-                        setTimeout(setFunc, 10);
+        var style;
+        var styleElements = doc.getElementsByTagName("style");
+        if(styleElements.length == 0 ) {
+                style = doc.createElement("style");
+                // IE is b0rken enough to require that we add the element to the doc
+                // before changing it's properties
+                var head = doc.getElementsByTagName("head")[0];
+                if(!head){ // must have a head tag 
+                        dojo.debug("No head tag in document, aborting styles");
+                        return;
                 }else{
-                        setFunc();
+                        head.appendChild(style);
                 }
-        }else{ // w3c
-                var cssText = doc.createTextNode(cssStr);
-                style.appendChild(cssText);
+        }else{
+                style = styleElements[0];
         }
+        style.setAttribute("type", "text/css");
+                if(style.styleSheet){// IE
+                style.styleSheet.cssText+= "\n" + cssStr;
+                }else{ // w3c
+                        var cssText = doc.createTextNode("\n" + cssStr);
+                        style.appendChild(cssText);
+        }
         return style;   //      HTMLStyleElement
 }