| Index: trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php |
| — | — | @@ -101,7 +101,7 @@ |
| 102 | 102 | if( $article->getTitle()->getNamespace() == NS_FILE ) { |
| 103 | 103 | |
| 104 | 104 | $file = wfFindFile( $article->getTitle() ); |
| 105 | | - $mediaType = $file->getHandler()->getMetadataType(); |
| | 105 | + $mediaType = $file->getHandler()->getMetadataType( $image = '' ); |
| 106 | 106 | |
| 107 | 107 | if( $mediaType == 'webm' || $mediaType == 'ogg' ){ |
| 108 | 108 | WebVideoTranscode::removeTranscodeJobs( $file ); |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php |
| — | — | @@ -54,6 +54,7 @@ |
| 55 | 55 | // if the browser should display a warning for direct file links: |
| 56 | 56 | "EmbedPlayer.DirectFileLinkWarning" => false, |
| 57 | 57 | |
| | 58 | + // A link to download firefox |
| 58 | 59 | "EmbedPlayer.FirefoxLink" => 'http://www.mozilla.com/en-US/firefox/upgrade.html?from=mwEmbed', |
| 59 | 60 | |
| 60 | 61 | // If fullscreen is global enabled. |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js |
| — | — | @@ -487,6 +487,7 @@ |
| 488 | 488 | if( $.browser.safari && /chrome/.test(navigator.userAgent.toLowerCase()) ){ |
| 489 | 489 | return ; |
| 490 | 490 | } |
| | 491 | + // |
| 491 | 492 | |
| 492 | 493 | // OSX has a different short cut than windows and liux |
| 493 | 494 | var toolTipMsg = ( navigator.userAgent.toLowerCase().indexOf('Mac OS X') != -1 )? |
| — | — | @@ -503,7 +504,7 @@ |
| 504 | 505 | |
| 505 | 506 | var hideTip = function(){ |
| 506 | 507 | mw.setConfig('EmbedPlayer.FullscreenTip', false ); |
| 507 | | - $targetWarning.fadeOut('fast'); |
| | 508 | + $targetTip.fadeOut('fast'); |
| 508 | 509 | }; |
| 509 | 510 | |
| 510 | 511 | // Hide fullscreen tip if: |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js |
| — | — | @@ -223,7 +223,7 @@ |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | // Allow extensions to detect and add their own "players" |
| 227 | | - mw.log("trigger::embedPlayerUpdateMediaPlayersEvent"); |
| | 227 | + mw.log("EmbedPlayer::trigger:embedPlayerUpdateMediaPlayersEvent"); |
| 228 | 228 | $( mw ).trigger( 'embedPlayerUpdateMediaPlayersEvent' , this.mediaPlayers ); |
| 229 | 229 | |
| 230 | 230 | }, |
| Index: trunk/extensions/TimedMediaHandler/resources/mw.PopUpThumbVideo.js |
| — | — | @@ -16,13 +16,14 @@ |
| 17 | 17 | 'close' : function(){ |
| 18 | 18 | // pause the video on close ( so that playback does not continue ) |
| 19 | 19 | var domEl = $(this).find('video,audio').get(0); |
| 20 | | - if( domEl ) { |
| | 20 | + if( domEl && domEl.pause ) { |
| 21 | 21 | domEl.pause(); |
| 22 | 22 | } |
| | 23 | + return true; |
| 23 | 24 | } |
| 24 | 25 | } ) |
| 25 | 26 | .css('overflow', 'hidden') |
| 26 | | - .find('video,audio').embedPlayer(); |
| | 27 | + .find('video,audio').embedPlayer(); |
| 27 | 28 | // don't follow file link |
| 28 | 29 | return false; |
| 29 | 30 | }); |