progress fix for angular 1.0.7

litix · Dec 31, 2013 · 641f6a8 · 641f6a8
1 parent 1da122f
commit 641f6a8
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 17 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "angularjs-file-upload",
   "main": "angular-file-upload.min.js",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "homepage": "https://github.com/danialfarid/angular-file-upload",
   "authors": [
     "Danial Farid <danial.farid@gmail.com>"

diff --git a/demo/war/js/angular-file-upload-html5-shim.js b/demo/war/js/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) {

diff --git a/demo/war/js/angular-file-upload-shim.js b/demo/war/js/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() {
 

diff --git a/demo/war/js/angular-file-upload.js b/demo/war/js/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/dist/angular-file-upload-html5-shim.js b/dist/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/dist/angular-file-upload-html5-shim.min.js b/dist/angular-file-upload-html5-shim.min.js
diff --git a/dist/angular-file-upload-shim.js b/dist/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/dist/angular-file-upload-shim.min.js b/dist/angular-file-upload-shim.min.js
diff --git a/dist/angular-file-upload.js b/dist/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/dist/angular-file-upload.min.js b/dist/angular-file-upload.min.js
diff --git a/nuget/Package.nuspec b/nuget/Package.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>angular-file-upload</id>
     <title>Angular file upload</title>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <authors>Danial Farid, Georgios Diamantopoulos (nuget package)</authors>
     <owners>Danial Farid</owners>
     <licenseUrl>https://github.com/danialfarid/angular-file-upload/blob/master/LICENSE</licenseUrl>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-file-upload",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-contrib-uglify": "~0.2.7",