| Index: trunk/extensions/TimedMediaHandler/TimedMediaHandler.php |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | |
| 22 | 22 | /*** MwEmbed module configuration: *********************************/ |
| 23 | 23 | // Show a warning to the user if they are not using an html5 browser with high quality ogg support |
| 24 | | -$wgMwEmbedModuleConfig['EmbedPlayer.DirectFileLinkWarning'] = true; |
| | 24 | +$wgMwEmbedModuleConfig['EmbedPlayer.DirectFileLinkWarning'] = true; |
| 25 | 25 | |
| 26 | 26 | // The text interface should always be shown |
| 27 | 27 | // ( even if there are no text tracks for that asset at render time ) |
| Index: trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php |
| — | — | @@ -18,6 +18,11 @@ |
| 19 | 19 | MwEmbedResourceManager::register( 'extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer' ); |
| 20 | 20 | MwEmbedResourceManager::register( 'extensions/TimedMediaHandler/MwEmbedModules/TimedText' ); |
| 21 | 21 | |
| | 22 | + // Set the default webPath for this embed player extension |
| | 23 | + global $wgExtensionAssetsPath, $wgMwEmbedModuleConfig, $timedMediaDir; |
| | 24 | + $wgMwEmbedModuleConfig['EmbedPlayer.WebPath'] = $wgExtensionAssetsPath . |
| | 25 | + '/' . basename ( $timedMediaDir ) . '/MwEmbedModules/EmbedPlayer'; |
| | 26 | + |
| 22 | 27 | // Setup media Handlers: |
| 23 | 28 | $wgMediaHandlers['application/ogg'] = 'OggHandler'; |
| 24 | 29 | $wgMediaHandlers['video/webm'] = 'WebMHandler'; |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js |
| — | — | @@ -716,7 +716,6 @@ |
| 717 | 717 | gM( 'mwe-embedplayer-for_best_experience', mw.getConfig('EmbedPlayer.FirefoxLink') ) |
| 718 | 718 | ); |
| 719 | 719 | } |
| 720 | | - |
| 721 | 720 | // Do png fix for ie6 |
| 722 | 721 | if ( $.browser.msie && $.browser.version <= 6 ) { |
| 723 | 722 | $( '#' + embedPlayer.id + ' .play-btn-large' ).pngFix(); |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerJava.js |
| — | — | @@ -101,9 +101,7 @@ |
| 102 | 102 | if ( |
| 103 | 103 | !mw.isLocalDomain( mediaSrc ) |
| 104 | 104 | || |
| 105 | | - !mw.isLocalDomain( mw.getMwEmbedPath() |
| 106 | | - || |
| 107 | | - mw.getConfig( 'relativeCortadoAppletPath' ) === false ) |
| | 105 | + !mw.isLocalDomain( mw.getMwEmbedPath() ) |
| 108 | 106 | ){ |
| 109 | 107 | if ( window.cortadoDomainLocations[ new mw.Uri( mediaSrc ).host ] ) { |
| 110 | 108 | appletLoc = window.cortadoDomainLocations[ new mw.Uri( mediaSrc ).host ]; |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.i18n.php |
| — | — | @@ -61,7 +61,7 @@ |
| 62 | 62 | 'mwe-embedplayer-ogg-player-kplayer' => 'Kaltura player', |
| 63 | 63 | 'mwe-embedplayer-ogg-player-selected' => '(selected)', |
| 64 | 64 | 'mwe-embedplayer-ogg-player-omtkplayer' => 'OMTK Flash Vorbis', |
| 65 | | - 'mwe-embedplayer-for_best_experience' => 'For a better video playback experience we recommend the <b>[$1 latest Firefox].</b>', |
| | 65 | + 'mwe-embedplayer-for_best_experience' => 'For a better video playback experience we recommend the [$1 latest Firefox].', |
| 66 | 66 | 'mwe-embedplayer-download-warn' => 'No compatible in browser player was detected, for in browser playback please download the [$1 latest Firefox]', |
| 67 | 67 | 'mwe-embedplayer-fullscreen-tip' => 'Press <b>F11</b> toggle <i>web browser</i> fullscreen', |
| 68 | 68 | 'mwe-embedplayer-fullscreen-tip-osx' => 'Press <b>shift ⌘ F</b> to toggle fullscreen', |