From 902f5779af3169cd61330e02a12435c8fef905f6 Mon Sep 17 00:00:00 2001
From: Hashar <hashar@free.fr>
Date: Mon, 8 Apr 2013 19:04:31 +0000
Subject: [PATCH] Revert "mw.loader: Fix regression that caused CSS load after
 scripts."

Broke master tests since it causes a JSDuck issue. See bug 47018.

This reverts commit be5f73b595b8fef0697bf83e9ebd13e85756c099

Change-Id: I2d945b7ffb7cfbcc5024a1c3bdcf0c9506b0cf76
---
 resources/mediawiki/mediawiki.js              | 143 ++++++------------
 .../resources/mediawiki/mediawiki.test.js     |  42 ++---
 2 files changed, 72 insertions(+), 113 deletions(-)

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 62ad1cef31..0da9d875d8 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -362,7 +362,7 @@ var mw = ( function ( $, undefined ) {
 			 *             'dependencies': ['required.foo', 'bar.also', ...], (or) function () {}
 			 *             'group': 'somegroup', (or) null,
 			 *             'source': 'local', 'someforeignwiki', (or) null
-			 *             'state': 'registered', 'loaded', 'loading', 'ready', 'error' or 'missing'
+			 *             'state': 'registered', 'loading', 'loaded', 'ready', 'error' or 'missing'
 			 *             'script': ...,
 			 *             'style': ...,
 			 *             'messages': { 'key': 'value' },
@@ -392,9 +392,7 @@ var mw = ( function ( $, undefined ) {
 				// Selector cache for the marker element. Use getMarker() to get/use the marker!
 				$marker = null,
 				// Buffer for addEmbeddedCSS.
-				cssBuffer = '',
-				// Callbacks for addEmbeddedCSS.
-				cssCallbacks = $.Callbacks();
+				cssBuffer = '';
 
 			/* Private methods */
 
@@ -471,15 +469,10 @@ var mw = ( function ( $, undefined ) {
 			/**
 			 * @param {string} [cssText=cssBuffer] If called without cssText,
 			 * the internal buffer will be inserted instead.
-			 * @param {Function} callback
 			 */
-			function addEmbeddedCSS( cssText, callback ) {
+			function addEmbeddedCSS( cssText ) {
 				var $style, styleEl;
 
-				if ( callback ) {
-					cssCallbacks.add( callback );
-				}
-
 				// Yield once before inserting the <style> tag. There are likely
 				// more calls coming up which we can combine this way.
 				// Appending a stylesheet and waiting for the browser to repaint
@@ -537,14 +530,11 @@ var mw = ( function ( $, undefined ) {
 						} else {
 							styleEl.appendChild( document.createTextNode( String( cssText ) ) );
 						}
-						cssCallbacks.fire().empty();
 						return;
 					}
 				}
 
 				$( addStyleTag( cssText, getMarker() ) ).data( 'ResourceLoaderDynamicStyleTag', true );
-
-				cssCallbacks.fire().empty();
 			}
 
 			/**
@@ -889,8 +879,7 @@ var mw = ( function ( $, undefined ) {
 			 * @param {string} module Module name to execute
 			 */
 			function execute( module ) {
-				var key, value, media, i, urls, cssHandle, checkCssHandles,
-					cssHandlesRegistered = false;
+				var key, value, media, i, urls, script, markModuleReady, nestedAddScript;
 
 				if ( registry[module] === undefined ) {
 					throw new Error( 'Module has not been registered yet: ' + module );
@@ -899,7 +888,7 @@ var mw = ( function ( $, undefined ) {
 				} else if ( registry[module].state === 'loading' ) {
 					throw new Error( 'Module has not completed loading yet: ' + module );
 				} else if ( registry[module].state === 'ready' ) {
-					throw new Error( 'Module has already been executed: ' + module );
+					throw new Error( 'Module has already been loaded: ' + module );
 				}
 
 				/**
@@ -917,80 +906,6 @@ var mw = ( function ( $, undefined ) {
 					el.href = url;
 				}
 
-				function runScript() {
-					var script, markModuleReady, nestedAddScript;
-					try {
-						script = registry[module].script;
-						markModuleReady = function () {
-							registry[module].state = 'ready';
-							handlePending( module );
-						};
-						nestedAddScript = function ( arr, callback, async, i ) {
-							// Recursively call addScript() in its own callback
-							// for each element of arr.
-							if ( i >= arr.length ) {
-								// We're at the end of the array
-								callback();
-								return;
-							}
-
-							addScript( arr[i], function () {
-								nestedAddScript( arr, callback, async, i + 1 );
-							}, async );
-						};
-
-						if ( $.isArray( script ) ) {
-							nestedAddScript( script, markModuleReady, registry[module].async, 0 );
-						} else if ( $.isFunction( script ) ) {
-							registry[module].state = 'ready';
-							script( $ );
-							handlePending( module );
-						}
-					} catch ( e ) {
-						// This needs to NOT use mw.log because these errors are common in production mode
-						// and not in debug mode, such as when a symbol that should be global isn't exported
-						log( 'Exception thrown by ' + module + ': ' + e.message, e );
-						registry[module].state = 'error';
-						handlePending( module );
-					}
-				}
-
-				// This used to be inside runScript, but since that is now fired asychronously
-				// (after CSS is loaded) we need to set it here right away. It is crucial that
-				// when execute() is called this is set synchronously, otherwise modules will get
-				// executed multiple times as the registry will state that it isn't loading yet.
-				registry[module].state = 'loading';
-
-				// Add localizations to message system
-				if ( $.isPlainObject( registry[module].messages ) ) {
-					mw.messages.set( registry[module].messages );
-				}
-
-				// Make sure we don't run the scripts until all (potentially asynchronous)
-				// stylesheet insertions have completed.
-				( function () {
-					var pending = 0;
-					checkCssHandles = function () {
-						// cssHandlesRegistered ensures we don't take off too soon, e.g. when
-						// one of the cssHandles is fired while we're still creating more handles.
-						if ( cssHandlesRegistered && pending === 0 && runScript ) {
-							runScript();
-							runScript = undefined; // Revoke
-						}
-					};
-					cssHandle = function () {
-						var check = checkCssHandles;
-						pending++;
-						return function () {
-							if (check) {
-								pending--;
-								check();
-								check = undefined; // Revoke
-							}
-						};
-					};
-				}() );
-
 				// Process styles (see also mw.loader.implement)
 				// * back-compat: { <media>: css }
 				// * back-compat: { <media>: [url, ..] }
@@ -1009,7 +924,7 @@ var mw = ( function ( $, undefined ) {
 								// Strings are pre-wrapped in "@media". The media-type was just ""
 								// (because it had to be set to something).
 								// This is one of the reasons why this format is no longer used.
-								addEmbeddedCSS( value, cssHandle() );
+								addEmbeddedCSS( value );
 							} else {
 								// back-compat: { <media>: [url, ..] }
 								media = key;
@@ -1026,7 +941,7 @@ var mw = ( function ( $, undefined ) {
 									addLink( media, value[i] );
 								} else if ( key === 'css' ) {
 									// { "css": [css, ..] }
-									addEmbeddedCSS( value[i], cssHandle() );
+									addEmbeddedCSS( value[i] );
 								}
 							}
 						// Not an array, but a regular object
@@ -1043,9 +958,47 @@ var mw = ( function ( $, undefined ) {
 					}
 				}
 
-				// Kick off.
-				cssHandlesRegistered = true;
-				checkCssHandles();
+				// Add localizations to message system
+				if ( $.isPlainObject( registry[module].messages ) ) {
+					mw.messages.set( registry[module].messages );
+				}
+
+				// Execute script
+				try {
+					script = registry[module].script;
+					markModuleReady = function () {
+						registry[module].state = 'ready';
+						handlePending( module );
+					};
+					nestedAddScript = function ( arr, callback, async, i ) {
+						// Recursively call addScript() in its own callback
+						// for each element of arr.
+						if ( i >= arr.length ) {
+							// We're at the end of the array
+							callback();
+							return;
+						}
+
+						addScript( arr[i], function () {
+							nestedAddScript( arr, callback, async, i + 1 );
+						}, async );
+					};
+
+					if ( $.isArray( script ) ) {
+						registry[module].state = 'loading';
+						nestedAddScript( script, markModuleReady, registry[module].async, 0 );
+					} else if ( $.isFunction( script ) ) {
+						registry[module].state = 'ready';
+						script( $ );
+						handlePending( module );
+					}
+				} catch ( e ) {
+					// This needs to NOT use mw.log because these errors are common in production mode
+					// and not in debug mode, such as when a symbol that should be global isn't exported
+					log( 'Exception thrown by ' + module + ': ' + e.message, e );
+					registry[module].state = 'error';
+					handlePending( module );
+				}
 			}
 
 			/**
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index 3dda7c7882..7ae9826646 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -269,7 +269,7 @@
 	function assertStyleAsync( assert, $element, prop, val, fn ) {
 		var styleTestStart,
 			el = $element.get( 0 ),
-			styleTestTimeout = ( QUnit.config.testTimeout || 5000 ) - 200;
+			styleTestTimeout = ( QUnit.config.testTimeout - 200 ) || 5000;
 
 		function isCssImportApplied() {
 			// Trigger reflow, repaint, redraw, whatever (cross-browser)
@@ -340,7 +340,7 @@
 		} );
 	} );
 
-	QUnit.asyncTest( 'mw.loader.implement( styles={ "css": [text, ..] } )', 2, function ( assert ) {
+	QUnit.test( 'mw.loader.implement( styles={ "css": [text, ..] } )', 2, function ( assert ) {
 		var $element = $( '<div class="mw-test-implement-a"></div>' ).appendTo( '#qunit-fixture' );
 
 		assert.notEqual(
@@ -352,12 +352,15 @@
 		mw.loader.implement(
 			'test.implement.a',
 			function () {
-				assert.equal(
-					$element.css( 'float' ),
-					'right',
-					'style is applied'
-				);
-				QUnit.start();
+				QUnit.stop();
+				setTimeout(function () {
+					assert.equal(
+						$element.css( 'float' ),
+						'right',
+						'style is applied'
+					);
+					QUnit.start();
+				});
 			},
 			{
 				'all': '.mw-test-implement-a { float: right; }'
@@ -433,8 +436,8 @@
 		] );
 	} );
 
-	// Backwards compatibility
-	QUnit.asyncTest( 'mw.loader.implement( styles={ <media>: text } ) (back-compat)', 2, function ( assert ) {
+// Backwards compatibility
+	QUnit.test( 'mw.loader.implement( styles={ <media>: text } ) (back-compat)', 2, function ( assert ) {
 		var $element = $( '<div class="mw-test-implement-c"></div>' ).appendTo( '#qunit-fixture' );
 
 		assert.notEqual(
@@ -446,12 +449,15 @@
 		mw.loader.implement(
 			'test.implement.c',
 			function () {
-				assert.equal(
-					$element.css( 'float' ),
-					'right',
-					'style is applied'
-				);
-				QUnit.start();
+				QUnit.stop();
+				setTimeout(function () {
+					assert.equal(
+						$element.css( 'float' ),
+						'right',
+						'style is applied'
+					);
+					QUnit.start();
+				});
 			},
 			{
 				'all': '.mw-test-implement-c { float: right; }'
@@ -464,7 +470,7 @@
 		] );
 	} );
 
-	// Backwards compatibility
+// Backwards compatibility
 	QUnit.asyncTest( 'mw.loader.implement( styles={ <media>: [url, ..] } ) (back-compat)', 4, function ( assert ) {
 		var $element = $( '<div class="mw-test-implement-d"></div>' ).appendTo( '#qunit-fixture' ),
 			$element2 = $( '<div class="mw-test-implement-d2"></div>' ).appendTo( '#qunit-fixture' );
@@ -502,7 +508,7 @@
 		] );
 	} );
 
-	// @import (bug 31676)
+// @import (bug 31676)
 	QUnit.asyncTest( 'mw.loader.implement( styles has @import)', 5, function ( assert ) {
 		var isJsExecuted, $element;
 
-- 
2.20.1