http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89246
Revision: 89246
Author: dale
Date: 2011-06-01 01:10:09 +0000 (Wed, 01 Jun 2011)
Log Message:
-----------
bug 29177 moved MwEmbedResourceManager::register calls into SetupAfterCache hook
Modified Paths:
--------------
trunk/extensions/MwEmbedSupport/MwEmbedSupport.php
trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
Added Paths:
-----------
trunk/extensions/MwEmbedSupport/MwEmbedSupport.hooks.php
Added: trunk/extensions/MwEmbedSupport/MwEmbedSupport.hooks.php
===================================================================
--- trunk/extensions/MwEmbedSupport/MwEmbedSupport.hooks.php
(rev 0)
+++ trunk/extensions/MwEmbedSupport/MwEmbedSupport.hooks.php 2011-06-01
01:10:09 UTC (rev 89246)
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Hooks for MwEmbedSupport extension
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
+class MwEmbedSupportHooks {
+ // Register MwEmbedSupport Hooks
+ static function register(){
+ global $wgHooks;
+ // Register the core MwEmbed Support Module:
+ MwEmbedResourceManager::register(
'extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport' );
+
+ // Register the MwEmbed 'mediaWiki' Module:
+ MwEmbedResourceManager::register(
'extensions/MwEmbedSupport/MwEmbedModules/MediaWikiSupport' );
+
+ // Add mwEmbed Support modules that are not part of startup
+ $wgHooks['BeforePageDisplay'][] =
'MwEmbedSupportHooks::UpdatePageModules';
+
+ // Add Global MwEmbed Registration hook
+ $wgHooks['ResourceLoaderRegisterModules'][] =
'MwEmbedResourceManager::registerModules';
+
+ // Add MwEmbed module configuration
+ $wgHooks['ResourceLoaderGetConfigVars'][] =
'MwEmbedResourceManager::registerConfigVars';
+
+ // Add the startup modules hook
+ $wgHooks['ResourceLoaderGetStartupModules'][] =
'MwEmbedSupportHooks::addStartupModules';
+ return true;
+ }
+
+ /**
+ * Update the page modules to include mwEmbed style
+ *
+ * TODO look into loading this on-demand instead of all pages.
+ */
+ static function updatePageModules( &$out ){
+ $out->addModules( 'mw.MwEmbedSupport.style' );
+ return true;
+ }
+
+ // Add MwEmbedSupport modules to Startup:
+ static function addStartupModules( &$modules ){
+ array_push($modules, 'jquery.triggerQueueCallback',
'jquery.mwEmbedUtil', 'mw.MwEmbedSupport' );
+ return true;
+ }
+}
\ No newline at end of file
Modified: trunk/extensions/MwEmbedSupport/MwEmbedSupport.php
===================================================================
--- trunk/extensions/MwEmbedSupport/MwEmbedSupport.php 2011-06-01 00:51:09 UTC
(rev 89245)
+++ trunk/extensions/MwEmbedSupport/MwEmbedSupport.php 2011-06-01 01:10:09 UTC
(rev 89246)
@@ -33,33 +33,8 @@
);
$wgAutoloadClasses['MwEmbedResourceManager'] = dirname( __FILE__ ) .
'/MwEmbedResourceManager.php';
+$wgAutoloadClasses['MwEmbedSupportHooks'] = dirname( __FILE__ ) .
'/MwEmbedSupport.hooks.php';
-// Add Global MwEmbed Registration hook
-$wgHooks['ResourceLoaderRegisterModules'][] =
'MwEmbedResourceManager::registerModules';
-
-// Add MwEmbed module configuration
-$wgHooks['ResourceLoaderGetConfigVars'][] =
'MwEmbedResourceManager::registerConfigVars';
-
/* MwEmbed Module Registration */
-
-// Register the core MwEmbed Support Module:
-MwEmbedResourceManager::register(
'extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport' );
-
-// Register the MwEmbed 'mediaWiki' Module:
-MwEmbedResourceManager::register(
'extensions/MwEmbedSupport/MwEmbedModules/MediaWikiSupport' );
-
-// Add MwEmbedSupport to Startup:
-function MwUpdateStartupModules( &$modules ){
- array_push($modules, 'jquery.triggerQueueCallback',
'jquery.mwEmbedUtil', 'mw.MwEmbedSupport' );
- return true;
-}
-$wgHooks['ResourceLoaderGetStartupModules'][] = 'MwUpdateStartupModules';
-
-
-
-// Add mwEmbed Support ( style sheets and messages post page ready )
-$wgHooks['BeforePageDisplay'][] = 'MwUpdatePageModules';
-function MwUpdatePageModules( &$out ){
- $out->addModules( 'mw.MwEmbedSupport.style' );
- return true;
-}
\ No newline at end of file
+$wgHooks['SetupAfterCache'][] = 'MwEmbedSupportHooks::register';
+
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-06-01 00:51:09 UTC (rev 89245)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-06-01 01:10:09 UTC (rev 89246)
@@ -13,7 +13,11 @@
global $wgParserOutputHooks, $wgHooks, $wgJobClasses,
$wgJobTypesExcludedFromDefaultQueue,
$wgMediaHandlers, $wgResourceModules,
$wgExcludeFromThumbnailPurge, $wgExtraNamespaces,
$tmhFileExtensions, $wgParserOutputHooks, $wgOut,
$wgAPIPropModules, $wgTimedTextNS;
-
+
+ // Register the Timed Media Handler javascript resources (
MwEmbed modules )
+ MwEmbedResourceManager::register(
'extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer' );
+ MwEmbedResourceManager::register(
'extensions/TimedMediaHandler/MwEmbedModules/TimedText' );
+
// Setup media Handlers:
$wgMediaHandlers['application/ogg'] = 'OggHandler';
$wgMediaHandlers['video/webm'] = 'WebMHandler';
@@ -28,6 +32,7 @@
$wgJobClasses+= array(
'webVideoTranscode' => 'WebVideoTranscodeJob'
);
+
// Transcode jobs must be explicitly requested from the job
queue:
$wgJobTypesExcludedFromDefaultQueue[] = 'webVideoTranscode';
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.php 2011-06-01
00:51:09 UTC (rev 89245)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.php 2011-06-01
01:10:09 UTC (rev 89246)
@@ -118,10 +118,6 @@
$wgAutoloadClasses['WebVideoTranscodeJob'] =
"$timedMediaDir/WebVideoTranscode/WebVideoTranscodeJob.php";
$wgAutoloadClasses['ApiQueryVideoInfo'] =
"$timedMediaDir/ApiQueryVideoInfo.php";
-// Register the Timed Media Handler javascript resources ( MwEmbed modules )
-MwEmbedResourceManager::register(
'extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer' );
-MwEmbedResourceManager::register(
'extensions/TimedMediaHandler/MwEmbedModules/TimedText' );
-
// Localization
$wgExtensionMessagesFiles['TimedMediaHandler'] =
"$timedMediaDir/TimedMediaHandler.i18n.php";
$wgExtensionMessagesFiles['TimedMediaHandlerMagic'] =
"$timedMediaDir/TimedMediaHandler.i18n.magic.php";
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
