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

EnhancedChangesList: Load style module via addModuleStyles()

Browse source 
This change avoids a flash of missing collapsible toggle icons while
loading.

Change-Id: I090b1622868f2e5a01ca783dfce3be16b7d6b525
This commit is contained in:
Fomafix 2019-02-10 16:04:57 +01:00
parent 272afcab46
commit 2f9a6581b7
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/changes/EnhancedChangesList.php
View file

@ -77,12 +77,12 @@ class EnhancedChangesList extends ChangesList {
$this->lastdate = '';
$this->rclistOpen = false;
$this->getOutput()->addModuleStyles( [
'mediawiki.icon',
'mediawiki.special.changeslist',
'mediawiki.special.changeslist.enhanced',
] );
$this->getOutput()->addModules( [
'jquery.makeCollapsible',
'mediawiki.icon',
] );
return '<div class="mw-changeslist">';

2
includes/templates/EnhancedChangesListGroup.mustache
View file

@ -10,7 +10,7 @@
<div class="mw-rcfilters-ui-highlights-color-c5" data-color="c5"></div>
</div>
</td>
<td><span class="mw-collapsible-toggle mw-collapsible-arrow mw-enhancedchanges-arrow mw-enhancedchanges-arrow-space"></span></td>
<td><span class="mw-collapsible-toggle mw-collapsible-arrow mw-enhancedchanges-arrow mw-enhancedchanges-arrow-space mw-collapsible-toggle-collapsed"></span></td>
<td class="mw-changeslist-line-prefix">{{{ prefix }}}</td>
<td class="mw-enhanced-rc" colspan="2">{{{ collectedRcFlags }}}&#160;{{ timestamp }}&#160;</td>
<td class="mw-changeslist-line-inner">

7
tests/phpunit/includes/changes/EnhancedChangesListTest.php
View file

@ -26,6 +26,12 @@ class EnhancedChangesListTest extends MediaWikiLangTestCase {
$styleModules = $enhancedChangesList->getOutput()->getModuleStyles();
$this->assertContains(
'mediawiki.icon',
$styleModules,
'has mediawiki.icon'
);
$this->assertContains(
'mediawiki.special.changeslist',
$styleModules,
@ -46,7 +52,6 @@ class EnhancedChangesListTest extends MediaWikiLangTestCase {
$modules = $enhancedChangesList->getOutput()->getModules();
$this->assertContains( 'jquery.makeCollapsible', $modules, 'has jquery.makeCollapsible' );
$this->assertContains( 'mediawiki.icon', $modules, 'has mediawiki.icon' );
}
public function testBeginRecentChangesList_html() {