BugFix > Don't use CrossOrigin for local images

alexk111 · Nov 20, 2014 · d244d01 · d244d01
1 parent 6f93550
commit d244d01
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-img-crop",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "authors": [
     "Alex Kaul <alexkaul@googlemail.com>"
   ],

diff --git a/compile/minified/ng-img-crop.js b/compile/minified/ng-img-crop.js
diff --git a/compile/unminified/ng-img-crop.js b/compile/unminified/ng-img-crop.js
@@ -1,11 +1,11 @@
 /*!
- * ngImgCrop v0.3.0
+ * ngImgCrop v0.3.1
  * https://github.com/alexk111/ngImgCrop
  *
  * Copyright (c) 2014 Alex Kaul
  * License: MIT
  *
- * Generated at Sunday, November 16th, 2014, 6:44:28 PM
+ * Generated at Thursday, November 20th, 2014, 9:12:38 AM
  */
 (function() {
 'use strict';
@@ -787,7 +787,9 @@ crop.factory('cropHost', ['$document', 'cropAreaCircle', 'cropAreaSquare', funct
       events.trigger('image-updated');
       if(!!imageSource) {
         var newImage = new Image();
-        newImage.crossOrigin = 'anonymous';
+        if(imageSource.substring(0,4).toLowerCase()==='http') {
+          newImage.crossOrigin = 'anonymous';
+        }
         newImage.onload = function(){
           events.trigger('load-done');
           image=newImage;

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   },
   "name": "ng-img-crop",
   "prettyName": "ngImgCrop",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Image crop directive for AngularJS",
   "license": "MIT",
   "homepage": "https://github.com/alexk111/ngImgCrop",

diff --git a/source/js/classes/crop-host.js b/source/js/classes/crop-host.js
@@ -185,7 +185,9 @@ crop.factory('cropHost', ['$document', 'cropAreaCircle', 'cropAreaSquare', funct
       events.trigger('image-updated');
       if(!!imageSource) {
         var newImage = new Image();
-        newImage.crossOrigin = 'anonymous';
+        if(imageSource.substring(0,4).toLowerCase()==='http') {
+          newImage.crossOrigin = 'anonymous';
+        }
         newImage.onload = function(){
           events.trigger('load-done');
           image=newImage;