jenkins-bot has submitted this change and it was merged.
Change subject: Fix pending counter in sitelinklistview
......................................................................
Fix pending counter in sitelinklistview
Two issues, and both seem to be weeks and weeks old:
1. Start editing, but cancel. The counter is not reset to the original
number.
2. The filter was applied on the wrong list. The last empty item is new
and empty. It should be in the 2nd number, but because it is empty, it
was in the 1st number.
Change-Id: I0b8991deb04e31ce90f843d1d1c72929f4571a6a
---
M view/resources/jquery/wikibase/jquery.wikibase.listview.js
M view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
2 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.listview.js
b/view/resources/jquery/wikibase/jquery.wikibase.listview.js
index c757342..d0346b3 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.listview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.listview.js
@@ -215,7 +215,7 @@
*/
nonEmptyItems: function() {
var lia = this._lia;
- return this.items().filter( function( i ) {
+ return this.items().filter( function() {
var item = lia.liInstance( $( this ) );
return !!item.value();
} );
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
b/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
index 1ecf7af..4e1713f 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
@@ -297,11 +297,11 @@
_getFormattedCounterText: function() {
var listview = this.$listview.data( 'listview' ),
lia = listview.listItemAdapter(),
- $items = listview.items(),
- $pendingItems = $items.filter( '.wb-new' ).filter(
function() {
+ $items = listview.items().filter( function() {
var sitelinkview = lia.liInstance( $( this ) );
return !sitelinkview.isEmpty();
- } );
+ } ),
+ $pendingItems = $items.filter( '.wb-new' );
var $counterMsg = wb.utilities.ui.buildPendingCounter(
$items.length - $pendingItems.length,
@@ -447,7 +447,8 @@
var self = this;
if ( dropValue ) {
- self.$listview.data( 'listview' ).value(
self.options.value );
+ this.$listview.data( 'listview' ).value(
this.options.value );
+ this._refreshCounter();
} else {
this._removeIncompleteSiteLinks();
}
--
To view, visit https://gerrit.wikimedia.org/r/272993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b8991deb04e31ce90f843d1d1c72929f4571a6a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Adrian Heine <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
