Accept a canvas element as parameter for loadImage.scale.

blueimp · blueimp · commit 04515938679d · 2012-04-20T19:09:00.000+02:00
diff --git a/load-image.js b/load-image.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Load Image 1.1.5
+ * JavaScript Load Image 1.1.6
  * https://github.com/blueimp/JavaScript-Load-Image
  *
  * Copyright 2011, Sebastian Tschan
@@ -49,10 +49,11 @@
         urlAPI = (window.createObjectURL && window) ||
             (window.URL && URL) || (window.webkitURL && webkitURL);
 
-    // Scales the given image (img HTML element)
+    // Scales the given image (img or canvas HTML element)
     // using the given options.
-    // Returns a canvas object if the canvas option is true
-    // and the browser supports canvas, else the scaled image:
+    // Returns a canvas object if the browser supports canvas
+    // and the canvas option is true or a canvas object is passed
+    // as image, else the scaled image:
     loadImage.scale = function (img, options) {
         options = options || {};
         var canvas = document.createElement('canvas'),
@@ -74,16 +75,16 @@
             width = parseInt(width * scale, 10);
             height = parseInt(height * scale, 10);
         }
-        if (!options.canvas || !canvas.getContext) {
-            img.width = width;
-            img.height = height;
-            return img;
+        if (img.getContext || (options.canvas && canvas.getContext)) {
+            canvas.width = width;
+            canvas.height = height;
+            canvas.getContext('2d')
+                .drawImage(img, 0, 0, width, height);
+            return canvas;
         }
-        canvas.width = width;
-        canvas.height = height;
-        canvas.getContext('2d')
-            .drawImage(img, 0, 0, width, height);
-        return canvas;
+        img.width = width;
+        img.height = height;
+        return img;
     };
 
     loadImage.createObjectURL = function (file) {
diff --git a/load-image.min.js b/load-image.min.js
diff --git a/test/test.js b/test/test.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Load Image Test 1.1.3
+ * JavaScript Load Image Test 1.1.6
  * https://github.com/blueimp/JavaScript-Load-Image
  *
  * Copyright 2011, Sebastian Tschan
@@ -19,7 +19,7 @@
             'OctNqLs968+w+G4kiW5omm6sq27gvH8kzX9o3n+s73/g8MCofE' +
             'ovGITCqXzKbzCY1Kp9Sq9YrNarfcrvcLDovH5PKsAAA7',
 	    imageUrl = 'data:image/gif;base64,' + b64Data,
-    	blob = window.canvasToBlob.dataURItoBlob(imageUrl);
+        blob = window.canvasToBlob.dataURItoBlob(imageUrl);
 
     describe('Loading', function () {
 
@@ -168,6 +168,19 @@
             }, {canvas: true, maxWidth: 40})).to.be.ok();
         });
 
+        it('Accept a canvas element as parameter for loadImage.scale', function (done) {
+            expect(loadImage(blob, function (img) {
+                done();
+                img = loadImage.scale(img, {
+                    maxWidth: 40
+                });
+                expect(img.getContext).to.be.ok();
+                expect(img.nodeName.toLowerCase()).to.be('canvas');
+                expect(img.width).to.be(40);
+                expect(img.height).to.be(30);
+            }, {canvas: true})).to.be.ok();
+        });
+
     });
 
 }(
