jenkins-bot has submitted this change and it was merged.

Change subject: Fix image bucketing resize engine
......................................................................


Fix image bucketing resize engine

targetWidth was switched to even if the image was way smaller than it,
fixed by only changing to it if the image is too big (too-small images
should never be stretched anyway).

Change-Id: I9e3e6a358e53dbed988b730205a8afec1dbf3483
---
M resources/ext.multimediaViewer/ext.multimediaViewer.js
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Aarcos: Looks good to me, but someone else must approve
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.js 
b/resources/ext.multimediaViewer/ext.multimediaViewer.js
index 6e5c145..02c8750 100755
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.js
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.js
@@ -345,7 +345,9 @@
                        innerInfo = imageInfo.imageinfo[0];
 
                        image.onload = function () {
-                               image.width = targetWidth;
+                               if ( image.width > targetWidth ) {
+                                       image.width = targetWidth;
+                               }
                                viewer.profileEnd( rpid );
                                ui.replaceImageWith( image );
                                this.updateControls();
@@ -692,7 +694,10 @@
                        viewer.profileEnd( mdpid );
 
                        imageEle.onload = function () {
-                               imageEle.width = targetWidth;
+                               if ( imageEle.width > targetWidth ) {
+                                       imageEle.width = targetWidth;
+                               }
+
                                viewer.profileEnd( pid );
 
                                viewer.lightbox.iface.replaceImageWith( 
imageEle );

-- 
To view, visit https://gerrit.wikimedia.org/r/105733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e3e6a358e53dbed988b730205a8afec1dbf3483
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <[email protected]>
Gerrit-Reviewer: Aarcos <[email protected]>
Gerrit-Reviewer: GergÅ‘ Tisza <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to