From: Michael Dale Date: Thu, 8 Oct 2009 15:32:28 +0000 (+0000) Subject: * added fallback for load rule set call (loadRS) X-Git-Tag: 1.31.0-rc.0~39344 X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=aa1ab62753b16efa9b7298a5635ca03e55f19145;p=lhc%2Fweb%2Fwiklou.git * added fallback for load rule set call (loadRS) --- diff --git a/js2/mwEmbed/mv_embed.js b/js2/mwEmbed/mv_embed.js index d3f732b21c..935b431416 100644 --- a/js2/mwEmbed/mv_embed.js +++ b/js2/mwEmbed/mv_embed.js @@ -122,6 +122,7 @@ if( !mv_embed_path ) { gMsg[ i ] = msgSet[i]; } }, + /** * loadRS function * Loads a ruleset by given template key ie PLURAL : { //ruleSetObj } @@ -600,6 +601,7 @@ if( !mv_embed_path ) { })(window.$mw); //setup legacy global shortcuts: var loadGM = $mw.lang.loadGM; +var loadRS = $mw.lang.loadRS; var gM = $mw.lang.gM; //if some no-js2 script defined and loaded gMsg in global space: @@ -844,7 +846,7 @@ var mvJsLoader = { }else{ var scriptPath = puri.path; } - js_log('scriptServer Path is: ' + scriptPath + "\n host script path:" + getMvEmbedURL() ); + //js_log('scriptServer Path is: ' + scriptPath + "\n host script path:" + getMvEmbedURL() ); var dbug_attr = ( puri.queryKey['debug'] ) ? '&debug=true' : ''; this.libs[ last_class ] = scriptPath + '?class=' + class_set + '&urid=' + getMvUniqueReqId() + dbug_attr; diff --git a/js2/remoteMwEmbed.js b/js2/remoteMwEmbed.js index 0b3a61ae8f..41696cc0c1 100644 --- a/js2/remoteMwEmbed.js +++ b/js2/remoteMwEmbed.js @@ -2,7 +2,7 @@ * this file exposes some of the functionality of mwEmbed to wikis * that do not yet have js2 enabled */ - + var urlparts = getRemoteEmbedPath(); var mwEmbedHostPath = urlparts[0]; var reqAguments = urlparts[1]; @@ -23,7 +23,7 @@ function doPageSpecificRewrite() { } // Firefogg integration - if( wgPageName == "Special:Upload" ){ + if( wgPageName == "Special:Upload" ){ load_mv_embed( function() { importScriptURI( mwEmbedHostPath + '/uploadPage.js' + reqAguments ); } );