diff options
| author | Fomafix <fomafix@googlemail.com> | 2019-02-10 16:04:57 +0100 |
|---|---|---|
| committer | Fomafix <fomafix@googlemail.com> | 2019-02-12 01:29:36 +0100 |
| commit | 2f9a6581b75ca75e5b63c9a2d8a74d7ce62d9629 (patch) | |
| tree | 8a109ff5d47c0fb8293686ae43a207fdf4186c6c | |
| parent | 272afcab466eeb030934b3e9a8fcd9c1c4253291 (diff) | |
| download | mediawikicore-2f9a6581b75ca75e5b63c9a2d8a74d7ce62d9629.tar.gz mediawikicore-2f9a6581b75ca75e5b63c9a2d8a74d7ce62d9629.zip | |
EnhancedChangesList: Load style module via addModuleStyles()
This change avoids a flash of missing collapsible toggle icons while
loading.
Change-Id: I090b1622868f2e5a01ca783dfce3be16b7d6b525
| -rw-r--r-- | includes/changes/EnhancedChangesList.php | 2 | ||||
| -rw-r--r-- | includes/templates/EnhancedChangesListGroup.mustache | 2 | ||||
| -rw-r--r-- | tests/phpunit/includes/changes/EnhancedChangesListTest.php | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/includes/changes/EnhancedChangesList.php b/includes/changes/EnhancedChangesList.php index 28b30d8ba413..51a26baab72c 100644 --- a/includes/changes/EnhancedChangesList.php +++ b/includes/changes/EnhancedChangesList.php @@ -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">'; diff --git a/includes/templates/EnhancedChangesListGroup.mustache b/includes/templates/EnhancedChangesListGroup.mustache index 6037d3792d8b..6d9d6b0a8268 100644 --- a/includes/templates/EnhancedChangesListGroup.mustache +++ b/includes/templates/EnhancedChangesListGroup.mustache @@ -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 }}} {{ timestamp }} </td> <td class="mw-changeslist-line-inner"> diff --git a/tests/phpunit/includes/changes/EnhancedChangesListTest.php b/tests/phpunit/includes/changes/EnhancedChangesListTest.php index 420fe7493e7c..eff2c851afa3 100644 --- a/tests/phpunit/includes/changes/EnhancedChangesListTest.php +++ b/tests/phpunit/includes/changes/EnhancedChangesListTest.php @@ -27,6 +27,12 @@ class EnhancedChangesListTest extends MediaWikiLangTestCase { $styleModules = $enhancedChangesList->getOutput()->getModuleStyles(); $this->assertContains( + 'mediawiki.icon', + $styleModules, + 'has mediawiki.icon' + ); + + $this->assertContains( 'mediawiki.special.changeslist', $styleModules, 'has mediawiki.special.changeslist' @@ -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() { |