Refactor last merge and update version number.

Add tests for the noRevoke option.

Author: blueimp

load-image.js

@@ -1,5 +1,5 @@
 /*
- * JavaScript Load Image 1.2
+ * JavaScript Load Image 1.2.1
  * https://github.com/blueimp/JavaScript-Load-Image
  *
  * Copyright 2011, Sebastian Tschan
@@ -24,7 +24,7 @@
                 oUrl;
             img.onerror = callback;
             img.onload = function () {
-                if (oUrl && !(typeof(options)!="undefined" && options.noRevoke)) {
+                if (oUrl && !(options && options.noRevoke)) {
                     loadImage.revokeObjectURL(oUrl);
                 }
                 callback(loadImage.scale(img, options));

load-image.min.js

@@ -1,5 +1,5 @@
 /*
- * JavaScript Load Image Test 1.1.6
+ * JavaScript Load Image Test 1.2
  * https://github.com/blueimp/JavaScript-Load-Image
  *
  * Copyright 2011, Sebastian Tschan
@@ -54,6 +54,26 @@
             })).to.be.ok();
         });
 
+        it('Keep object URL if options.noRevoke is true', function (done) {
+            expect(loadImage(blob, function (img) {
+                loadImage(img.src, function (img2) {
+                    done();
+                    expect(img.width).to.be(img2.width);
+                    expect(img.height).to.be(img2.height);
+                });
+            }, {noRevoke: true})).to.be.ok();
+        });
+
+        it('Discard object URL if options.noRevoke is undefined or false', function (done) {
+            expect(loadImage(blob, function (img) {
+                loadImage(img.src, function (img2) {
+                    done();
+                    expect(img2).to.be.a(window.Event);
+                    expect(img2.type).to.be('error');
+                });
+            })).to.be.ok();
+        });
+
     });
 
     describe('Scaling', function () {