[MediaWiki-commits] [Gerrit] $.wikibase.sitelinklistview: Implemented dynamic input elements - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: $.wikibase.sitelinklistview: Implemented dynamic input elements .. $.wikibase.sitelinklistview: Implemented dynamic input elements Along with the change, the now obsolete add toolbar initialized on sitelinkgroupview is removed. Bug: 72023 Change-Id: I33bddf76ea63d53e41dea3f01514851541d84407 --- M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js M repo/resources/wikibase.ui.entityViewInit.js 3 files changed, 84 insertions(+), 96 deletions(-) Approvals: Adrian Lang: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js index 7726ef8..34ad5f4 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js @@ -418,92 +418,6 @@ } } ); -$.wikibase.toolbarcontroller.definition( 'addtoolbar', { - id: 'sitelinkgroupview-sitelinklistview', - selector: ':' + $.wikibase.sitelinkgroupview.prototype.namespace - + '-' + $.wikibase.sitelinkgroupview.prototype.widgetName, - events: { - sitelinkgroupviewafterstartediting: function( event, toolbarcontroller ) { - var $sitelinkgroupview = $( event.target ), - sitelinkgroupview = $sitelinkgroupview.data( 'sitelinkgroupview' ), - $sitelinklistview =sitelinkgroupview.$sitelinklistview, - sitelinklistview = $sitelinklistview.data( 'sitelinklistview' ); - - $sitelinklistview - .addtoolbar( { - $container: $( 'span/' ).appendTo( sitelinklistview.$tfoot.find( 'td' ).last() ) - } ) - .on( 'addtoolbaradd.addtoolbar', function() { - sitelinklistview.$listview.one( - 'sitelinkviewafterstartediting', - function( event ) { - $( event.target ).data( 'sitelinkview' ).focus(); - } - ); - - $sitelinklistview.data( 'sitelinklistview' ).enterNewItem(); - - // Re-focus add button after having added or having cancelled adding a link: - var eventName = 'sitelinklistviewafterstopediting.addtoolbar'; - $sitelinklistview.one( eventName, function( event ) { - $sitelinklistview.data( 'addtoolbar' ).focus(); - } ); - } ); - - if( sitelinklistview.isFull() ) { - $sitelinklistview.data( 'addtoolbar' ).disable(); - } - }, - sitelinkgroupviewafterstopediting: function( event, toolbarcontroller ) { - var $sitelinkgroupview = $( event.target ), - sitelinkgroupview = $sitelinkgroupview.data( 'sitelinkgroupview' ), - $sitelinklistview = sitelinkgroupview.$sitelinklistview; - - toolbarcontroller.destroyToolbar( $sitelinklistview.data( 'addtoolbar' ) ); - $sitelinklistview.off( '.addtoolbar' ); - }, - sitelinklistviewafterremove: function( event, toolbarcontroller ) { - var $sitelinkgroupview = $( event.target ), - sitelinkgroupview = $sitelinkgroupview.data( 'sitelinkgroupview' ), - $sitelinklistview = sitelinkgroupview.$sitelinklistview, - sitelinklistview = $sitelinklistview.data( 'sitelinklistview' ); - - $sitelinklistview.data( 'addtoolbar' )[sitelinklistview.isFull() - ? 'disable' - : 'enable' - ](); - }, - sitelinkgroupviewchange: function( event, toolbarcontroller ) { - var $sitelinkgroupview = $( event.target ), - sitelinkgroupview = $sitelinkgroupview.data( 'sitelinkgroupview' ), - $sitelinklistview = sitelinkgroupview.$sitelinklistview, - sitelinklistview = $sitelinklistview.data( 'sitelinklistview' ), - addtoolbar = $sitelinklistview.data( 'addtoolbar' ); - -
[MediaWiki-commits] [Gerrit] $.wikibase.sitelinklistview: Implemented dynamic input elements - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/168293 Change subject: $.wikibase.sitelinklistview: Implemented dynamic input elements .. $.wikibase.sitelinklistview: Implemented dynamic input elements Along with the change, the now obsolete add toolbar initialized on sitelinkgroupview is removed. Change-Id: I33bddf76ea63d53e41dea3f01514851541d84407 --- M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js M repo/resources/wikibase.ui.entityViewInit.js 3 files changed, 118 insertions(+), 96 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/93/168293/1 diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js index b4bb0fd..e7f94cd 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js @@ -417,92 +417,6 @@ } } ); -$.wikibase.toolbarcontroller.definition( 'addtoolbar', { - id: 'sitelinkgroupview-sitelinklistview', - selector: ':' + $.wikibase.sitelinkgroupview.prototype.namespace - + '-' + $.wikibase.sitelinkgroupview.prototype.widgetName, - events: { - sitelinkgroupviewafterstartediting: function( event, toolbarcontroller ) { - var $sitelinkgroupview = $( event.target ), - sitelinkgroupview = $sitelinkgroupview.data( 'sitelinkgroupview' ), - $sitelinklistview =sitelinkgroupview.$sitelinklistview, - sitelinklistview = $sitelinklistview.data( 'sitelinklistview' ); - - $sitelinklistview - .addtoolbar( { - $container: $( 'span/' ).appendTo( sitelinklistview.$tfoot.find( 'td' ).last() ) - } ) - .on( 'addtoolbaradd.addtoolbar', function() { - sitelinklistview.$listview.one( - 'sitelinkviewafterstartediting', - function( event ) { - $( event.target ).data( 'sitelinkview' ).focus(); - } - ); - - $sitelinklistview.data( 'sitelinklistview' ).enterNewItem(); - - // Re-focus add button after having added or having cancelled adding a link: - var eventName = 'sitelinklistviewafterstopediting.addtoolbar'; - $sitelinklistview.one( eventName, function( event ) { - $sitelinklistview.data( 'addtoolbar' ).focus(); - } ); - } ); - - if( sitelinklistview.isFull() ) { - $sitelinklistview.data( 'addtoolbar' ).disable(); - } - }, - sitelinkgroupviewafterstopediting: function( event, toolbarcontroller ) { - var $sitelinkgroupview = $( event.target ), - sitelinkgroupview = $sitelinkgroupview.data( 'sitelinkgroupview' ), - $sitelinklistview = sitelinkgroupview.$sitelinklistview; - - toolbarcontroller.destroyToolbar( $sitelinklistview.data( 'addtoolbar' ) ); - $sitelinklistview.off( '.addtoolbar' ); - }, - sitelinklistviewafterremove: function( event, toolbarcontroller ) { - var $sitelinkgroupview = $( event.target ), - sitelinkgroupview = $sitelinkgroupview.data( 'sitelinkgroupview' ), - $sitelinklistview = sitelinkgroupview.$sitelinklistview, - sitelinklistview = $sitelinklistview.data( 'sitelinklistview' ); - - $sitelinklistview.data( 'addtoolbar' )[sitelinklistview.isFull() - ? 'disable' - : 'enable' - ](); - }, - sitelinkgroupviewchange: function( event, toolbarcontroller ) { - var $sitelinkgroupview = $( event.target ), - sitelinkgroupview = $sitelinkgroupview.data( 'sitelinkgroupview' ), - $sitelinklistview = sitelinkgroupview.$sitelinklistview, - sitelinklistview = $sitelinklistview.data( 'sitelinklistview' ), - addtoolbar =