Adrian Heine has uploaded a new change for review. https://gerrit.wikimedia.org/r/289901
Change subject: Simplify and fix referenceview addtoolbar definition ...................................................................... Simplify and fix referenceview addtoolbar definition * Using the container option seems to be equal to just initialize on the container. It has the nice side effect of not having useless toolbar-related class names added to the references list element. * Since referenceviews have not own edit mode anymore, they don't leave edit mode on their own. Focussing the add reference button thus doesn't make any sense anymore imho. * Destroy event handler should always be bound, not just after having added at least one reference. Change-Id: Ife66aa2300cc3fc60b5f975f56df31e9ffcfa4c6 --- M view/resources/jquery/wikibase/toolbar/controller/definitions/addtoolbar/statementview-referenceview.js 1 file changed, 18 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/01/289901/1 diff --git a/view/resources/jquery/wikibase/toolbar/controller/definitions/addtoolbar/statementview-referenceview.js b/view/resources/jquery/wikibase/toolbar/controller/definitions/addtoolbar/statementview-referenceview.js index e306678..1f8b946 100644 --- a/view/resources/jquery/wikibase/toolbar/controller/definitions/addtoolbar/statementview-referenceview.js +++ b/view/resources/jquery/wikibase/toolbar/controller/definitions/addtoolbar/statementview-referenceview.js @@ -15,10 +15,10 @@ var $statementview = $( event.target ), statementview = $statementview.data( 'statementview' ), $node = statementview.$references; + $node = $( '<div/>' ).appendTo( $node ); $node .addtoolbar( { - $container: $( '<div/>' ).appendTo( $node ), label: mw.msg( 'wikibase-addreference' ) } ) .on( 'addtoolbaradd.addtoolbar', function( e ) { @@ -34,35 +34,29 @@ var referenceview = lia.liInstance( $referenceview ); referenceview.focus(); } ); - - // Re-focus "add" button after having added or having cancelled adding a reference: - var eventName = lia.prefixedEvent( 'afterstopediting.addtoolbar' ); - listview.element.one( eventName, function( event ) { - $node.data( 'addtoolbar' ).focus(); - } ); } ); - - toolbarController.registerEventHandler( - event.data.toolbar.type, - event.data.toolbar.id, - 'listviewdestroy', - function( event, toolbarController ) { - var $listview = $( event.target ), - $node = $listview.parent(); - - if ( !$node.hasClass( '.wikibase-statementview-references' ) ) { - return; - } - - toolbarController.destroyToolbar( $node.data( 'addtoolbar' ) ); - $node.off( 'addtoolbar' ); - } - ); } ); toolbarController.registerEventHandler( event.data.toolbar.type, event.data.toolbar.id, + 'listviewdestroy', + function( event, toolbarController ) { + var $listview = $( event.target ), + $node = $listview.parent(); + + if ( !$node.hasClass( '.wikibase-statementview-references' ) ) { + return; + } + + toolbarController.destroyToolbar( $node.data( 'addtoolbar' ) ); + $node.off( 'addtoolbar' ); + } + ); + + toolbarController.registerEventHandler( + event.data.toolbar.type, + event.data.toolbar.id, 'statementviewdisable', function( event ) { if ( event.target !== $statementview.get( 0 ) ) { -- To view, visit https://gerrit.wikimedia.org/r/289901 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife66aa2300cc3fc60b5f975f56df31e9ffcfa4c6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Heine <adrian.l...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits