X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderFileModule.php;h=725bc6a05e0d54bed5263f2a7fa71525efff288d;hb=e758226c91935a1df2b6fd3ed1f18922d8bfb45b;hp=2dcc841e92a83329630067666c55c6f175ee0ebc;hpb=f0d760a0773eaaf840b8e5a1649b5c6a0f705f9d;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php index 2dcc841e92..725bc6a05e 100644 --- a/includes/resourceloader/ResourceLoaderFileModule.php +++ b/includes/resourceloader/ResourceLoaderFileModule.php @@ -117,9 +117,6 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { /** @var string Name of group to load this module in */ protected $group; - /** @var string Position on the page to load this module at */ - protected $position = 'bottom'; - /** @var bool Link to raw files in debug mode */ protected $debugRaw = true; @@ -128,6 +125,9 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { protected $targets = [ 'desktop' ]; + /** @var bool Whether CSSJanus flipping should be skipped for this module */ + protected $noflip = false; + /** * @var bool Whether getStyleURLsForDebug should return raw file paths, * or return load.php urls @@ -201,8 +201,6 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { * 'messages' => [array of message key strings], * // Group which this module should be loaded together with * 'group' => [group name string], - * // Position on the page to load this module at - * 'position' => ['bottom' (default) or 'top'] * // Function that, if it returns true, makes the loader skip this module. * // The file must contain valid JavaScript for execution in a private function. * // The file must not contain the "function () {" and "}" wrapper though. @@ -269,7 +267,6 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { $this->{$member} = $option; break; // Single strings - case 'position': case 'group': case 'skipFunction': $this->{$member} = (string)$option; @@ -277,6 +274,7 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { // Single booleans case 'debugRaw': case 'raw': + case 'noflip': $this->{$member} = (bool)$option; break; } @@ -441,13 +439,6 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { return $this->group; } - /** - * @return string - */ - public function getPosition() { - return $this->position; - } - /** * Gets list of names of modules this module depends on. * @param ResourceLoaderContext|null $context @@ -569,7 +560,6 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { // - dependencies (provided via startup module) // - targets // - group (provided via startup module) - // - position (only used by OutputPage) 'scripts', 'debugScripts', 'styles', @@ -913,7 +903,7 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { * @return bool */ public function getFlip( $context ) { - return $context->getDirection() === 'rtl'; + return $context->getDirection() === 'rtl' && !$this->noflip; } /**