Merge pull request #1300 from thiagofesta/master

Fix IE8 and IE9 with base64 polyfill issue
danialfarid · Jan 25, 2016 · 1bb7fae · 1bb7fae
2 parents 2e14b73 + c8015e9
commit 1bb7fae
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/demo/src/main/webapp/js/ng-file-upload-all.js b/demo/src/main/webapp/js/ng-file-upload-all.js
@@ -2059,7 +2059,7 @@ ngFileUpload.service('UploadResize', ['UploadValidate', '$q', function (UploadVa
 
   upload.isResizeSupported = function () {
     var elem = document.createElement('canvas');
-    return window.atob && elem.getContext && elem.getContext('2d');
+    return window.atob && elem.getContext && elem.getContext('2d') && window.Blob;
   };
 
   if (upload.isResizeSupported()) {

diff --git a/demo/src/main/webapp/js/ng-file-upload-all.min.js b/demo/src/main/webapp/js/ng-file-upload-all.min.js
diff --git a/demo/src/main/webapp/js/ng-file-upload.js b/demo/src/main/webapp/js/ng-file-upload.js
@@ -1637,7 +1637,7 @@ ngFileUpload.service('UploadResize', ['UploadValidate', '$q', function (UploadVa
 
   upload.isResizeSupported = function () {
     var elem = document.createElement('canvas');
-    return window.atob && elem.getContext && elem.getContext('2d');
+    return window.atob && elem.getContext && elem.getContext('2d') && window.Blob;
   };
 
   if (upload.isResizeSupported()) {

diff --git a/demo/src/main/webapp/js/ng-file-upload.min.js b/demo/src/main/webapp/js/ng-file-upload.min.js
diff --git a/dist/ng-file-upload-all.js b/dist/ng-file-upload-all.js
@@ -2059,7 +2059,7 @@ ngFileUpload.service('UploadResize', ['UploadValidate', '$q', function (UploadVa
 
   upload.isResizeSupported = function () {
     var elem = document.createElement('canvas');
-    return window.atob && elem.getContext && elem.getContext('2d');
+    return window.atob && elem.getContext && elem.getContext('2d') && window.Blob;
   };
 
   if (upload.isResizeSupported()) {

diff --git a/dist/ng-file-upload-all.min.js b/dist/ng-file-upload-all.min.js
diff --git a/dist/ng-file-upload.js b/dist/ng-file-upload.js
@@ -1637,7 +1637,7 @@ ngFileUpload.service('UploadResize', ['UploadValidate', '$q', function (UploadVa
 
   upload.isResizeSupported = function () {
     var elem = document.createElement('canvas');
-    return window.atob && elem.getContext && elem.getContext('2d');
+    return window.atob && elem.getContext && elem.getContext('2d') && window.Blob;
   };
 
   if (upload.isResizeSupported()) {

diff --git a/dist/ng-file-upload.min.js b/dist/ng-file-upload.min.js
diff --git a/src/resize.js b/src/resize.js
@@ -82,7 +82,7 @@ ngFileUpload.service('UploadResize', ['UploadValidate', '$q', function (UploadVa
 
   upload.isResizeSupported = function () {
     var elem = document.createElement('canvas');
-    return window.atob && elem.getContext && elem.getContext('2d');
+    return window.atob && elem.getContext && elem.getContext('2d') && window.Blob;
   };
 
   if (upload.isResizeSupported()) {