http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90634
Revision: 90634
Author: dale
Date: 2011-06-22 23:38:01 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
work around bug in message parser by not including bold tag around link
removed relativeCortadoAppletPath ref
set EmbedPlayer.WebPath from extension hooks so TMH knows how to find cortado
applet
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.i18n.php
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerJava.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.i18n.php
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.i18n.php
2011-06-22 23:30:47 UTC (rev 90633)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.i18n.php
2011-06-22 23:38:01 UTC (rev 90634)
@@ -61,7 +61,7 @@
'mwe-embedplayer-ogg-player-kplayer' => 'Kaltura player',
'mwe-embedplayer-ogg-player-selected' => '(selected)',
'mwe-embedplayer-ogg-player-omtkplayer' => 'OMTK Flash Vorbis',
- 'mwe-embedplayer-for_best_experience' => 'For a better video playback
experience we recommend the <b>[$1 latest Firefox].</b>',
+ 'mwe-embedplayer-for_best_experience' => 'For a better video playback
experience we recommend the [$1 latest Firefox].',
'mwe-embedplayer-download-warn' => 'No compatible in browser player was
detected, for in browser playback please download the [$1 latest Firefox]',
'mwe-embedplayer-fullscreen-tip' => 'Press <b>F11</b> toggle <i>web
browser</i> fullscreen',
'mwe-embedplayer-fullscreen-tip-osx' => 'Press <b>shift ⌘ F</b> to
toggle fullscreen',
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerJava.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerJava.js
2011-06-22 23:30:47 UTC (rev 90633)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerJava.js
2011-06-22 23:38:01 UTC (rev 90634)
@@ -101,9 +101,7 @@
if (
!mw.isLocalDomain( mediaSrc )
||
- !mw.isLocalDomain( mw.getMwEmbedPath()
- ||
- mw.getConfig( 'relativeCortadoAppletPath' ) === false )
+ !mw.isLocalDomain( mw.getMwEmbedPath() )
){
if ( window.cortadoDomainLocations[ new mw.Uri(
mediaSrc ).host ] ) {
appletLoc = window.cortadoDomainLocations[ new
mw.Uri( mediaSrc ).host ];
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
2011-06-22 23:30:47 UTC (rev 90633)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
2011-06-22 23:38:01 UTC (rev 90634)
@@ -716,7 +716,6 @@
gM( 'mwe-embedplayer-for_best_experience',
mw.getConfig('EmbedPlayer.FirefoxLink') )
);
}
-
// Do png fix for ie6
if ( $.browser.msie && $.browser.version <= 6 ) {
$( '#' + embedPlayer.id + ' .play-btn-large' ).pngFix();
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-06-22 23:30:47 UTC (rev 90633)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-06-22 23:38:01 UTC (rev 90634)
@@ -18,6 +18,11 @@
MwEmbedResourceManager::register(
'extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer' );
MwEmbedResourceManager::register(
'extensions/TimedMediaHandler/MwEmbedModules/TimedText' );
+ // Set the default webPath for this embed player extension
+ global $wgExtensionAssetsPath, $wgMwEmbedModuleConfig,
$timedMediaDir;
+ $wgMwEmbedModuleConfig['EmbedPlayer.WebPath'] =
$wgExtensionAssetsPath .
+ '/' . basename ( $timedMediaDir ) .
'/MwEmbedModules/EmbedPlayer';
+
// Setup media Handlers:
$wgMediaHandlers['application/ogg'] = 'OggHandler';
$wgMediaHandlers['video/webm'] = 'WebMHandler';
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.php 2011-06-22
23:30:47 UTC (rev 90633)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.php 2011-06-22
23:38:01 UTC (rev 90634)
@@ -20,7 +20,7 @@
/*** MwEmbed module configuration: *********************************/
// Show a warning to the user if they are not using an html5 browser with high
quality ogg support
-$wgMwEmbedModuleConfig['EmbedPlayer.DirectFileLinkWarning'] = true;
+$wgMwEmbedModuleConfig['EmbedPlayer.DirectFileLinkWarning'] = true;
// The text interface should always be shown
// ( even if there are no text tracks for that asset at render time )
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
