[MediaWiki-commits] [Gerrit] Added encapsulate option to TemplatedWidget - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Added encapsulate option to TemplatedWidget .. Added encapsulate option to TemplatedWidget Prevents events from bubbling up the DOM tree unnecessarily. Bug: T78149 Change-Id: Iee90bfa54e8fdb0692d4bbe21ef2fd2d60aaccb8 --- M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js M repo/resources/jquery.ui/jquery.ui.EditableTemplatedWidget.js M repo/resources/jquery.ui/jquery.ui.TemplatedWidget.js 6 files changed, 66 insertions(+), 21 deletions(-) Approvals: Hoo man: Looks good to me, but someone else must approve Adrian Lang: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js index 0e9ffd5..f394465 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js @@ -76,7 +76,8 @@ }, _createListview: function() { - var self = this; + var self = this, + prefix = $.wikibase.sitelinkgroupview.prototype.widgetEventPrefix; this.$listview = this.element.find( '.wb-listview' ); @@ -98,7 +99,11 @@ }; } } ), - value: self.options.value || null + value: self.options.value || null, + encapsulate: true + } ) + .on( prefix + 'disable.' + this.widgetName, function( event ) { + event.stopPropagation(); } ); }, diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js index c275f48..4e1068f 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js @@ -156,25 +156,11 @@ this.$sitelinklistview .on( prefix + 'change.' + this.widgetName, function( event ) { - event.stopPropagation(); self._trigger( 'change' ); } ) .on( prefix + 'toggleerror.' + this.widgetName, function( event, error ) { - event.stopPropagation(); self.setError( error ); } ) - .on( - [ - prefix + 'create.' + this.widgetName, - prefix + 'afterstartediting.' + this.widgetName, - prefix + 'stopediting.' + this.widgetName, - prefix + 'afterstopediting.' + this.widgetName, - prefix + 'disable.' + this.widgetName - ].join( ' ' ), - function( event ) { - event.stopPropagation(); - } - ) .sitelinklistview( { value: this._getSiteLinksOfGroup(), allowedSiteIds: this.options.value @@ -183,7 +169,8 @@ entityStore: this.options.entityStore, siteLinksChanger: this.options.siteLinksChanger, eventSingleton: this._eventSingleton, - $counter: this.$counter + $counter: this.$counter, + encapsulate: true } ); }, diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js index 6474e84..8b88a79 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js @@ -137,7 +137,8 @@ } } ), value: self.options.value || null, - listItemNodeName: 'LI' + listItemNodeName: 'LI', + encapsulate: true } ) .on( prefix + 'change.' + this.widgetName, function( event ) { event.stopPropagation(); diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js index 72bf6ba..ad49e37 100644 ---
[MediaWiki-commits] [Gerrit] Added encapsulate option to TemplatedWidget - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/180769 Change subject: Added encapsulate option to TemplatedWidget .. Added encapsulate option to TemplatedWidget Prevents events from bubbling up the DOM tree unnecessarily. -78149 Change-Id: Iee90bfa54e8fdb0692d4bbe21ef2fd2d60aaccb8 --- M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js M repo/resources/jquery.ui/jquery.ui.EditableTemplatedWidget.js M repo/resources/jquery.ui/jquery.ui.TemplatedWidget.js 6 files changed, 66 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/69/180769/1 diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js index 0e9ffd5..f394465 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js @@ -76,7 +76,8 @@ }, _createListview: function() { - var self = this; + var self = this, + prefix = $.wikibase.sitelinkgroupview.prototype.widgetEventPrefix; this.$listview = this.element.find( '.wb-listview' ); @@ -98,7 +99,11 @@ }; } } ), - value: self.options.value || null + value: self.options.value || null, + encapsulate: true + } ) + .on( prefix + 'disable.' + this.widgetName, function( event ) { + event.stopPropagation(); } ); }, diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js index c275f48..4e1068f 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js @@ -156,25 +156,11 @@ this.$sitelinklistview .on( prefix + 'change.' + this.widgetName, function( event ) { - event.stopPropagation(); self._trigger( 'change' ); } ) .on( prefix + 'toggleerror.' + this.widgetName, function( event, error ) { - event.stopPropagation(); self.setError( error ); } ) - .on( - [ - prefix + 'create.' + this.widgetName, - prefix + 'afterstartediting.' + this.widgetName, - prefix + 'stopediting.' + this.widgetName, - prefix + 'afterstopediting.' + this.widgetName, - prefix + 'disable.' + this.widgetName - ].join( ' ' ), - function( event ) { - event.stopPropagation(); - } - ) .sitelinklistview( { value: this._getSiteLinksOfGroup(), allowedSiteIds: this.options.value @@ -183,7 +169,8 @@ entityStore: this.options.entityStore, siteLinksChanger: this.options.siteLinksChanger, eventSingleton: this._eventSingleton, - $counter: this.$counter + $counter: this.$counter, + encapsulate: true } ); }, diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js index 6474e84..8b88a79 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js @@ -137,7 +137,8 @@ } } ), value: self.options.value || null, - listItemNodeName: 'LI' + listItemNodeName: 'LI', + encapsulate: true } ) .on( prefix + 'change.' + this.widgetName, function( event ) { event.stopPropagation(); diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js index 72bf6ba..ad49e37 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js +++