http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76272
Revision: 76272
Author: aaron
Date: 2010-11-07 22:25:34 +0000 (Sun, 07 Nov 2010)
Log Message:
-----------
Make JS at least work with RL for now
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2010-11-07 22:03:40 UTC
(rev 76271)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2010-11-07 22:25:34 UTC
(rev 76272)
@@ -44,7 +44,7 @@
* Add FlaggedRevs css/js.
*/
protected static function injectStyleAndJS() {
- global $wgOut, $wgUser;
+ global $wgOut, $wgUser, $wgJsMimeType,
$wgFlaggedRevStyleVersion;
if ( $wgOut->hasHeadItem( 'FlaggedRevs' ) ) {
return true; # Don't double-load
}
@@ -53,22 +53,20 @@
if ( !$fa || !$fa->isReviewable() ) {
return true;
}
- global $wgJsMimeType, $wgFlaggedRevStyleVersion;
$stylePath = FlaggedRevs::styleUrlPath();
# Get JS/CSS file locations
$encCssFile = htmlspecialchars(
"$stylePath/flaggedrevs.css?$wgFlaggedRevStyleVersion" );
$encJsFile = htmlspecialchars(
"$stylePath/flaggedrevs.js?$wgFlaggedRevStyleVersion" );
-
- //TODO fix this to use the correct method
+
+ // TODO fix this to use the correct method
# Add CSS file
- //$wgOut->addExtensionStyle( $encCssFile );
+ $head = "<link rel=\"stylesheet\"
href=\"{$encCssFile}\"></link>";
# Add main JS file
- $head = "<script type=\"{$wgJsMimeType}\"
src=\"{$encJsFile}\"></script>";
- $head .= "<link rel=\"stylesheet\"
href=\"{$encCssFile}\"></link>";
+ $wgOut->addScript( "<script type=\"{$wgJsMimeType}\"
src=\"{$encJsFile}\"></script>" );
# Add review form JS for reviewers
if ( $wgUser->isAllowed( 'review' ) ) {
$encJsFile = htmlspecialchars(
"$stylePath/review.js?$wgFlaggedRevStyleVersion" );
- $head .= "\n<script type=\"{$wgJsMimeType}\"
src=\"{$encJsFile}\"></script>";
+ $wgOut->addScript( "<script type=\"{$wgJsMimeType}\"
src=\"{$encJsFile}\"></script>" );
}
# Set basic messages for all users...
$msgs = array(
@@ -89,10 +87,11 @@
$msgs['tooltipSubmit'] = wfMsg(
'revreview-submitedit-title' ) .
' ['. wfMsg( 'accesskey-save' ) . ']';
}
- $head .= "\n<script type=\"{$wgJsMimeType}\">" .
- "FlaggedRevs.messages = " . Xml::encodeJsVar(
(object)$msgs ) . ";</script>\n";
- $wgOut->addHeadItem( 'FlaggedRevs', $head );
+ # Add msgs to JS
+ $wgOut->addScript( "<script type=\"{$wgJsMimeType}\">" .
+ "FlaggedRevs.messages = " . Xml::encodeJsVar(
(object)$msgs ) . ";</script>" );
+ $wgOut->addHeadItem( 'FlaggedRevs', $head );
return true;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
