https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113482
Revision: 113482
Author: j
Date: 2012-03-09 16:57:55 +0000 (Fri, 09 Mar 2012)
Log Message:
-----------
set remoteExtPath, extensions url might be different, this fixes resource
loading issues on labs
Modified Paths:
--------------
trunk/extensions/MwEmbedSupport/MwEmbedResourceManager.php
trunk/extensions/MwEmbedSupport/MwEmbedSupport.hooks.php
Modified: trunk/extensions/MwEmbedSupport/MwEmbedResourceManager.php
===================================================================
--- trunk/extensions/MwEmbedSupport/MwEmbedResourceManager.php 2012-03-09
16:25:15 UTC (rev 113481)
+++ trunk/extensions/MwEmbedSupport/MwEmbedResourceManager.php 2012-03-09
16:57:55 UTC (rev 113482)
@@ -94,6 +94,9 @@
// Register all the resources with the resource loader
foreach( self::$moduleSet as $path => $modules ) {
foreach ( $modules as $name => $resources ) {
+ //remove 'extension' prefix from path
+ $resources['remoteExtPath'] = implode( '/',
array_shift(explode( '/', $path )));
+
// Register the resource with MwEmbed extended
class if in standAlone resource loader mode:
if( $wgEnableMwEmbedStandAlone === true ){
$resourceLoader->register(
@@ -112,4 +115,4 @@
// Continue module processing
return true;
}
-}
\ No newline at end of file
+}
Modified: trunk/extensions/MwEmbedSupport/MwEmbedSupport.hooks.php
===================================================================
--- trunk/extensions/MwEmbedSupport/MwEmbedSupport.hooks.php 2012-03-09
16:25:15 UTC (rev 113481)
+++ trunk/extensions/MwEmbedSupport/MwEmbedSupport.hooks.php 2012-03-09
16:57:55 UTC (rev 113482)
@@ -10,7 +10,7 @@
class MwEmbedSupportHooks {
// Register MwEmbedSupport Hooks
static function register(){
- global $wgHooks;
+ global $wgHooks $wgResourceModules;
// Register the core MwEmbed Support Module:
MwEmbedResourceManager::register(
'extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport' );
@@ -28,6 +28,11 @@
// Add the startup modules hook
$wgHooks['ResourceLoaderGetStartupModules'][] =
'MwEmbedSupportHooks::addStartupModules';
+ $wgResourceModules['ext.MwEmbedSupport'] = array(
+ 'styles' =>
'MwEmbedModules/MwEmbedSupport/skins/common/MwEmbedCommonStyle.css',
+ 'localBasePath' => dirname( __FILE__ ),
+ 'remoteExtPath' => 'MwEmbedSupport',
+ );
return true;
}
@@ -46,4 +51,4 @@
array_push($modules, 'jquery.triggerQueueCallback',
'jquery.loadingSpinner', 'jquery.mwEmbedUtil', 'mw.MwEmbedSupport' );
return true;
}
-}
\ No newline at end of file
+}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
