jenkins-bot has submitted this change and it was merged.
Change subject: Remove broken detection of multiple empty listitems in
sitelinklistview
......................................................................
Remove broken detection of multiple empty listitems in sitelinklistview
Change-Id: I75a258b9e58da26846e97daab61d9ddcf458b978
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
1 file changed, 2 insertions(+), 18 deletions(-)
Approvals:
Hoo man: Looks good to me, but someone else must approve
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index 1f20009..a4d2107 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -217,36 +217,20 @@
},
_updateAutoInput: function() {
- /**
- * @param {jQuery} $sitelinkview
- * @return {boolean}
- */
- function moreThanOneEmpty( $sitelinkview ) {
- var emptyItems = 0;
-
- $sitelinkview.each( function() {
- if( $( this ).data( 'sitelinkview' ).isEmpty()
) {
- return ++emptyItems === 2;
- }
- } );
-
- return emptyItems === 2;
- }
-
var listview = this.$listview.data( 'listview' ),
lia = listview.listItemAdapter(),
$items = listview.items(),
$lastSitelinkview = $items.last(),
lastSitelinkview = lia.liInstance( $lastSitelinkview ),
- multipleEmpty = moreThanOneEmpty( $items ).length > 1,
secondToLast = $items.length > 1 && lia.liInstance(
$items.eq( -2 ) ),
+ secondToLastEmpty = secondToLast &&
secondToLast.isEmpty(),
secondToLastInvalidPending
= secondToLast && !secondToLast.isValid() &&
!secondToLast.option( 'value' );
if(
lastSitelinkview
&& lastSitelinkview.isEmpty()
- && ( multipleEmpty || secondToLastInvalidPending )
+ && ( secondToLastEmpty || secondToLastInvalidPending )
) {
listview.removeItem( $lastSitelinkview );
} else if( !lastSitelinkview || lastSitelinkview.isValid() &&
!this.isFull() ) {
--
To view, visit https://gerrit.wikimedia.org/r/172510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75a258b9e58da26846e97daab61d9ddcf458b978
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <adrian.l...@wikimedia.de>
Gerrit-Reviewer: Adrian Lang <adrian.l...@wikimedia.de>
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
