Refactor last merge with a fix for Opera 12.

blueimp · blueimp · commit 3202fb470d88 · 2012-06-18T15:28:22.000+02:00
Update demo page to fix drag&amp;drop for Opera 12.
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * JavaScript Load Image Demo 1.0
+ * JavaScript Load Image Demo 1.0.1
  * https://github.com/blueimp/JavaScript-Load-Image
  *
  * Copyright 2011, Sebastian Tschan
@@ -95,7 +95,7 @@ <h2>Result</h2>
         .on('dragover', function (e) {
             e = e.originalEvent;
             e.preventDefault();
-            e.dataTransfer.dropEffect = e.dataTransfer.effectAllowed = 'copy';
+            e.dataTransfer.dropEffect = 'copy';
         })
         .on('drop', load);
     $('#file-input').on('change', load);
diff --git a/load-image.js b/load-image.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Load Image 1.1.6
+ * JavaScript Load Image 1.1.7
  * https://github.com/blueimp/JavaScript-Load-Image
  *
  * Copyright 2011, Sebastian Tschan
@@ -37,17 +37,19 @@
             } else {
                 url = file;
             }
-            if (url && !(window.File && url instanceof File)) {
+            if (url) {
                 img.src = url;
                 return img;
-            } else {
-                return loadImage.readFile(file, function (url) {
-                    img.src = url;
-                });
             }
+            return loadImage.readFile(file, function (url) {
+                img.src = url;
+            });
         },
+        // The check for URL.revokeObjectURL fixes an issue with Opera 12,
+        // which provides URL.createObjectURL but doesn't properly implement it:
         urlAPI = (window.createObjectURL && window) ||
-            (window.URL && URL) || (window.webkitURL && webkitURL);
+            (window.URL && URL.revokeObjectURL && URL) ||
+            (window.webkitURL && webkitURL);
 
     // Scales the given image (img or canvas HTML element)
     // using the given options.
@@ -92,7 +94,7 @@
     };
 
     loadImage.revokeObjectURL = function (url) {
-        return urlAPI && typeof urlAPI.revokeObjectURL !== 'undefined' ? urlAPI.revokeObjectURL(url) : false;
+        return urlAPI ? urlAPI.revokeObjectURL(url) : false;
     };
 
     // Loads a given File object via FileReader interface,
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.1.4",
+    "version": "1.1.7",
     "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": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "blueimp-load-image",`
`3`		`- "version": "1.1.4",`
	`3`	`+ "version": "1.1.7",`
`4`	`4`	`"title": "JavaScript Load Image",`
`5`	`5`	`"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.",`
`6`	`6`	`"keywords": [`