jenkins-bot has submitted this change and it was merged.
Change subject: Introduce _hasMoreLanguages method
......................................................................
Introduce _hasMoreLanguages method
Checks length of languages before calculating actual additional
languages.
Change-Id: I2e5573ead7b97b4b6e743fd8ee220b22d0439e84
---
M
view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
1 file changed, 24 insertions(+), 2 deletions(-)
Approvals:
Bene: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
index 09d429a..b8ad1aa 100644
---
a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
+++
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
@@ -224,7 +224,7 @@
* @private
*/
_createEntitytermsforlanguagelistviewMore: function() {
- if ( $.isEmptyObject( this._getAdditionalLanguages() ) ) {
+ if ( !this._hasMoreLanguages() ) {
return;
}
@@ -241,7 +241,29 @@
},
/**
- * Click handler for more languages button
+ * Checks whether there are more languages to display
+ *
+ * @private
+ */
+ _hasMoreLanguages: function() {
+ var fingerprint = this.options.value,
+ minLength = this.options.userLanguages.length;
+
+ if ( fingerprint.getLabels().length > minLength
+ || fingerprint.getDescriptions().length > minLength
+ || fingerprint.getAliases().length > minLength ) {
+ return true;
+ }
+
+ if ( !$.isEmptyObject( this._getAdditionalLanguages() ) ) {
+ return true;
+ }
+
+ return false;
+ },
+
+ /**
+ * Click handler for more languages button.
*
* @private
*/
--
To view, visit https://gerrit.wikimedia.org/r/267043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e5573ead7b97b4b6e743fd8ee220b22d0439e84
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de>
Gerrit-Reviewer: Adrian Lang <adrian.he...@wikimedia.de>
Gerrit-Reviewer: Bene <benestar.wikime...@gmail.com>
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
