jenkins-bot has submitted this change and it was merged.
Change subject: Optimized sitelinkgroupview toolbar definitions
......................................................................
Optimized sitelinkgroupview toolbar definitions
Change-Id: Id801fd03f1fbb9b6b46cb4734e58c873f465a5a8
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
1 file changed, 2 insertions(+), 26 deletions(-)
Approvals:
Thiemo Mättig (WMDE): 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 705c6a8..c53a0ed 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
@@ -366,7 +366,7 @@
interactionWidget: sitelinkgroupview
} );
- $sitelinkgroupview.on( 'keyup.edittoolbar', function(
event ) {
+ $sitelinkgroupview.on( 'keydown.edittoolbar', function(
event ) {
if( sitelinkgroupview.option( 'disabled' ) ) {
return;
}
@@ -504,30 +504,8 @@
selector: ':' + $.wikibase.sitelinkgroupview.prototype.namespace
+ '-' + $.wikibase.sitelinkgroupview.prototype.widgetName,
events: {
- sitelinkgroupviewafterstartediting: function( event,
toolbarcontroller ) {
+ 'sitelinkgroupviewafterstartediting sitelinkgroupviewchange':
function( event ) {
var $sitelinkgroupview = $( event.target ),
- sitelinkgroupview = $sitelinkgroupview.data(
'sitelinkgroupview' ),
- $sitelinklistview =
sitelinkgroupview.$sitelinklistview,
- sitelinklistview = $sitelinklistview.data(
'sitelinklistview' ),
- sitelinklistviewListview =
sitelinklistview.$listview.data( 'listview' );
-
- sitelinklistviewListview.items().each( function() {
- var $sitelinkview = $( this );
-
- $sitelinkview
- .removetoolbar( {
- $container: $( '<div/>' ).appendTo(
$sitelinkview.children( 'td' ).last() )
- } )
- .on( 'removetoolbarremove.removetoolbar',
function( event ) {
- if( event.target !== $sitelinkview.get(
0 ) ) {
- return;
- }
- sitelinklistview.$listview.data(
'listview' ).removeItem( $sitelinkview );
- } );
- } );
- },
- sitelinkgroupviewchange: function( event, toolbarcontroller ) {
- var $sitelinkgroupview = $( event.target ).closest(
':wikibase-sitelinkgroupview' ),
sitelinkgroupview = $sitelinkgroupview.data(
'sitelinkgroupview' ),
$sitelinklistview =
sitelinkgroupview.$sitelinklistview,
sitelinklistview = $sitelinklistview.data(
'sitelinklistview' ),
@@ -544,8 +522,6 @@
return;
}
- // TODO: Resolve toolbar initialization
appearing twice within the toolbar
- // definition
$sitelinkview
.removetoolbar( {
$container: $( '<div/>' ).appendTo(
$sitelinkview.children( 'td' ).last() )
--
To view, visit https://gerrit.wikimedia.org/r/168076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id801fd03f1fbb9b6b46cb4734e58c873f465a5a8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
