1.2.1

danialfarid · Dec 31, 2013 · d5a6ad6 · d5a6ad6
1 parent 7e41c3d
commit d5a6ad6
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 11 deletions.
diff --git a/angular-file-upload-html5-shim.js b/angular-file-upload-html5-shim.js
@@ -1,7 +1,7 @@
 /**!
  * AngularJS file upload shim for angular XHR HTML5 browsers
  * @author  Danial  <danial.farid@gmail.com>
- * @version 1.2.0
+ * @version 1.2.1
  */
 if (window.XMLHttpRequest) {
 	if (window.FormData) {
@@ -12,7 +12,11 @@ if (window.XMLHttpRequest) {
 				xhr.setRequestHeader = (function(orig) {
 					return function(header, value) {
 						if (header === '__setXHR_') {
-							value(xhr);
+							var val = value(xhr);
+							// fix for angular < 1.2.0
+							if (val instanceof Function) {
+								val(xhr);
+							}
 						} else {
 							orig.apply(xhr, arguments);
 						}

diff --git a/angular-file-upload-html5-shim.min.js b/angular-file-upload-html5-shim.min.js
diff --git a/angular-file-upload-shim.js b/angular-file-upload-shim.js
@@ -1,7 +1,7 @@
 /**!
  * AngularJS file upload shim for HTML5 FormData
  * @author  Danial  <danial.farid@gmail.com>
- * @version 1.2.0
+ * @version 1.2.1
  */
 (function() {
 
@@ -14,7 +14,11 @@ if (window.XMLHttpRequest) {
 				xhr.setRequestHeader = (function(orig) {
 					return function(header, value) {
 						if (header === '__setXHR_') {
-							value(xhr);
+							var val = value(xhr);
+							// fix for angular < 1.2.0
+							if (val instanceof Function) {
+								val(xhr);
+							}
 						} else {
 							orig.apply(xhr, arguments);
 						}
@@ -63,7 +67,11 @@ if (window.XMLHttpRequest) {
 				xhr.setRequestHeader = (function(orig) {
 					return function(header, value) {
 						if (header === '__setXHR_') {
-							value(xhr);
+							var val = value(xhr);
+							// fix for angular < 1.2.0
+							if (val instanceof Function) {
+								val(xhr);
+							}
 						} else {
 							orig.apply(xhr, arguments);
 						}

diff --git a/angular-file-upload-shim.min.js b/angular-file-upload-shim.min.js
diff --git a/angular-file-upload.js b/angular-file-upload.js
@@ -1,7 +1,7 @@
 /**!
  * AngularJS file upload/drop directive with http post and progress
  * @author  Danial  <danial.farid@gmail.com>
- * @version 1.2.0
+ * @version 1.2.1
  */
 (function() {
 

diff --git a/angular-file-upload.min.js b/angular-file-upload.min.js