Added crossOrigin option for CORS enabled images. Fixes blueimp#19.

blueimp · blueimp · commit d1b106c0a1dc · 2013-04-22T16:12:58.000+02:00
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
 .PHONY: js
 
 js:
-	uglifyjs load-image.js -c -o load-image.min.js
+	node_modules/.bin/uglifyjs load-image.js -c -m -o load-image.min.js
diff --git a/load-image.js b/load-image.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Load Image 1.3.2
+ * JavaScript Load Image 1.4
  * https://github.com/blueimp/JavaScript-Load-Image
  *
  * Copyright 2011, Sebastian Tschan
@@ -30,17 +30,24 @@
                 if (oUrl && !(options && options.noRevoke)) {
                     loadImage.revokeObjectURL(oUrl);
                 }
-                callback(loadImage.scale(img, options));
+                if (callback) {
+                    callback(loadImage.scale(img, options));
+                }
             };
-            if ((window.Blob && file instanceof Blob) ||
-                // Files are also Blob instances, but some browsers
-                // (Firefox 3.6) support the File API but not Blobs:
-                    (window.File && file instanceof File)) {
+            if (loadImage.isInstanceOf('Blob', file) ||
+                    // Files are also Blob instances, but some browsers
+                    // (Firefox 3.6) support the File API but not Blobs:
+                    loadImage.isInstanceOf('File', file)) {
                 url = oUrl = loadImage.createObjectURL(file);
                 // Store the file type for resize processing:
                 img._type = file.type;
             } else if (typeof file === 'string') {
                 url = file;
+                if (options && options.crossOrigin) {
+                    img.crossOrigin = options.crossOrigin;
+                }
+            } else {
+                return img;
             }
             if (url) {
                 img.src = url;
@@ -51,7 +58,9 @@
                 if (target && target.result) {
                     img.src = target.result;
                 } else {
-                    callback(e);
+                    if (callback) {
+                        callback(e);
+                    }
                 }
             });
         },
@@ -61,6 +70,11 @@
             (window.URL && URL.revokeObjectURL && URL) ||
             (window.webkitURL && webkitURL);
 
+    loadImage.isInstanceOf = function (type, obj) {
+        // Cross-frame instanceof check
+        return Object.prototype.toString.call(obj) === '[object ' + type + ']';
+    };
+
     // Detects subsampling in JPEG images:
     loadImage.detectSubsampling = function (img) {
         var iw = img.width,
diff --git a/load-image.min.js b/load-image.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "blueimp-load-image",
-    "version": "1.3.2",
+    "version": "1.4.0",
     "title": "JavaScript Load Image",
     "description": "JavaScript Load Image is a function to load images provided as File or Blob objects or via URL. It returns an optionally scaled HTML img or canvas element.",
     "keywords": [
@@ -31,6 +31,9 @@
         "type": "git",
         "url": "git://github.com/blueimp/JavaScript-Load-Image.git"
     },
+    "devDependencies": {
+        "uglify-js": "2.2.5"
+    },
     "bugs": "https://github.com/blueimp/JavaScript-Load-Image/issues",
     "licenses": [
         {
