fixed #284

danialfarid · Jul 29, 2014 · c3278b3 · c3278b3
1 parent 8cf9b7a
commit c3278b3
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 30 deletions.
diff --git a/demo/war/index.html b/demo/war/index.html
@@ -4,9 +4,10 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <link type="text/css" rel="stylesheet" href="common.css">
 <title>Angular file upload sample</title>
+<script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
 <script type="text/javascript">
 FileAPI = {
-	debug: true,
+	//debug: true,
 	//forceLoad: true, html5: false //to debug flash in HTML5 browsers
 	//wrapInsideDiv: true, //experimental for fixing css issues
 	//only one of jsPath or jsUrl.

diff --git a/demo/war/js/angular-file-upload-shim.js b/demo/war/js/angular-file-upload-shim.js
@@ -194,15 +194,7 @@ if (!window.FormData || (window.FileAPI && FileAPI.forceLoad)) {
 			(evt.__files_ || evt.target.files).item = function(i) {
 				return (evt.__files_ || evt.target.files)[i] || null;
 			}
-			if (fn) {
-				fn.apply(this, [evt]);
-			} else {
-				// fix for #281 jQuery on IE8
-				var handlers = jQuery._data(this, "events").change;
-				for (var i = 1; i < handlers.length; i++) {
-					handlers[i].handler.apply(this, [evt]);
-				}
-			}
+			if (fn) fn.apply(this, [evt]);
 		};
 	};
 	var isFileChange = function(elem, e) {
@@ -225,7 +217,7 @@ if (!window.FormData || (window.FileAPI && FileAPI.forceLoad)) {
 			return function(e, fn) {
 				if (isFileChange(this, e)) {
 					addFlash(this);
-					if (jQuery) {
+					if (window.jQuery) {
 						// fix for #281 jQuery on IE8
 						angular.element(this).bind("change", changeFnWrapper(null));
 					} else {

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.6.3
+ * @version 1.6.4
  */
 if (window.XMLHttpRequest) {
 	if (window.FormData) {

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.6.3
+ * @version 1.6.4
  */
 (function() {
 
@@ -194,15 +194,7 @@ if (!window.FormData || (window.FileAPI && FileAPI.forceLoad)) {
 			(evt.__files_ || evt.target.files).item = function(i) {
 				return (evt.__files_ || evt.target.files)[i] || null;
 			}
-			if (fn) {
-				fn.apply(this, [evt]);
-			} else {
-				// fix for #281 jQuery on IE8
-				var handlers = jQuery._data(this, "events").change;
-				for (var i = 1; i < handlers.length; i++) {
-					handlers[i].handler.apply(this, [evt]);
-				}
-			}
+			if (fn) fn.apply(this, [evt]);
 		};
 	};
 	var isFileChange = function(elem, e) {
@@ -225,7 +217,7 @@ if (!window.FormData || (window.FileAPI && FileAPI.forceLoad)) {
 			return function(e, fn) {
 				if (isFileChange(this, e)) {
 					addFlash(this);
-					if (jQuery) {
+					if (window.jQuery) {
 						// fix for #281 jQuery on IE8
 						angular.element(this).bind("change", changeFnWrapper(null));
 					} else {

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.6.3
+ * @version 1.6.4
  */
 (function() {