jenkins-bot has submitted this change and it was merged.
Change subject: Adding attribution information to mobile media viewer
......................................................................
Adding attribution information to mobile media viewer
Bug: 69656
Change-Id: I49701d5f99311f30af128e7c82a9eba77290690f
---
M javascripts/modules/mediaViewer/ImageOverlay.js
1 file changed, 13 insertions(+), 2 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/mediaViewer/ImageOverlay.js
b/javascripts/modules/mediaViewer/ImageOverlay.js
index 43362f1..f66b5ba 100644
--- a/javascripts/modules/mediaViewer/ImageOverlay.js
+++ b/javascripts/modules/mediaViewer/ImageOverlay.js
@@ -25,6 +25,8 @@
this._super( options );
api.getThumb( options.title ).done( function( data ) {
+ var author;
+
function removeLoader() {
self.$( '.image-wrapper' ).removeClass(
'loading' );
}
@@ -45,8 +47,17 @@
}
self._positionImage();
self.$( '.details a' ).attr( 'href',
data.descriptionurl );
- if ( data.extmetadata &&
data.extmetadata.LicenseShortName ) {
- self.$( '.license a' ).text(
data.extmetadata.LicenseShortName.value );
+ if ( data.extmetadata ) {
+ // Add license information
+ if ( data.extmetadata.LicenseShortName
) {
+ self.$( '.license a' ).text(
data.extmetadata.LicenseShortName.value );
+ }
+ // Add author information
+ if ( data.extmetadata.Artist ) {
+ // Strip any tags
+ author =
data.extmetadata.Artist.value.replace( /<.*?>/g, '' );
+ self.$( '.license' ).prepend(
author + ' • ' );
+ }
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/155792
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49701d5f99311f30af128e7c82a9eba77290690f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
