From c0830dd8685dc9e0a814722701fc3cd919098a68 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Fri, 18 Feb 2011 00:33:45 +0000 Subject: [PATCH] 2 subclasses of ResourceLoaderWikiModule implement a duplicate version of getFlip. Move it up into ResourceLoaderWikiModule (Almost looks like it could all go into ResourceLoaderModule... But that uses a different version, seemingly, the only one. 3 other subclasses of ResourceLoaderModule implement the same version of getFlip as is moved into a parent class here... Seems daft to have a different version in the base abstract class... Minor oversight?) Some documentation --- includes/resourceloader/ResourceLoaderModule.php | 1 + includes/resourceloader/ResourceLoaderSiteModule.php | 6 ------ .../resourceloader/ResourceLoaderStartUpModule.php | 4 ++++ .../resourceloader/ResourceLoaderUserGroupsModule.php | 6 ------ includes/resourceloader/ResourceLoaderUserModule.php | 6 ------ includes/resourceloader/ResourceLoaderWikiModule.php | 10 ++++++++++ 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php index 29f39bd116..a8bb2c08d0 100644 --- a/includes/resourceloader/ResourceLoaderModule.php +++ b/includes/resourceloader/ResourceLoaderModule.php @@ -108,6 +108,7 @@ 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'; diff --git a/includes/resourceloader/ResourceLoaderSiteModule.php b/includes/resourceloader/ResourceLoaderSiteModule.php index d68cc0bdb2..977d16bbf1 100644 --- a/includes/resourceloader/ResourceLoaderSiteModule.php +++ b/includes/resourceloader/ResourceLoaderSiteModule.php @@ -60,10 +60,4 @@ class ResourceLoaderSiteModule extends ResourceLoaderWikiModule { public function getGroup() { return 'site'; } - - public function getFlip( $context ) { - global $wgContLang; - - return $wgContLang->getDir() !== $context->getDirection(); - } } diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index 1ecb77c61d..87c788fd85 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -217,6 +217,10 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { return $this->modifiedTime[$hash] = $time; } + /** + * @param $context ResourceLoaderContext + * @return bool + */ public function getFlip( $context ) { global $wgContLang; diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php b/includes/resourceloader/ResourceLoaderUserGroupsModule.php index c81a999b2b..cebe93617a 100644 --- a/includes/resourceloader/ResourceLoaderUserGroupsModule.php +++ b/includes/resourceloader/ResourceLoaderUserGroupsModule.php @@ -52,10 +52,4 @@ class ResourceLoaderUserGroupsModule extends ResourceLoaderWikiModule { public function getGroup() { return 'user'; } - - public function getFlip( $context ) { - global $wgContLang; - - return $wgContLang->getDir() !== $context->getDirection(); - } } diff --git a/includes/resourceloader/ResourceLoaderUserModule.php b/includes/resourceloader/ResourceLoaderUserModule.php index f5482fb6a4..f2413fd67b 100644 --- a/includes/resourceloader/ResourceLoaderUserModule.php +++ b/includes/resourceloader/ResourceLoaderUserModule.php @@ -48,10 +48,4 @@ class ResourceLoaderUserModule extends ResourceLoaderWikiModule { public function getGroup() { return 'user'; } - - public function getFlip( $context ) { - global $wgContLang; - - return $wgContLang->getDir() !== $context->getDirection(); - } } diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php index b465c8699a..266fb1cac4 100644 --- a/includes/resourceloader/ResourceLoaderWikiModule.php +++ b/includes/resourceloader/ResourceLoaderWikiModule.php @@ -145,4 +145,14 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule { $this->modifiedTime[$hash] = $modifiedTime; return $modifiedTime; } + + /** + * @param $context ResourceLoaderContext + * @return bool + */ + public function getFlip( $context ) { + global $wgContLang; + + return $wgContLang->getDir() !== $context->getDirection(); + } } -- 2.20.1