http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70394
Revision: 70394
Author: dale
Date: 2010-08-03 18:30:57 +0000 (Tue, 03 Aug 2010)
Log Message:
-----------
sync updates from resource loader updates from mwEmbedStandAlone
Modified Paths:
--------------
trunk/extensions/JS2Support/mwEmbed/includes/NamedResourceLoader.php
trunk/extensions/JS2Support/mwEmbed/includes/noMediaWikiConfig.php
Modified: trunk/extensions/JS2Support/mwEmbed/includes/NamedResourceLoader.php
===================================================================
--- trunk/extensions/JS2Support/mwEmbed/includes/NamedResourceLoader.php
2010-08-03 18:28:40 UTC (rev 70393)
+++ trunk/extensions/JS2Support/mwEmbed/includes/NamedResourceLoader.php
2010-08-03 18:30:57 UTC (rev 70394)
@@ -17,7 +17,7 @@
private static $combinedLoadersJs = '';
// Reg Exp that supports extracting classes from loaders
- private static $classReplaceExp =
'/mw\.addResourcePaths\s*\(\s*{(.*)}\s*\)\s*\;/siU';
+ private static $classReplaceExp =
'/mw\.addResourcePaths\s*\(\s*{(.*)}\s*\)\s*[\;\n]/siU';
// Flag to specify if the javascript resource paths have been loaded.
private static $classesLoaded = false;
@@ -265,11 +265,7 @@
$jClassSet = FormatJson::decode( '{' . $jsvar[1] . '}', true );
// Check for null json decode:
if( $jClassSet == NULL ){
- $moduleName = ( self::$resourceParentModuleName [
$resourceName ] )
- ? self::$resourceParentModuleName [
$resourceName ]
- : ' loader set in extension ';
-
- throw new MWException( "Error could not decode
javascript resource list for module:" . $moduleName ." \n" );
+ throw new MWException( "Error could not decode
javascript resource list for module: " + self::$currentModuleName + "\n" );
return false;
}
Modified: trunk/extensions/JS2Support/mwEmbed/includes/noMediaWikiConfig.php
===================================================================
--- trunk/extensions/JS2Support/mwEmbed/includes/noMediaWikiConfig.php
2010-08-03 18:28:40 UTC (rev 70393)
+++ trunk/extensions/JS2Support/mwEmbed/includes/noMediaWikiConfig.php
2010-08-03 18:30:57 UTC (rev 70394)
@@ -28,7 +28,7 @@
$wgUseFileCache = true;
// Named paths for the script loader
-$wgScriptLoaderNamedPaths = array();
+$wgResourceLoaderNamedPaths = array();
//If the scriptLoader should use relative css
$wgScriptLoaderRelativeCss = false;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
