jenkins-bot has submitted this change and it was merged.
Change subject: Introduce listview::_removeItem, don't use addItem internally
......................................................................
Introduce listview::_removeItem, don't use addItem internally
Change-Id: Ia2ac54e140418603528be1ea3cf1543bb404a1d7
---
M view/resources/jquery/wikibase/jquery.wikibase.listview.js
1 file changed, 11 insertions(+), 8 deletions(-)
Approvals:
Thiemo Mättig (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 5df72f8..3eb17b6 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.listview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.listview.js
@@ -66,7 +66,7 @@
/**
* The DOM elements this `listview`'s element contained when it was
initialized. These DOM
- * elements are reused in `this.addItem` until the array is empty.
+ * elements are reused in `this._addLiValue` until the array is empty.
* @property [HTMLElement[]]
* @private
*/
@@ -118,9 +118,7 @@
throw new Error( 'Can not change the ListItemAdapter
after initialization' );
} else if ( key === 'value' ) {
this.items().each( function() {
- var $node = $( this );
- self._lia.liInstance( $node ).destroy();
- $node.remove();
+ self._removeItem( $( this ) );
} );
for ( var i = 0; i < value.length; i++ ) {
@@ -153,11 +151,11 @@
if ( items === null ) {
for ( i = this._reusedItems.length; i--; ) {
- this.addItem( null );
+ this._addLiValue( null );
}
} else {
for ( i in items ) {
- this.addItem( items[i] );
+ this._addLiValue( items[i] );
}
}
},
@@ -291,9 +289,14 @@
var liValue = this._lia.liInstance( $li ).value();
+ this._removeItem( $li );
+
+ this._trigger( 'itemremoved', null, [liValue, $li] );
+ },
+
+ _removeItem: function( $li ) {
this._lia.liInstance( $li ).destroy();
$li.remove();
- this._trigger( 'itemremoved', null, [liValue, $li] );
},
/**
@@ -306,7 +309,7 @@
* `listItemAdapter().liInstance( $newLi )` to receive the
widget instance.
*/
enterNewItem: function() {
- var $newLi = this.addItem();
+ var $newLi = this._addLiValue();
this._trigger( 'enternewitem', null, [$newLi] );
return $.Deferred().resolve( $newLi ).promise();
},
--
To view, visit https://gerrit.wikimedia.org/r/297357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2ac54e140418603528be1ea3cf1543bb404a1d7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Heine <[email protected]>
Gerrit-Reviewer: Adrian Heine <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
