jenkins-bot has submitted this change and it was merged.
Change subject: Optimized copyright tooltip logic
......................................................................
Optimized copyright tooltip logic
Change-Id: I6e4d6481b3f91fd45e06f44868bc95b7e6f763be
---
M repo/resources/wikibase.ui.entityViewInit.js
1 file changed, 5 insertions(+), 19 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index c5354c9..19b82d4 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -60,26 +60,12 @@
return;
}
- var $message = $( '<span><p>' +
copyRightMessageHtml + '</p></span>' );
- var $activeToolbar = $( '.wb-edit' )
- // label/description of EditableValue
always in edit mode if empty, 2nd '.wb-edit'
- // on PropertyEditTool only appended
when really being edited by the user though
- .not(
'.wb-ui-propertyedittool-editablevalue-ineditmode' )
- .find(
'.wikibase-toolbareditgroup-ineditmode' );
+ var $message = $( '<span><p>' +
copyRightMessageHtml + '</p></span>' ),
+ edittoolbar = $( origin ).data(
'edittoolbar' );
- if( !$activeToolbar.length ) {
- return; // no toolbar for some reason,
just stop
- } else if ( $( 'table.wb-terms' ).hasClass(
'wb-edit' ) ) {
- // TODO: When having multiple empty
EditableValues which are initialized in edit
- // mode, every EditableValue has the
same classes assigned. This check should
- // either be made more generic (not
just invoked for the terms table) or an
- // improved detection of the active
toolbar be implemented.
- $activeToolbar = origin.getSubject()
- .find(
'.wikibase-toolbareditgroup-ineditmode' );
+ if( !edittoolbar ) {
+ return;
}
-
- var toolbar = $activeToolbar.data(
'toolbareditgroup' )
- || $activeToolbar.data( 'toolbar' );
var $hideMessage = $( '<a/>', {
text: mw.msg(
'wikibase-copyrighttooltip-acknowledge' )
@@ -98,7 +84,7 @@
content: $message,
permanent: true,
gravity: gravity,
- $anchor: toolbar.getButton(
'save' )
+ $anchor:
edittoolbar.toolbar.editGroup.getButton( 'save' )
} );
$hideMessage.on( 'click', function( event ) {
--
To view, visit https://gerrit.wikimedia.org/r/154419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e4d6481b3f91fd45e06f44868bc95b7e6f763be
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
