From 757750dcacdb895987d7e1883cfcc1549d85eeed Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 25 Mar 2011 11:15:40 +0000
Subject: [PATCH] Remove getFlip code duplication

Move usual one into ResourceLoaderModule, and then move what was in ResourceLoaderModule into ResouceLoaderFileModule
---
 includes/resourceloader/ResourceLoaderFileModule.php   |  9 +++++++++
 includes/resourceloader/ResourceLoaderModule.php       |  5 +++--
 .../resourceloader/ResourceLoaderStartUpModule.php     | 10 ----------
 .../resourceloader/ResourceLoaderUserOptionsModule.php | 10 ----------
 includes/resourceloader/ResourceLoaderWikiModule.php   | 10 ----------
 5 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php
index 4f18380c6c..5bb38fe939 100644
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -513,4 +513,13 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 			$style, $dir, $remoteDir, true
 		);
 	}
+
+	/**
+	 * Get whether CSS for this module should be flipped
+	 * @param $context ResourceLoaderContext
+	 * @return bool
+	 */
+	public function getFlip( $context ) {
+		return $context->getDirection() === 'rtl';
+	}
 }
diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index fee54432fd..6f0d0754c5 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -106,12 +106,13 @@ abstract class ResourceLoaderModule {
 	}
 
 	/**
-	 * Get whether CSS for this module should be flipped
 	 * @param $context ResourceLoaderContext
 	 * @return bool
 	 */
 	public function getFlip( $context ) {
-		return $context->getDirection() === 'rtl';
+		global $wgContLang;
+
+		return $wgContLang->getDir() !== $context->getDirection();
 	}
 
 	/**
diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 6d6f8cc40d..266dcb1616 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -226,16 +226,6 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 		}
 		return $this->modifiedTime[$hash] = $time;
 	}
-
-	/**
-	 * @param $context ResourceLoaderContext
-	 * @return bool
-	 */
-	public function getFlip( $context ) {
-		global $wgContLang;
-
-		return $wgContLang->getDir() !== $context->getDirection();
-	}
 	
 	/* Methods */
 	
diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index 310101bb56..b1e80d55fd 100644
--- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@ -111,16 +111,6 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
 		return array();
 	}
 
-	/**
-	 * @param  $context ResourceLoaderContext
-	 * @return bool
-	 */
-	public function getFlip( $context ) {
-		global $wgContLang;
-
-		return $wgContLang->getDir() !== $context->getDirection();
-	}
-
 	public function getGroup() {
 		return 'private';
 	}
diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index 40b1186816..4a0a15780b 100644
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -131,17 +131,7 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
 	public function isKnownEmpty( ResourceLoaderContext $context ) {
 		return count( $this->getTitleMtimes( $context ) ) == 0;
 	}
-	
-	/**
-	 * @param $context ResourceLoaderContext
-	 * @return bool
-	 */
-	public function getFlip( $context ) {
-		global $wgContLang;
 
-		return $wgContLang->getDir() !== $context->getDirection();
-	}
-	
 	/**
 	 * Get the modification times of all titles that would be loaded for
 	 * a given context.
-- 
2.20.1