From: Michael Dale <dale@users.mediawiki.org>
Date: Mon, 9 Nov 2009 05:50:03 +0000 (+0000)
Subject: * fix for usage with js2stopgap loadGM putting msgs in depreciated global
X-Git-Tag: 1.31.0-rc.0~38870
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=a5a473f136bd8c440c08a5877d5b4bf33cc5ad2b;p=lhc%2Fweb%2Fwiklou.git

* fix for usage with js2stopgap loadGM putting msgs in depreciated global
---

diff --git a/js2/mwEmbed/mv_embed.js b/js2/mwEmbed/mv_embed.js
index 452ded6e91..b4c9e86afb 100644
--- a/js2/mwEmbed/mv_embed.js
+++ b/js2/mwEmbed/mv_embed.js
@@ -785,6 +785,11 @@ if( !mv_embed_path ) {
 	
 })(window.$mw);
 
+//load in js2 stopgap into proper location: 
+if(gMsg){
+	$mw.lang.loadGM( gMsg )
+}
+
 //setup legacy global shortcuts:
 var loadGM = $mw.lang.loadGM;
 var loadRS = $mw.lang.loadRS;
@@ -1176,7 +1181,7 @@ function mwdomReady( force ) {
 
 //js2AddOnloadHook: ensure jQuery and the DOM are ready
 function js2AddOnloadHook( func ) {	
-	js_log('js2AddOnloadHook:: jquery:' +func);	
+	//js_log('js2AddOnloadHook:: jquery:' +func);	
 	//check for jQuery then add the load event (to run after video tag rewrites (if present) 
 	mvJsLoader.jQueryCheck( function() {
 		if( mvJsLoader.doneReadyEvents ) {
diff --git a/js2/remoteMwEmbed.js b/js2/remoteMwEmbed.js
index 78275c894b..ba9e85ce9c 100644
--- a/js2/remoteMwEmbed.js
+++ b/js2/remoteMwEmbed.js
@@ -5,7 +5,7 @@
  
 var urlparts = getRemoteEmbedPath();
 var mwEmbedHostPath = urlparts[0];
-var mwRemoteVersion = '1.02';
+var mwRemoteVersion = '1.03';
 
 reqArguments = urlparts[1];
 
@@ -169,6 +169,7 @@ function load_mv_embed( callback ) {
 	if( typeof $mw == 'undefined' ) {	
 		if( reqParam['uselang'] || reqParam['useloader'] ){
 			var rurl = mwEmbedHostPath + '/mwEmbed/jsScriptLoader.php?class=mv_embed';
+			//add jQuery too if we need it: 
 			if(typeof window.jQuery == 'undefined'){
 				rurl+= ',window.jQuery';
 			}