From 36252b71da863c3c17c037779def2ef02d8e4c08 Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Thu, 5 Jul 2018 16:51:30 -0700 Subject: [PATCH] Allow ResourceLoaderImage modules without data URIs Bug: T198930 Change-Id: I13853a59222b38de0afde301a781af06067d4ddc --- includes/resourceloader/ResourceLoaderImageModule.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/resourceloader/ResourceLoaderImageModule.php b/includes/resourceloader/ResourceLoaderImageModule.php index c7792400c4..9311f6fceb 100644 --- a/includes/resourceloader/ResourceLoaderImageModule.php +++ b/includes/resourceloader/ResourceLoaderImageModule.php @@ -40,6 +40,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule { protected $images = []; protected $defaultColor = null; + protected $useDataURI = true; protected $variants = []; protected $prefix = null; protected $selectorWithoutVariant = '.{prefix}-{name}'; @@ -183,6 +184,9 @@ class ResourceLoaderImageModule extends ResourceLoaderModule { $this->{$member} = $option; break; + case 'useDataURI': + $this->{$member} = (bool)$option; + break; case 'defaultColor': case 'prefix': case 'selectorWithoutVariant': @@ -358,7 +362,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule { $script, $variant = null ) { - $imageDataUri = $image->getDataUri( $context, $variant, 'original' ); + $imageDataUri = $this->useDataURI ? $image->getDataUri( $context, $variant, 'original' ) : false; $primaryUrl = $imageDataUri ?: $image->getUrl( $context, $script, $variant, 'original' ); $declarations = $this->getCssDeclarations( $primaryUrl, -- 2.20.1