wikimedia/mediawiki-extensions-TemplateStyles
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TemplateStyles synced 2024-11-24 00:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate embedded style rules

Browse source 
Use the facility added in core change I055abdf4d to deduplicate the
embedded style rules.

Bug: T168333
Change-Id: I98c6d5ca4b474de8826b19355f15a5230aef5650
Depends-On: I055abdf4d73ec65771eaa4fe0999ec907c831568
This commit is contained in:
Brad Jorsch 2017-11-24 14:20:47 -05:00 committed by Gergő Tisza
parent 252fb74845
commit 164b8861d8
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/TemplateStylesHooks.php
View file

@ -303,7 +303,9 @@ class TemplateStylesHooks {
// Return the inline <style>, which the Parser will wrap in a 'general'
// strip marker.
$ret = Html::inlineStyle( $marker );
$ret = Html::inlineStyle( $marker, 'all', [
'data-mw-deduplicate' => "TemplateStyles:$cacheKey",
] );
$parser->extTemplateStylesCache->set( $cacheKey, $ret );
return $ret;
}

29
tests/phpunit/TemplateStylesHooksTest.php
View file

@ -199,6 +199,9 @@ class TemplateStylesHooksTest extends MediaWikiLangTestCase {
$out = $parser->parse( $wikitext, Title::newFromText( 'Test' ), $popt );
$parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
$expect = preg_replace_callback( '/\{\{REV:(.*?)\}\}/', function ( $m ) {
return Title::newFromText( 'Template:TemplateStyles test/' . $m[1] )->getLatestRevID();
}, $expect );
$this->assertEquals( $expect, $out->getText( $getTextOptions ) );
}
@ -258,7 +261,7 @@ class TemplateStylesHooksTest extends MediaWikiLangTestCase {
$popt, [],
'<templatestyles src="TemplateStyles test/styles1.css" />',
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
"<div class=\"templatestyles-test\"><p><style>.templatestyles-test .foo{color:blue}</style>\n</p></div>",
"<div class=\"templatestyles-test\"><p><style data-mw-deduplicate=\"TemplateStyles:r{{REV:styles1.css}}/templatestyles-test\">.templatestyles-test .foo{color:blue}</style>\n</p></div>",
// @codingStandardsIgnoreEnd
],
'Disabled' => [
@ -271,20 +274,24 @@ class TemplateStylesHooksTest extends MediaWikiLangTestCase {
$popt, [],
'<templatestyles src="Test replacement" />',
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
"<div class=\"templatestyles-test\"><p><style>/*\nErrors processing stylesheet [[:Template:Test replacement]] (rev ):\n• Unrecognized or unsupported property at line 1 character 22.\n*/\n.templatestyles-test .baz{color:orange}</style>\n</p></div>",
"<div class=\"templatestyles-test\"><p><style data-mw-deduplicate=\"TemplateStyles:8fd14043c1cce91e8b9d1487a9d17d8d9ae43890/templatestyles-test\">/*\nErrors processing stylesheet [[:Template:Test replacement]] (rev ):\n• Unrecognized or unsupported property at line 1 character 22.\n*/\n.templatestyles-test .baz{color:orange}</style>\n</p></div>",
// @codingStandardsIgnoreEnd
],
'Still prefixed despite no wrapper' => [
$popt2, [ 'unwrap' => true ],
'<templatestyles src="TemplateStyles test/styles1.css" />',
"<p><style>.mw-parser-output .foo{color:blue}</style>\n</p>",
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
"<p><style data-mw-deduplicate=\"TemplateStyles:r{{REV:styles1.css}}\">.mw-parser-output .foo{color:blue}</style>\n</p>",
// @codingStandardsIgnoreEnd
],
'Still prefixed despite deprecated no wrapper' => [
$popt3, [],
'<templatestyles src="TemplateStyles test/styles1.css" />',
"<p><style>.mw-parser-output .foo{color:blue}</style>\n</p>",
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
"<p><style data-mw-deduplicate=\"TemplateStyles:r{{REV:styles1.css}}\">.mw-parser-output .foo{color:blue}</style>\n</p>",
// @codingStandardsIgnoreEnd
],
'Not yet deduplicated tags' => [
'Deduplicated tags' => [
$popt, [],
trim( '
<templatestyles src="TemplateStyles test/styles1.css" />
@ -293,14 +300,16 @@ class TemplateStylesHooksTest extends MediaWikiLangTestCase {
<templatestyles src="TemplateStyles test/styles1.css" />
<templatestyles src="TemplateStyles test/styles2.css" />
' ),
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
trim( '
<div class="templatestyles-test"><p><style>.templatestyles-test .foo{color:blue}</style>
<style>.templatestyles-test .foo{color:blue}</style>
<style>.templatestyles-test .bar{color:green}</style>
<style>.templatestyles-test .foo{color:blue}</style>
<style>.templatestyles-test .bar{color:green}</style>
<div class="templatestyles-test"><p><style data-mw-deduplicate="TemplateStyles:r{{REV:styles1.css}}/templatestyles-test">.templatestyles-test .foo{color:blue}</style>
<link rel="mw-deduplicated-inline-style" href="mw-data:TemplateStyles:r{{REV:styles1.css}}/templatestyles-test"/>
<style data-mw-deduplicate="TemplateStyles:r{{REV:styles2.css}}/templatestyles-test">.templatestyles-test .bar{color:green}</style>
<link rel="mw-deduplicated-inline-style" href="mw-data:TemplateStyles:r{{REV:styles1.css}}/templatestyles-test"/>
<link rel="mw-deduplicated-inline-style" href="mw-data:TemplateStyles:r{{REV:styles2.css}}/templatestyles-test"/>
</p></div>
' ),
// @codingStandardsIgnoreEnd
],
];
}