jenkins-bot has submitted this change and it was merged.
Change subject: mw.ForeignStructuredUpload.BookletLayout: Make licensing links
clickable again
......................................................................
mw.ForeignStructuredUpload.BookletLayout: Make licensing links clickable again
Plus some code duplication cleanup.
Bug: T136008
Change-Id: Ic3fbb4edd5042b81488cb19b149bec0a94948ce5
---
M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
1 file changed, 20 insertions(+), 9 deletions(-)
Approvals:
Prtksxna: Looks good to me, but someone else must approve
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
index 16fec73..0f61d97 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
@@ -83,15 +83,26 @@
// Update license messages
return msgPromise.then(
function () {
- booklet.$ownWorkMessage
- .msg(
'upload-form-label-own-work-message-' + msgs )
- .find( 'a'
).attr( 'target', '_blank' );
-
booklet.$notOwnWorkMessage
- .msg(
'upload-form-label-not-own-work-message-' + msgs )
- .find( 'a'
).attr( 'target', '_blank' );
- booklet.$notOwnWorkLocal
- .msg(
'upload-form-label-not-own-work-local-' + msgs )
- .find( 'a'
).attr( 'target', '_blank' );
+ var $labels;
+
booklet.$ownWorkMessage.msg( 'upload-form-label-own-work-message-' + msgs );
+
booklet.$notOwnWorkMessage.msg( 'upload-form-label-not-own-work-message-' +
msgs );
+
booklet.$notOwnWorkLocal.msg( 'upload-form-label-not-own-work-local-' + msgs );
+
+ $labels = $( [
+
booklet.$ownWorkMessage[ 0 ],
+
booklet.$notOwnWorkMessage[ 0 ],
+
booklet.$notOwnWorkLocal[ 0 ]
+ ] );
+
+ // Improve the behavior
of links inside these labels, which may point to important
+ // things like
licensing requirements or terms of use
+ $labels.find( 'a' )
+ .attr(
'target', '_blank' )
+ .on( 'click',
function ( e ) {
+ //
OO.ui.FieldLayout#onLabelClick is trying to prevent default on all clicks,
+ //
which causes the links to not be openable. Don't let it do that.
+
e.stopPropagation();
+ } );
} );
} )
);
--
To view, visit https://gerrit.wikimedia.org/r/290273
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3fbb4edd5042b81488cb19b149bec0a94948ce5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Edokter <er...@darcoury.nl>
Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: Prtksxna <psax...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
