| Index: trunk/extensions/OggHandler/OggHandler.php |
| — | — | @@ -24,7 +24,7 @@ |
| 25 | 25 | ini_get( 'include_path' ) ); |
| 26 | 26 | |
| 27 | 27 | // Bump this when updating OggPlayer.js to help update caches |
| 28 | | -$wgOggScriptVersion = '11'; |
| | 28 | +$wgOggScriptVersion = '12'; |
| 29 | 29 | |
| 30 | 30 | $wgExtensionMessagesFiles['OggHandler'] = "$oggDir/OggHandler.i18n.php"; |
| 31 | 31 | $wgExtensionMessagesFiles['OggHandlerMagic'] = "$oggDir/OggHandler.i18n.magic.php"; |
| Index: trunk/extensions/OggHandler/OggHandler_body.php |
| — | — | @@ -451,23 +451,26 @@ |
| 452 | 452 | $encCortadoUrl = Xml::encodeJsVar( $cortadoUrl ); |
| 453 | 453 | $encExtPathUrl = Xml::encodeJsVar( $scriptPath ); |
| 454 | 454 | |
| 455 | | - $out->addHeadItem( 'OggHandler', <<<EOT |
| 456 | | -<script type="text/javascript" src="$scriptPath/OggPlayer.js?$wgOggScriptVersion"></script> |
| 457 | | -<script type="text/javascript"> |
| | 455 | + $out->addHeadItem( 'OggHandlerScript' , Html::linkedScript( "{$scriptPath}/OggPlayer.js?$wgOggScriptVersion" ) ); |
| | 456 | + |
| | 457 | + $out->addHeadItem( 'OggHandlerInlineScript', Html::inlineScript( <<<EOT |
| | 458 | + |
| 458 | 459 | wgOggPlayer.msg = $jsMsgs; |
| 459 | 460 | wgOggPlayer.cortadoUrl = $encCortadoUrl; |
| 460 | 461 | wgOggPlayer.extPathUrl = $encExtPathUrl; |
| 461 | | -</script> |
| 462 | | -<style type="text/css"> |
| | 462 | + |
| | 463 | +EOT |
| | 464 | +) ); |
| | 465 | + $out->addHeadItem( 'OggHandlerInlineCSS', Html::inlineStyle( <<<EOT |
| | 466 | + |
| 463 | 467 | .ogg-player-options { |
| 464 | 468 | border: solid 1px #ccc; |
| 465 | 469 | padding: 2pt; |
| 466 | 470 | text-align: left; |
| 467 | 471 | font-size: 10pt; |
| 468 | | -} |
| 469 | | -</style> |
| | 472 | + |
| 470 | 473 | EOT |
| 471 | | -); |
| | 474 | +) ); |
| 472 | 475 | } |
| 473 | 476 | |
| 474 | 477 | function parserTransformHook( $parser, $file ) { |