http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96101
Revision: 96101
Author: nikerabbit
Date: 2011-09-02 15:26:31 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Remove rest of resource loader compatibility code. Renamed module translate-css
to ext.translate to better match naming conventions.
Modified Paths:
--------------
trunk/extensions/Translate/Translate.php
trunk/extensions/Translate/TranslateUtils.php
trunk/extensions/Translate/specials/SpecialLanguageStats.php
trunk/extensions/Translate/specials/SpecialSupportedLanguages.php
trunk/extensions/Translate/specials/SpecialTranslate.php
trunk/extensions/Translate/specials/SpecialTranslations.php
trunk/extensions/Translate/tag/PageTranslationHooks.php
trunk/extensions/Translate/tag/SpecialPageTranslation.php
trunk/extensions/Translate/utils/MessageTable.php
trunk/extensions/Translate/utils/MessageWebImporter.php
trunk/extensions/Translate/utils/TranslationHelpers.php
Modified: trunk/extensions/Translate/Translate.php
===================================================================
--- trunk/extensions/Translate/Translate.php 2011-09-02 15:08:57 UTC (rev
96100)
+++ trunk/extensions/Translate/Translate.php 2011-09-02 15:26:31 UTC (rev
96101)
@@ -130,7 +130,7 @@
);
// Client-side resource modules
-$wgResourceModules['translate-css'] = array(
+$wgResourceModules['ext.translate'] = array(
'styles' => 'Translate.css',
) + $resourcePaths;
Modified: trunk/extensions/Translate/TranslateUtils.php
===================================================================
--- trunk/extensions/Translate/TranslateUtils.php 2011-09-02 15:08:57 UTC
(rev 96100)
+++ trunk/extensions/Translate/TranslateUtils.php 2011-09-02 15:26:31 UTC
(rev 96101)
@@ -318,26 +318,6 @@
}
/**
- * Injects extension css (only once).
- */
- public static function injectCSS() {
- global $wgOut;
-
- if ( method_exists( $wgOut, 'addModules' ) ) {
- $wgOut->addModuleStyles( 'translate-css' );
- return true;
- }
-
- static $done = false;
-
- if ( !$done ) {
- $wgOut->addExtensionStyle( self::assetPath(
'Translate.css' ) );
- }
-
- return $done = true;
- }
-
- /**
* Construct the web address to given asset.
* @param $path \string Path to the resource relative to extensions
root directory.
* @return \string Full or partial web path.
@@ -347,24 +327,6 @@
return "$wgExtensionAssetsPath/Translate/$path";
}
- public static function addModules( $out, $modules ) {
- if ( method_exists( $out, 'addModules' ) ) {
- $out->addModules( $modules );
- } else {
- global $wgResourceModules;
- foreach ( (array) $modules as $module ) {
- if ( isset(
$wgResourceModules[$module]['styles'] ) ) {
- $file =
$wgResourceModules[$module]['styles'];
- $out->addExtensionStyle(
TranslateUtils::assetPath( $file ) );
- }
- if ( isset(
$wgResourceModules[$module]['scripts'] ) ) {
- $file =
$wgResourceModules[$module]['scripts'];
- $out->addScriptFile(
TranslateUtils::assetPath( $file ) );
- }
- }
- }
- }
-
/**
* Gets the path for cache files
* @param $filename \string
Modified: trunk/extensions/Translate/specials/SpecialLanguageStats.php
===================================================================
--- trunk/extensions/Translate/specials/SpecialLanguageStats.php
2011-09-02 15:08:57 UTC (rev 96100)
+++ trunk/extensions/Translate/specials/SpecialLanguageStats.php
2011-09-02 15:26:31 UTC (rev 96101)
@@ -37,8 +37,8 @@
$this->setHeaders();
$this->outputHeader();
- TranslateUtils::addModules( $wgOut,
'ext.translate.special.languagestats' );
- TranslateUtils::addModules( $wgOut,
'ext.translate.messagetable' );
+ $wgOut->addModules( 'ext.translate.special.languagestats' );
+ $wgOut->addModules( 'ext.translate.messagetable' );
// no UI when including()
if ( !$this->including() ) {
Modified: trunk/extensions/Translate/specials/SpecialSupportedLanguages.php
===================================================================
--- trunk/extensions/Translate/specials/SpecialSupportedLanguages.php
2011-09-02 15:08:57 UTC (rev 96100)
+++ trunk/extensions/Translate/specials/SpecialSupportedLanguages.php
2011-09-02 15:26:31 UTC (rev 96101)
@@ -33,7 +33,7 @@
$this->purge = $wgRequest->getVal( 'action' ) === 'purge';
$this->setHeaders();
- TranslateUtils::addModules( $wgOut,
'ext.translate.special.supportedlanguages' );
+ $wgOut->addModules( 'ext.translate.special.supportedlanguages'
);
$cache = wfGetCache( CACHE_ANYTHING );
$cachekey = wfMemcKey( 'translate-supportedlanguages',
$wgLang->getCode() );
Modified: trunk/extensions/Translate/specials/SpecialTranslate.php
===================================================================
--- trunk/extensions/Translate/specials/SpecialTranslate.php 2011-09-02
15:08:57 UTC (rev 96100)
+++ trunk/extensions/Translate/specials/SpecialTranslate.php 2011-09-02
15:26:31 UTC (rev 96101)
@@ -33,7 +33,7 @@
public function execute( $parameters ) {
global $wgOut, $wgTranslateBlacklist, $wgRequest;
- TranslateUtils::addModules( $wgOut,
'ext.translate.special.translate' );
+ $wgOut->addModules( 'ext.translate.special.translate' );
$this->setHeaders();
Modified: trunk/extensions/Translate/specials/SpecialTranslations.php
===================================================================
--- trunk/extensions/Translate/specials/SpecialTranslations.php 2011-09-02
15:08:57 UTC (rev 96100)
+++ trunk/extensions/Translate/specials/SpecialTranslations.php 2011-09-02
15:26:31 UTC (rev 96101)
@@ -271,6 +271,6 @@
private static function includeAssets() {
global $wgOut;
TranslationHelpers::addModules( $wgOut );
- TranslateUtils::addModules( $wgOut,
'ext.translate.messagetable' );
+ $wgOut->addModules( 'ext.translate.messagetable' );
}
}
Modified: trunk/extensions/Translate/tag/PageTranslationHooks.php
===================================================================
--- trunk/extensions/Translate/tag/PageTranslationHooks.php 2011-09-02
15:08:57 UTC (rev 96100)
+++ trunk/extensions/Translate/tag/PageTranslationHooks.php 2011-09-02
15:26:31 UTC (rev 96101)
@@ -72,9 +72,9 @@
return true;
}
- // Only called form hook
+ // Only called from hook
public static function injectCss( $outputpage, $text ) {
- TranslateUtils::injectCSS();
+ $outputpage->addModules( 'ext.translate' );
return true;
}
Modified: trunk/extensions/Translate/tag/SpecialPageTranslation.php
===================================================================
--- trunk/extensions/Translate/tag/SpecialPageTranslation.php 2011-09-02
15:08:57 UTC (rev 96100)
+++ trunk/extensions/Translate/tag/SpecialPageTranslation.php 2011-09-02
15:26:31 UTC (rev 96101)
@@ -350,7 +350,7 @@
global $wgOut, $wgContLang;
$wgOut->setSubtitle( $this->user->getSkin()->link(
$page->getTitle() ) );
- TranslateUtils::injectCSS();
+ $wgOut->addModules( 'ext.translate' );
$wgOut->addWikiMsg( 'tpt-showpage-intro' );
Modified: trunk/extensions/Translate/utils/MessageTable.php
===================================================================
--- trunk/extensions/Translate/utils/MessageTable.php 2011-09-02 15:08:57 UTC
(rev 96100)
+++ trunk/extensions/Translate/utils/MessageTable.php 2011-09-02 15:26:31 UTC
(rev 96101)
@@ -65,7 +65,7 @@
TranslationHelpers::addModules( $wgOut );
$vars = array( 'trlKeys' => array_values(
$this->collection->keys() ) );
$wgOut->addScript( Skin::makeVariablesScript( $vars ) );
- TranslateUtils::addModules( $wgOut,
'ext.translate.messagetable' );
+ $wgOut->addModules( 'ext.translate.messagetable' );
}
public function header() {
Modified: trunk/extensions/Translate/utils/MessageWebImporter.php
===================================================================
--- trunk/extensions/Translate/utils/MessageWebImporter.php 2011-09-02
15:08:57 UTC (rev 96100)
+++ trunk/extensions/Translate/utils/MessageWebImporter.php 2011-09-02
15:26:31 UTC (rev 96101)
@@ -85,7 +85,8 @@
}
protected function doHeader() {
- TranslateUtils::injectCSS();
+ global $wgOut;
+ $wgOut->addModules( 'ext.translate' );
$formParams = array(
'method' => 'post',
Modified: trunk/extensions/Translate/utils/TranslationHelpers.php
===================================================================
--- trunk/extensions/Translate/utils/TranslationHelpers.php 2011-09-02
15:08:57 UTC (rev 96100)
+++ trunk/extensions/Translate/utils/TranslationHelpers.php 2011-09-02
15:26:31 UTC (rev 96101)
@@ -1198,12 +1198,12 @@
}
public static function addModules( OutputPage $out ) {
- TranslateUtils::addModules( $out, array(
- 'ext.translate.quickedit',
- ) );
+ $out->addModules( 'ext.translate.quickedit' );
// Might be needed, but ajax doesn't load it
// Globals :(
+ /// @todo: remove when 1.17 is no longer supported.
+ // The RL module name is different in 1.17 and >1.17
$diff = new DifferenceEngine;
$diff->showDiffStyle();
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
