http://www.mediawiki.org/wiki/Special:Code/MediaWiki/66457

Revision: 66457
Author:   dale
Date:     2010-05-14 23:19:38 +0000 (Fri, 14 May 2010)

Log Message:
-----------
fixed loaderContext path for raw file mode

Modified Paths:
--------------
    trunk/extensions/JS2Support/ScriptLoaderOutputPage.php
    trunk/extensions/JS2Support/mwEmbed/loader.js
    trunk/extensions/UploadWizard/loader.js

Modified: trunk/extensions/JS2Support/ScriptLoaderOutputPage.php
===================================================================
--- trunk/extensions/JS2Support/ScriptLoaderOutputPage.php      2010-05-14 
23:08:21 UTC (rev 66456)
+++ trunk/extensions/JS2Support/ScriptLoaderOutputPage.php      2010-05-14 
23:19:38 UTC (rev 66457)
@@ -380,7 +380,7 @@
                                // ( so that javascript modules can use 
relative paths )
                                $loaderDir =  $modulePath . "/";
                                $this->addScript(  Html::inlineScript(
-                                       "mw.setConfig( 'loaderContext',  '" . 
xml::escapeJsString( $loaderDir  ) . "');"
+                                       "mw.setConfig( 'loaderContext',  '" . 
xml::escapeJsString( $wgScriptPath .'/'. $loaderDir  ) . "');"
                                ) );
                                $this->addScriptFile(
                                        "$wgScriptPath/$modulePath/loader.js"

Modified: trunk/extensions/JS2Support/mwEmbed/loader.js
===================================================================
--- trunk/extensions/JS2Support/mwEmbed/loader.js       2010-05-14 23:08:21 UTC 
(rev 66456)
+++ trunk/extensions/JS2Support/mwEmbed/loader.js       2010-05-14 23:19:38 UTC 
(rev 66457)
@@ -167,7 +167,7 @@
        "$j.ui.dialog"                  : 
"libraries/jquery/jquery.ui/ui/ui.dialog.js",
        "$j.ui.resizable"               : 
"libraries/jquery/jquery.ui/ui/ui.resizable.js",
        "$j.ui.tabs"                    : 
"libraries/jquery/jquery.ui/ui/ui.tabs.js",
-       "$j.effects.core"               : 
"libraries/jquery/jquery.ui/ui/effects.core.js",
+       "$j.effects"                    : 
"libraries/jquery/jquery.ui/ui/effects.core.js",
        "$j.effects.highlight"  : 
"libraries/jquery/jquery.ui/ui/effects.highlight.js",
        "$j.effects.slide"              : 
"libraries/jquery/jquery.ui/ui/effects.slide.js",
        "$j.ui.accordion"               : 
"libraries/jquery/jquery.ui/ui/ui.accordion.js",

Modified: trunk/extensions/UploadWizard/loader.js
===================================================================
--- trunk/extensions/UploadWizard/loader.js     2010-05-14 23:08:21 UTC (rev 
66456)
+++ trunk/extensions/UploadWizard/loader.js     2010-05-14 23:19:38 UTC (rev 
66457)
@@ -52,7 +52,7 @@
                        '$j.ui.dialog',
                        '$j.ui.draggable',                      
                        '$j.ui.datepicker',
-                       '$j.effects.core',
+                       '$j.effects',
                        '$j.effects.slide',
                        //'$j.effects.pulsate',
                        '$j.fn.autocomplete',



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to