Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/190441
Change subject: referenceview: Fixed overridden event bindings ...................................................................... referenceview: Fixed overridden event bindings Change-Id: I8aa4cb360df0440cc8c31be27e9b5d5ab1a8c38c --- M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js M lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js 2 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/41/190441/1 diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js index 7b293e2..37ac3d3 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js @@ -146,11 +146,6 @@ } ); this._listview = this.$listview.data( 'listview' ); - // Some who actually want to get the listview's events are listening on referenceview*, - // others who do not want to get the events of this listview are listening on - // listview*. - // FIXME: Rather fix the event bindings - this._listview.widgetEventPrefix = 'referenceview'; this._updateReferenceHashClass( this.value() ); }, @@ -164,7 +159,7 @@ var changeEvents = [ 'snakviewchange.' + this.widgetName, 'snaklistviewchange.' + this.widgetName, - 'referenceviewafteritemmove.' + this.widgetName, + 'listviewafteritemmove.' + this.widgetName, 'listviewitemadded.' + this.widgetName, 'listviewitemremoved.' + this.widgetName ]; @@ -200,7 +195,7 @@ var events = [ 'snakviewchange.' + this.widgetName, 'snaklistviewchange.' + this.widgetName, - 'referenceviewafteritemmove.' + this.widgetName, + 'listviewafteritemmove.' + this.widgetName, 'listviewitemadded.' + this.widgetName, 'listviewitemremoved.' + this.widgetName, this.options.listItemAdapter.prefixedEvent( 'stopediting.' + this.widgetName ) diff --git a/lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js b/lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js index bce99f7..f2b89be 100644 --- a/lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js +++ b/lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js @@ -11,9 +11,9 @@ id: 'referenceview-snakview', selector: '.wikibase-statementview-references .wikibase-referenceview', events: { - 'snakviewafterstartediting snakviewchange referenceviewitemremoved': function( event, toolbarController ) { - var $target = $( event.target ), - $referenceview = $target.closest( ':wikibase-referenceview' ), + 'snakviewafterstartediting snakviewchange': function( event, toolbarcontroller ) { + var $snakview = $( event.target ), + $referenceview = $snakview.closest( ':wikibase-referenceview' ), referenceview = $referenceview.data( 'referenceview' ); if( !referenceview ) { @@ -21,33 +21,38 @@ } if ( event.type === 'snakviewafterstartediting' ) { - var $snaklistview = $target.closest( ':wikibase-snaklistview' ), + var $snaklistview = $snakview.closest( ':wikibase-snaklistview' ), snaklistview = $snaklistview.data( 'snaklistview' ), snakviewPropertyGroupListview = snaklistview._listview; - $target.removetoolbar( { - $container: $( '<div/>' ).appendTo( $target ) + $snakview.removetoolbar( { + $container: $( '<div/>' ).appendTo( $snakview ) } ) .on( 'removetoolbarremove.removetoolbar', function( event ) { - if( event.target === $target.get( 0 ) ) { - snakviewPropertyGroupListview.removeItem( $target ); + if( event.target === $snakview[0] ) { + snakviewPropertyGroupListview.removeItem( $snakview ); } } ); - toolbarController.registerEventHandler( + toolbarcontroller.registerEventHandler( event.data.toolbar.type, event.data.toolbar.id, 'referenceviewafterstopediting', function( event, toolbarcontroller ) { // Destroy the snakview toolbars: var $referenceviewNode = $( event.target ); - $.each( $referenceviewNode.find( '.wikibase-snakview' ), function( i, snakviewNode ) { - toolbarcontroller.destroyToolbar( $( snakviewNode ).data( 'removetoolbar' ) ); - } ); + $.each( + $referenceviewNode.find( '.wikibase-snakview' ), + function( i, snakviewNode ) { + toolbarcontroller.destroyToolbar( + $( snakviewNode ).data( 'removetoolbar' ) + ); + } + ); } ); - toolbarController.registerEventHandler( + toolbarcontroller.registerEventHandler( event.data.toolbar.type, event.data.toolbar.id, 'referenceviewdisable listviewitemremoved', -- To view, visit https://gerrit.wikimedia.org/r/190441 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8aa4cb360df0440cc8c31be27e9b5d5ab1a8c38c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Henning Snater <henning.sna...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits