jenkins-bot has submitted this change and it was merged.
Change subject: Fix entitytermsview empty indicators
......................................................................
Fix entitytermsview empty indicators
The confusion between descriptions and labels is solved as well
as the non-existent display of the aliases empty message.
Change-Id: I1616537d3f21465c7168a129c1a9c5d26d27cd4b
---
M view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
M view/resources/jquery/wikibase/resources.php
2 files changed, 11 insertions(+), 4 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
index a26d60c..001a804 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
@@ -119,7 +119,8 @@
var $labelChildren =
self.$headingLabel.children(),
labelText =
this.label.getText(),
- descriptionText =
this.description.getText();
+ descriptionText =
this.description.getText(),
+ aliasesTexts =
this.aliases.getTexts();
self.$headingLabel
.toggleClass( 'wb-empty',
labelText === '' )
@@ -127,14 +128,19 @@
.append( $labelChildren );
self.$headingDescription
- .toggleClass( 'wb-empty',
labelText === '' )
+ .toggleClass( 'wb-empty',
descriptionText === '' )
.text( descriptionText === ''
? mw.msg(
'wikibase-description-empty' )
: descriptionText
);
- var aliasesTexts =
this.aliases.getTexts(),
- $ul =
self.$headingAliases.children( 'ul' ).empty();
+ var $ul = self.$headingAliases
+ .toggleClass( 'wb-empty',
aliasesTexts.length === 0 )
+ .children( 'ul' )
+ .text( aliasesTexts.length === 0
+ ? mw.msg(
'wikibase-aliases-empty' )
+ : ''
+ );
for( var i = 0; i <
aliasesTexts.length; i++ ) {
$ul.append(
diff --git a/view/resources/jquery/wikibase/resources.php
b/view/resources/jquery/wikibase/resources.php
index d55b703..a2785c0 100644
--- a/view/resources/jquery/wikibase/resources.php
+++ b/view/resources/jquery/wikibase/resources.php
@@ -195,6 +195,7 @@
'wikibase-entitytermsview-entitytermsforlanguagelistview-toggler',
'wikibase-description-empty',
'wikibase-label-empty',
+ 'wikibase-aliases-empty',
'wikibase-terms',
),
),
--
To view, visit https://gerrit.wikimedia.org/r/205175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1616537d3f21465c7168a129c1a9c5d26d27cd4b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene <benestar.wikime...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
