Remove getFlip code duplication

Move usual one into ResourceLoaderModule, and then move what was in ResourceLoaderModule into ResouceLoaderFileModule

diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php
index 4f18380..5bb38fe 100644 (file)
--- 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 fee5443..6f0d075 100644 (file)
--- 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 6d6f8cc..266dcb1 100644 (file)
--- 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 310101b..b1e80d5 100644 (file)
--- 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 40b1186..4a0a157 100644 (file)
--- 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.