Do not scale to max/min settings without min/max settings.

Author: blueimp

load-image.js

@@ -1,5 +1,5 @@
 /*
- * JavaScript Load Image 1.1.1
+ * JavaScript Load Image 1.1.2
  * https://github.com/blueimp/JavaScript-Load-Image
  *
  * Copyright 2011, Sebastian Tschan
@@ -57,14 +57,18 @@
                 (options.minWidth || img.width) / img.width,
                 (options.minHeight || img.height) / img.height
             );
-        img.width = parseInt(img.width * scale, 10);
-        img.height = parseInt(img.height * scale, 10);
+        if (scale > 1) {
+            img.width = parseInt(img.width * scale, 10);
+            img.height = parseInt(img.height * scale, 10);
+        }
         scale = Math.min(
             (options.maxWidth || img.width) / img.width,
             (options.maxHeight || img.height) / img.height
         );
-        img.width = parseInt(img.width * scale, 10);
-        img.height = parseInt(img.height * scale, 10);
+        if (scale < 1) {
+            img.width = parseInt(img.width * scale, 10);
+            img.height = parseInt(img.height * scale, 10);
+        }
         if (!options.canvas || !canvas.getContext) {
             return img;
         }

load-image.min.js

@@ -12,5 +12,5 @@
     },
     "bugs": "https://github.com/blueimp/JavaScript-Load-Image/issues",
     "main": "load-image",
-    "version": "1.1.1"
+    "version": "1.1.2"
 }

package.json

@@ -1,5 +1,5 @@
 /*
- * JavaScript Load Image Test 1.1.1
+ * JavaScript Load Image Test 1.1.2
  * https://github.com/blueimp/JavaScript-Load-Image
  *
  * Copyright 2011, Sebastian Tschan
@@ -120,6 +120,22 @@
         }, {minHeight: 180, maxWidth: 160}));
     });
 
+    $.asyncTest('Do not scale to max settings without min settings', function () {
+        $.ok($.loadImage(blob, function (img) {
+            $.start();
+            $.strictEqual(img.width, 80);
+            $.strictEqual(img.height, 60);
+        }, {maxWidth: 160, maxHeight: 120}));
+    });
+
+    $.asyncTest('Do not scale to min settings without max settings', function () {
+        $.ok($.loadImage(blob, function (img) {
+            $.start();
+            $.strictEqual(img.width, 80);
+            $.strictEqual(img.height, 60);
+        }, {minWidth: 40, minHeight: 30}));
+    });
+
     $.module('Canvas');
 
     $.asyncTest('Return img element to callback if options.canvas is not true', function () {