fixed #298

danialfarid · Sep 14, 2014 · 6ea5480 · 6ea5480
1 parent f92e8ff
commit 6ea5480
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/demo/war/WEB-INF/appengine-web.xml b/demo/war/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-  <application>angular-file-upload</application>
-  <version>1-6-5</version>
+  <application>angular-file-upload-cors-srv</application>
+  <version>1-6-6</version>
 
   <!--
     Allows App Engine to send multiple requests to one instance in parallel:

diff --git a/demo/war/js/angular-file-upload.js b/demo/war/js/angular-file-upload.js
@@ -152,13 +152,13 @@ angularFileUpload.directive('ngFileSelect', [ '$parse', '$timeout', function($pa
 			fileElem.css("top", 0).css("bottom", 0).css("left", 0).css("right", 0).css("width", "100%").
 					css("opacity", 0).css("position", "absolute").css('filter', 'alpha(opacity=0)');
 			elem.append(fileElem);
-//			if (fileElem.parent()[0] != elem[0]) {
-//				//fix #298
-//				elem.wrap('<span>');
-//				elem.css("z-index", "-1000")
-//				elem.parent().append(fileElem);
-//				elem = elem.parent();
-//			}
+			if (fileElem.parent()[0] != elem[0]) {
+				//fix #298
+				elem.wrap('<span>');
+				elem.css("z-index", "-1000")
+				elem.parent().append(fileElem);
+				elem = elem.parent();
+			}
 			if (elem.css("position") === '' || elem.css("position") === 'static') {
 				elem.css("position", "relative");
 			}