resourceloader: Remove creation of dynamic-styles marker

[lhc/web/wiklou.git] / resources / src / mediawiki / mediawiki.js

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index 3fe276b..5392702 100644 (file)
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -865,8 +865,13 @@
                                 */
                                jobs = [],
 
-                               // For getMarker()
-                               marker = null,
+                               /**
+                                * For #addEmbeddedCSS() and #addLink()
+                                *
+                                * @private
+                                * @property {HTMLElement|null} marker
+                                */
+                               marker = document.querySelector( 'meta[name="ResourceLoaderDynamicStyles"]' ),
 
                                // For addEmbeddedCSS()
                                cssBuffer = '',
@@ -874,40 +879,24 @@
                                cssCallbacks = $.Callbacks(),
                                rAF = window.requestAnimationFrame || setTimeout;
 
-                       function getMarker() {
-                               if ( !marker ) {
-                                       // Cache
-                                       marker = document.querySelector( 'meta[name="ResourceLoaderDynamicStyles"]' );
-                                       if ( !marker ) {
-                                               mw.log( 'Created ResourceLoaderDynamicStyles marker dynamically' );
-                                               marker = document.createElement( 'meta' );
-                                               marker.name = 'ResourceLoaderDynamicStyles';
-                                               document.head.appendChild( marker );
-                                       }
-                               }
-                               return marker;
-                       }
-
                        /**
                         * Create a new style element and add it to the DOM.
                         *
                         * @private
                         * @param {string} text CSS text
-                        * @param {Node} [nextNode] The element where the style tag
+                        * @param {Node|null} [nextNode] The element where the style tag
                         *  should be inserted before
                         * @return {HTMLElement} Reference to the created style element
                         */
                        function newStyleTag( text, nextNode ) {
-                               var s = document.createElement( 'style' );
-
-                               s.appendChild( document.createTextNode( text ) );
+                               var el = document.createElement( 'style' );
+                               el.appendChild( document.createTextNode( text ) );
                                if ( nextNode && nextNode.parentNode ) {
-                                       nextNode.parentNode.insertBefore( s, nextNode );
+                                       nextNode.parentNode.insertBefore( el, nextNode );
                                } else {
-                                       document.head.appendChild( s );
+                                       document.head.appendChild( el );
                                }
-
-                               return s;
+                               return el;
                        }
 
                        /**
@@ -964,7 +953,7 @@
                                        cssBuffer = '';
                                }
 
-                               $( newStyleTag( cssText, getMarker() ) );
+                               newStyleTag( cssText, marker );
 
                                fireCallbacks();
                        }
@@ -1277,7 +1266,11 @@
                                // see #addEmbeddedCSS, T33676, T43331, and T49277 for details.
                                el.href = url;
 
-                               $( getMarker() ).before( el );
+                               if ( marker && marker.parentNode ) {
+                                       marker.parentNode.insertBefore( el, marker );
+                               } else {
+                                       document.head.appendChild( el );
+                               }
                        }
 
                        /**