http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72368
Revision: 72368
Author: tparscal
Date: 2010-09-04 10:53:57 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Better solution for r72367, this allows file modules to always be written in
ltr, while site modules are written in whatever $wgContLang is.
Modified Paths:
--------------
trunk/phase3/includes/ResourceLoader.php
trunk/phase3/includes/ResourceLoaderContext.php
trunk/phase3/includes/ResourceLoaderModule.php
Modified: trunk/phase3/includes/ResourceLoader.php
===================================================================
--- trunk/phase3/includes/ResourceLoader.php 2010-09-04 10:28:41 UTC (rev
72367)
+++ trunk/phase3/includes/ResourceLoader.php 2010-09-04 10:53:57 UTC (rev
72368)
@@ -294,7 +294,7 @@
$context->shouldIncludeStyles() &&
( $styles .= self::$modules[$name]->getStyle(
$context ) ) !== ''
) {
- if ( $context->getFlip() ) {
+ if ( self::$modules[$name]->getFlip( $context )
) {
$styles = self::filter( 'flip-css',
$styles );
}
$styles = $context->getDebug() ? $styles :
self::filter( 'minify-css', $styles );
Modified: trunk/phase3/includes/ResourceLoaderContext.php
===================================================================
--- trunk/phase3/includes/ResourceLoaderContext.php 2010-09-04 10:28:41 UTC
(rev 72367)
+++ trunk/phase3/includes/ResourceLoaderContext.php 2010-09-04 10:53:57 UTC
(rev 72368)
@@ -31,7 +31,6 @@
protected $modules;
protected $language;
protected $direction;
- protected $flip;
protected $skin;
protected $debug;
protected $only;
@@ -40,7 +39,7 @@
/* Methods */
public function __construct( WebRequest $request, $server ) {
- global $wgUser, $wgLang, $wgContLang, $wgDefaultSkin;
+ global $wgUser, $wgLang, $wgDefaultSkin;
$this->request = $request;
$this->server = $server;
@@ -61,8 +60,6 @@
if ( !$this->skin ) {
$this->skin = $wgDefaultSkin;
}
- // Evaluate flip
- $this->flip = $wgContLang->getDir() !== $this->direction;
}
public function getRequest() {
@@ -85,10 +82,6 @@
return $this->direction;
}
- public function getFlip() {
- return $this->flip;
- }
-
public function getSkin() {
return $this->skin;
}
Modified: trunk/phase3/includes/ResourceLoaderModule.php
===================================================================
--- trunk/phase3/includes/ResourceLoaderModule.php 2010-09-04 10:28:41 UTC
(rev 72367)
+++ trunk/phase3/includes/ResourceLoaderModule.php 2010-09-04 10:53:57 UTC
(rev 72368)
@@ -69,7 +69,16 @@
global $wgResourceLoaderServerMaxage;
return $wgResourceLoaderServerMaxage;
}
+
+ /**
+ * Get whether CSS for this module should be flipped
+ */
+ public function getFlip( $context ) {
+ return $context->getDirection() === 'rtl';
+ }
+ /* Abstract Methods */
+
/**
* Get all JS for this module for a given language and skin.
* Includes all relevant JS except loader scripts.
@@ -423,7 +432,7 @@
$this->modifiedTime[$context->getHash()] = max( $filesMtime,
$msgBlobMtime );
return $this->modifiedTime[$context->getHash()];
}
-
+
/* Protected Members */
/**
@@ -689,6 +698,10 @@
}
public function getStyle( ResourceLoaderContext $context ) { return '';
}
+ public function getFlip( $context ) {
+ global $wgContLang;
+ return $wgContLang->getDir() !== $context->getDirection();
+ }
public function getMessages() { return array(); }
public function getLoaderScript() { return ''; }
public function getDependencies() { return array(); }
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
