From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Tue, 14 Dec 2010 00:02:21 +0000 (+0000)
Subject: Fixes r78104 much better than r78344 did. By adding jquery.cookie to the loading... 
X-Git-Tag: 1.31.0-rc.0~33327
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=405e5e0b90f37b89d5a52bafdd07695d9f5474cc;p=lhc%2Fweb%2Fwiklou.git

Fixes r78104 much better than r78344 did. By adding jquery.cookie to the loading queue just after declaring mediaWiki we can ensure it's in the first batch of modules that are fetched - essentially adding it to the initial payload.
---

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index fc7aa10c8d..641459f967 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -335,7 +335,6 @@ window.mediaWiki = new ( function( $ ) {
 			if ( name ) {
 				return name;
 			}
-			mediaWiki.loader.load( 'jquery.cookie' );
 			var sessionId = $.cookie( 'mediaWiki.user.sessionId' );
 			if ( typeof sessionId == 'undefined' || sessionId == null ) {
 				sessionId = generateSessionId();
@@ -1143,6 +1142,9 @@ if ( typeof startUp === 'function' ) {
 	delete startUp;
 }
 
+// Add jQuery Cookie to initial payload (used in mediaWiki.user)
+mediaWiki.loader.load( 'jquery.cookie' );
+
 // Alias $j to jQuery for backwards compatibility
 window.$j = jQuery;
 window.mw = mediaWiki;