fixed 285

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-2</version>
+  <version>1-6-4</version>
 
   <!--
     Allows App Engine to send multiple requests to one instance in parallel:

demo/war/index.html

@@ -4,10 +4,9 @@
 <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.
@@ -101,6 +100,6 @@ <h3>
 			</ul>
 		</div>
 	</div>
-	<div style="position:fixed;bottom:10px;right:10px;font-size:smaller;color:#777">Last update: 2014-07-27</div>
+	<div style="position:fixed;bottom:10px;right:10px;font-size:smaller;color:#777">Last update: 2014-07-29</div>
 </body>
 </html>

demo/war/js/angular-file-upload.js

@@ -251,15 +251,14 @@ angularFileUpload.directive('ngFileDrop', [ '$parse', '$timeout', '$location', f
 
 			function extractFiles(evt, callback) {
 				var files = [], items = evt.dataTransfer.items;
-				if (items && items.length > 0 && items[0].webkitGetAsEntry && $location.protocol() != 'file' && 
-						items[0].webkitGetAsEntry().isDirectory) {
+				if (items && items.length > 0 && items[0].webkitGetAsEntry && $location.protocol() != 'file') {
 					for (var i = 0; i < items.length; i++) {
 						var entry = items[i].webkitGetAsEntry();
 						if (entry != null) {
 							//fix for chrome bug https://code.google.com/p/chromium/issues/detail?id=149735
 							if (isASCII(entry.name)) {
 								traverseFileTree(files, entry);
-							} else {
+							} else if (!items[i].webkitGetAsEntry().isDirectory) {
 								files.push(items[i].getAsFile());
 							}
 						}
@@ -284,21 +283,22 @@ angularFileUpload.directive('ngFileDrop', [ '$parse', '$timeout', '$location', f
 			}
 
 			var processing = 0;
-			function traverseFileTree(files, entry) {
+			function traverseFileTree(files, entry, path) {
 				if (entry != null) {
 					if (entry.isDirectory) {
 						var dirReader = entry.createReader();
 						processing++;
 						dirReader.readEntries(function(entries) {
 							for (var i = 0; i < entries.length; i++) {
-								traverseFileTree(files, entries[i]);
+								traverseFileTree(files, entries[i], (path ? path : "") + entry.name + "/");
 							}
 							processing--;
 						});
 					} else {
 						processing++;
 						entry.file(function(file) {
 							processing--;
+							file._relativePath = (path ? path : "") + file.name;
 							files.push(file);
 						});
 					}

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

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

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.4
+ * @version 1.6.5
  */
 (function() {
 
@@ -251,15 +251,14 @@ angularFileUpload.directive('ngFileDrop', [ '$parse', '$timeout', '$location', f
 
 			function extractFiles(evt, callback) {
 				var files = [], items = evt.dataTransfer.items;
-				if (items && items.length > 0 && items[0].webkitGetAsEntry && $location.protocol() != 'file' && 
-						items[0].webkitGetAsEntry().isDirectory) {
+				if (items && items.length > 0 && items[0].webkitGetAsEntry && $location.protocol() != 'file') {
 					for (var i = 0; i < items.length; i++) {
 						var entry = items[i].webkitGetAsEntry();
 						if (entry != null) {
 							//fix for chrome bug https://code.google.com/p/chromium/issues/detail?id=149735
 							if (isASCII(entry.name)) {
 								traverseFileTree(files, entry);
-							} else {
+							} else if (!items[i].webkitGetAsEntry().isDirectory) {
 								files.push(items[i].getAsFile());
 							}
 						}
@@ -284,21 +283,22 @@ angularFileUpload.directive('ngFileDrop', [ '$parse', '$timeout', '$location', f
 			}
 
 			var processing = 0;
-			function traverseFileTree(files, entry) {
+			function traverseFileTree(files, entry, path) {
 				if (entry != null) {
 					if (entry.isDirectory) {
 						var dirReader = entry.createReader();
 						processing++;
 						dirReader.readEntries(function(entries) {
 							for (var i = 0; i < entries.length; i++) {
-								traverseFileTree(files, entries[i]);
+								traverseFileTree(files, entries[i], (path ? path : "") + entry.name + "/");
 							}
 							processing--;
 						});
 					} else {
 						processing++;
 						entry.file(function(file) {
 							processing--;
+							file._relativePath = (path ? path : "") + file.name;
 							files.push(file);
 						});
 					}