Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134830
Change subject: Don't stretch the image in the media viewer
......................................................................
Don't stretch the image in the media viewer
Bug: 63553
Change-Id: I06339b5559e6c8aef446de51edb82e5647369d72
---
M javascripts/modules/mediaViewer/ImageOverlay.js
1 file changed, 16 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/30/134830/1
diff --git a/javascripts/modules/mediaViewer/ImageOverlay.js
b/javascripts/modules/mediaViewer/ImageOverlay.js
index 1d9a042..b743fb6 100644
--- a/javascripts/modules/mediaViewer/ImageOverlay.js
+++ b/javascripts/modules/mediaViewer/ImageOverlay.js
@@ -31,6 +31,8 @@
self.$( '.container' ).removeClass(
'loading' );
}
+ self.thumbWidth = data.thumbwidth;
+ self.thumbHeight = data.thumbheight;
self.imgRatio = data.thumbwidth /
data.thumbheight;
$img = $( '<img>' ).attr( 'src', data.thumburl
).attr( 'alt', options.caption );
self.$( '.container div' ).append( $img );
@@ -61,20 +63,25 @@
_positionImage: function() {
var windowWidth = $( window ).width(),
windowHeight = $( window ).height(),
- windowRatio = windowWidth / windowHeight;
+ windowRatio = windowWidth / windowHeight,
+ $img = this.$( 'img' );
// display: table (which we use for vertical centering)
makes the overlay
// expand so simply setting width/height to 100%
doesn't work
if ( this.imgRatio > windowRatio ) {
- this.$( 'img' ).css( {
- width: windowWidth,
- height: 'auto'
- } );
+ if ( windowWidth < this.thumbWidth ) {
+ $img.css( {
+ width: windowWidth,
+ height: 'auto'
+ } );
+ }
} else {
- this.$( 'img' ).css( {
- width: 'auto',
- height: windowHeight
- } );
+ if ( windowHeight < this.thumbHeight ) {
+ $img.css( {
+ width: 'auto',
+ height: windowHeight
+ } );
+ }
}
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/134830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I06339b5559e6c8aef446de51edb82e5647369d72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
