Mooeypoo has uploaded a new change for review. https://gerrit.wikimedia.org/r/217266
Change subject: Correctly aggregate flow.dm.List item events ...................................................................... Correctly aggregate flow.dm.List item events The previous version neglected to actually aggregate the events. This is a correction to make sure item events can be aggregated in the list object. Change-Id: I42b966c68ae365bc7baf42ed55bc11c4ee83c5e5 --- M modules/flow/dm/mixins/mw.flow.dm.List.js 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/66/217266/1 diff --git a/modules/flow/dm/mixins/mw.flow.dm.List.js b/modules/flow/dm/mixins/mw.flow.dm.List.js index b4cdd48..35e2eb7 100644 --- a/modules/flow/dm/mixins/mw.flow.dm.List.js +++ b/modules/flow/dm/mixins/mw.flow.dm.List.js @@ -137,12 +137,13 @@ * @fires add */ mw.flow.dm.List.prototype.addItems = function ( items, index ) { - var i, at, len, item, currentIndex, existingItem; + var i, len, item, event, events, currentIndex, existingItem, at; // Support adding existing items at new locations for ( i = 0, len = items.length; i < len; i++ ) { item = items[i]; existingItem = this.getItemById( item.getId() ); + // Check if item exists then remove it first, effectively "moving" it currentIndex = this.items.indexOf( existingItem ); if ( currentIndex >= 0 ) { @@ -153,6 +154,15 @@ } } + // Add the item + if ( item.connect && item.disconnect && !$.isEmptyObject( this.aggregateItemEvents ) ) { + events = {}; + for ( event in this.aggregateItemEvents ) { + events[ event ] = [ 'emit', this.aggregateItemEvents[ event ], item ]; + } + item.connect( this, events ); + } + // Add by reference this.itemsById[ item.getId() ] = items[i]; } -- To view, visit https://gerrit.wikimedia.org/r/217266 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I42b966c68ae365bc7baf42ed55bc11c4ee83c5e5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Mooeypoo <mor...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits