Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

JsonContent: Add missing prefix to selector

Browse source 
Change-Id: I977f6c565b93949a310d1207411f893cf83af996
This commit is contained in:
Ed Sanders 2019-04-12 20:45:35 +01:00 committed by Jforrester
parent ae3f5f12ff
commit 3535a5f327
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/content/JsonContent.php
View file

@ -220,7 +220,7 @@ class JsonContent extends TextContent {
return Html::rawElement( 'td', [], $this->arrayTable( $val ) );
}
return Html::element( 'td', [ 'class' => 'value' ], $this->primitiveValue( $val ) );
return Html::element( 'td', [ 'class' => 'mw-json-value' ], $this->primitiveValue( $val ) );
}
/**

2
resources/src/mediawiki.content.json.less
View file

@ -18,8 +18,10 @@
padding: 0.5em 1em;
}
/* TODO: Remove this old class once the content caches have cleared */
/* stylelint-disable-next-line selector-class-pattern */
.mw-json .value,
.mw-json-value,
.mw-json-single-value {
background-color: #dcfae3;
font-family: monospace, monospace;

16
tests/phpunit/includes/content/JsonContentTest.php
View file

@ -113,27 +113,27 @@ class JsonContentTest extends MediaWikiLangTestCase {
],
[
(object)[ 'foo' ],
'<table class="mw-json"><tbody><tr><th>0</th><td class="value">"foo"</td></tr>' .
'<table class="mw-json"><tbody><tr><th>0</th><td class="mw-json-value">"foo"</td></tr>' .
'</tbody></table>'
],
[
(object)[ 'foo', 'bar' ],
'<table class="mw-json"><tbody><tr><th>0</th><td class="value">"foo"</td></tr>' .
'<tr><th>1</th><td class="value">"bar"</td></tr></tbody></table>'
'<table class="mw-json"><tbody><tr><th>0</th><td class="mw-json-value">"foo"</td></tr>' .
'<tr><th>1</th><td class="mw-json-value">"bar"</td></tr></tbody></table>'
],
[
(object)[ 'baz' => 'foo', 'bar' ],
'<table class="mw-json"><tbody><tr><th>baz</th><td class="value">"foo"</td></tr>' .
'<tr><th>0</th><td class="value">"bar"</td></tr></tbody></table>'
'<table class="mw-json"><tbody><tr><th>baz</th><td class="mw-json-value">"foo"</td></tr>' .
'<tr><th>0</th><td class="mw-json-value">"bar"</td></tr></tbody></table>'
],
[
(object)[ 'baz' => 1000, 'bar' ],
'<table class="mw-json"><tbody><tr><th>baz</th><td class="value">1000</td></tr>' .
'<tr><th>0</th><td class="value">"bar"</td></tr></tbody></table>'
'<table class="mw-json"><tbody><tr><th>baz</th><td class="mw-json-value">1000</td></tr>' .
'<tr><th>0</th><td class="mw-json-value">"bar"</td></tr></tbody></table>'
],
[
(object)[ '<script>alert("evil!")</script>' ],
'<table class="mw-json"><tbody><tr><th>0</th><td class="value">"' .
'<table class="mw-json"><tbody><tr><th>0</th><td class="mw-json-value">"' .
'&lt;script>alert("evil!")&lt;/script>"' .
'</td></tr></tbody></table>',
],