Use existing maxWidth/maxHeight options if present in aspectRatio calculations rather than overriding them

claygriffiths · claygriffiths · commit bf76dd77022d · 2021-05-04T09:44:23.000-05:00
diff --git a/js/load-image-scale.js b/js/load-image-scale.js
@@ -72,8 +72,8 @@
       }
     }
     newOptions.crop = true
-    width = img.naturalWidth || img.width
-    height = img.naturalHeight || img.height
+    width = options.maxWidth || img.naturalWidth || img.width
+    height = options.maxHeight || img.naturalHeight || img.height
     if (width / height > aspectRatio) {
       newOptions.maxWidth = height * aspectRatio
       newOptions.maxHeight = height

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,8 @@`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`newOptions.crop = true`
`75`		`- width = img.naturalWidth \|\| img.width`
`76`		`- height = img.naturalHeight \|\| img.height`
	`75`	`+ width = options.maxWidth \|\| img.naturalWidth \|\| img.width`
	`76`	`+ height = options.maxHeight \|\| img.naturalHeight \|\| img.height`
`77`	`77`	`if (width / height > aspectRatio) {`
`78`	`78`	`newOptions.maxWidth = height * aspectRatio`
`79`	`79`	`newOptions.maxHeight = height`