| Index: trunk/extensions/Storyboard/tags/Storyboard/Storyboard_body.php |
| — | — | @@ -17,7 +17,7 @@ |
| 18 | 18 | class TagStoryboard { |
| 19 | 19 | |
| 20 | 20 | public static function render( $input, $args, $parser, $frame ) { |
| 21 | | - global $wgOut, $wgJsMimeType, $wgScriptPath, $wgStylePath, $wgStyleVersion, $egStoryboardScriptPath, $egStoryboardWidth, $egStoryboardHeight; |
| | 21 | + global $wgJsMimeType, $wgScriptPath, $wgStylePath, $wgStyleVersion, $egStoryboardScriptPath, $egStoryboardWidth, $egStoryboardHeight; |
| 22 | 22 | |
| 23 | 23 | // TODO: Combine+minfiy JS files, add switch to use combined+minified version |
| 24 | 24 | $parser->getOutput()->addHeadItem( |
| — | — | @@ -25,7 +25,7 @@ |
| 26 | 26 | <link rel="stylesheet" href="$egStoryboardScriptPath/storyboard.css?$wgStyleVersion" /> |
| 27 | 27 | <script type="$wgJsMimeType" src="$wgStylePath/common/jquery.min.js?$wgStyleVersion"></script> |
| 28 | 28 | <script type="$wgJsMimeType" src="$egStoryboardScriptPath/tags/Storyboard/jquery.ajaxscroll.js?$wgStyleVersion"></script> |
| 29 | | - <script type="$wgJsMimeType" src="$egStoryboardScriptPath/tags/Storyboard/storyboard.js?$wgStyleVersion"></script |
| | 29 | + <script type="$wgJsMimeType" src="$egStoryboardScriptPath/tags/Storyboard/storyboard.js?$wgStyleVersion"></script> |
| 30 | 30 | EOT |
| 31 | 31 | ); |
| 32 | 32 | |
| Index: trunk/extensions/Storyboard/tags/Storysubmission/Storysubmission_body.php |
| — | — | @@ -44,18 +44,18 @@ |
| 45 | 45 | * TODO: any sort of client side validation? |
| 46 | 46 | */ |
| 47 | 47 | private static function getFrom( $parser, array $args ) { |
| 48 | | - global $wgOut, $wgUser, $wgJsMimeType, $egStoryboardScriptPath, $egStorysubmissionWidth, $egStoryboardMaxStoryLen, $egStoryboardMinStoryLen; |
| | 48 | + global $wgUser, $wgStyleVersion, $wgJsMimeType, $egStoryboardScriptPath, $egStorysubmissionWidth, $egStoryboardMaxStoryLen, $egStoryboardMinStoryLen; |
| 49 | 49 | |
| 50 | | - $wgOut->addStyle( $egStoryboardScriptPath . '/storyboard.css' ); |
| 51 | | - $wgOut->addScriptFile( $egStoryboardScriptPath . '/storyboard.js' ); |
| 52 | 50 | // Loading a seperate JS file would be overkill for just these 3 lines, and be bad for performance. |
| 53 | | - $wgOut->addScript( |
| | 51 | + $parser->getOutput()->addHeadItem( |
| 54 | 52 | <<<EOT |
| | 53 | + <link rel="stylesheet" href="$egStoryboardScriptPath/storyboard.css?$wgStyleVersion" /> |
| | 54 | + <script type="$wgJsMimeType" src="$egStoryboardScriptPath/storyboard.js?$wgStyleVersion"></script> |
| 55 | 55 | <script type="$wgJsMimeType"> /*<![CDATA[*/ |
| 56 | 56 | addOnloadHook( function() { |
| 57 | 57 | document.getElementById( 'storysubmission-button' ).disabled = true; |
| 58 | 58 | } ); |
| 59 | | - /*]]>*/ </script> |
| | 59 | + /*]]>*/ </script> |
| 60 | 60 | EOT |
| 61 | 61 | ); |
| 62 | 62 | |