jenkins-bot has submitted this change and it was merged.
Change subject: Remove useless itemadded event
......................................................................
Remove useless itemadded event
Since the view that owns the listview triggers the adding of items, it doesn't
have to wait for the event.
Change-Id: I087201bd0e0b15f90deb1470446a97ce9a431e32
---
M view/resources/jquery/wikibase/jquery.wikibase.listview.js
M view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
M view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
4 files changed, 10 insertions(+), 19 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.listview.js
b/view/resources/jquery/wikibase/jquery.wikibase.listview.js
index 3abad34..5df72f8 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.listview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.listview.js
@@ -25,13 +25,6 @@
* Node name of the base node of new list items.
*/
/**
- * @event itemadded
- * Triggered after a list item got added to the list.
- * @param {jQuery.Event} event
- * @param {*|null} value The value the new list item is representing. `null`
for empty value.
- * @param {jQuery} $li The DOM node of the widget representing the value.
- */
-/**
* @event itemremoved
* Triggered after a list got removed from the list.
* @param {jQuery.Event} event
@@ -250,9 +243,7 @@
* @return {jQuery} New list item's node.
*/
addItem: function( liValue ) {
- var $li = this._addLiValue( liValue );
- this._trigger( 'itemadded', null, [liValue, $li] );
- return $li;
+ return this._addLiValue( liValue );
},
/**
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
b/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
index 342af67..3ba79b3 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
@@ -111,7 +111,6 @@
var changeEvents = [
'snakviewchange.' + this.widgetName,
lia.prefixedEvent( 'change.' + this.widgetName ),
- 'listviewitemadded.' + this.widgetName,
'listviewitemremoved.' + this.widgetName
];
@@ -148,7 +147,6 @@
var lia = this.$listview.data( 'listview' ).listItemAdapter(),
events = [
'snakviewchange.' + this.widgetName,
- 'listviewitemadded.' + this.widgetName,
'listviewitemremoved.' + this.widgetName,
lia.prefixedEvent( 'change.' + this.widgetName
),
lia.prefixedEvent( 'stopediting.' +
this.widgetName )
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
b/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
index f357d06..c3108b7 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
@@ -184,8 +184,7 @@
}
)
.on(
- 'listviewitemremoved.' + this.widgetName
- + ' listviewitemadded.' + this.widgetName,
+ 'listviewitemremoved.' + this.widgetName,
function( event, sitelinkview ) {
self._refreshCounter();
if ( sitelinkview ) {
@@ -789,7 +788,8 @@
sitelinkview.startEditing();
}
- this.__pendingItems = this.__pendingItems ?
this.__pendingItems + 1 : 1;
+ self.__pendingItems = self.__pendingItems ?
self.__pendingItems + 1 : 1;
+ self._trigger( 'change' );
} );
}
} );
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index 23f426d..51edd7d 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -330,7 +330,7 @@
this._referencesListview = $listview.data( 'listview' );
$listview
- .on( 'listviewitemadded listviewitemremoved', function( event,
value, $li ) {
+ .on( 'listviewitemremoved', function( event, value, $li ) {
if ( self._ignoreReferencesListviewChanges ) {
return;
}
@@ -349,11 +349,13 @@
return;
}
- // Enter first item into the referenceview.
- lia.liInstance( $newLi ).enterNewItem();
-
var liInstance = lia.liInstance( $newLi );
+ // Enter first item into the referenceview.
+ liInstance.enterNewItem();
+ self._drawReferencesCounter();
+ self._trigger( 'change' );
+
if ( !liInstance.value() ) {
$newLi
.on( lia.prefixedEvent( 'afterstopediting' ),
function( event, dropValue ) {
--
To view, visit https://gerrit.wikimedia.org/r/297356
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I087201bd0e0b15f90deb1470446a97ce9a431e32
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: Hoo man <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[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
