Skip to content

Commit 36541a0

Browse files
committed
fixed drop for IE, FF
1 parent a08b2a5 commit 36541a0

10 files changed

+28
-18
lines changed

demo/war/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,6 @@ <h3>
7878
</ul>
7979
</div>
8080
</div>
81-
<div style="position:absolute;bottom:10px;right:10px;font-size:smaller;color:#777">Last update: 2014-03-24</div>
81+
<div style="position:absolute;bottom:10px;right:10px;font-size:smaller;color:#777">Last update: 2014-03-27</div>
8282
</body>
8383
</html>

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,16 @@ angularFileUpload.directive('ngFileDrop', [ '$parse', '$timeout', function($pars
208208
evt.preventDefault();
209209
elem.removeClass(attr['ngFileDragOverClass'] || "dragover");
210210
var files = [], items = evt.dataTransfer.items;
211-
for (var i = 0; i < items.length; i++) {
212-
if (items[i].webkitGetAsEntry) {
211+
if (items && items.length > 0 && items[0].webkitGetAsEntry) {
212+
for (var i = 0; i < items.length; i++) {
213213
traverseFileTree(files, items[i].webkitGetAsEntry());
214-
} else {
215-
files.push(items[i]);
214+
}
215+
} else {
216+
var fileList = evt.dataTransfer.files;
217+
if (fileList != null) {
218+
for (var i = 0; i < fileList.length; i++) {
219+
files.push(fileList.item(i));
220+
}
216221
}
217222
}
218223
(function callback(delay) {

dist/angular-file-upload-html5-shim.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**!
22
* AngularJS file upload shim for angular XHR HTML5 browsers
33
* @author Danial <danial.farid@gmail.com>
4-
* @version 1.3.0
4+
* @version 1.3.1
55
*/
66
if (window.XMLHttpRequest) {
77
if (window.FormData) {

dist/angular-file-upload-html5-shim.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-file-upload-shim.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**!
22
* AngularJS file upload shim for HTML5 FormData
33
* @author Danial <danial.farid@gmail.com>
4-
* @version 1.3.0
4+
* @version 1.3.1
55
*/
66
(function() {
77

dist/angular-file-upload-shim.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-file-upload.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**!
22
* AngularJS file upload/drop directive with http post and progress
33
* @author Danial <danial.farid@gmail.com>
4-
* @version 1.3.0
4+
* @version 1.3.1
55
*/
66
(function() {
77

@@ -208,11 +208,16 @@ angularFileUpload.directive('ngFileDrop', [ '$parse', '$timeout', function($pars
208208
evt.preventDefault();
209209
elem.removeClass(attr['ngFileDragOverClass'] || "dragover");
210210
var files = [], items = evt.dataTransfer.items;
211-
for (var i = 0; i < items.length; i++) {
212-
if (items[i].webkitGetAsEntry) {
211+
if (items && items.length > 0 && items[0].webkitGetAsEntry) {
212+
for (var i = 0; i < items.length; i++) {
213213
traverseFileTree(files, items[i].webkitGetAsEntry());
214-
} else {
215-
files.push(items[i]);
214+
}
215+
} else {
216+
var fileList = evt.dataTransfer.files;
217+
if (fileList != null) {
218+
for (var i = 0; i < fileList.length; i++) {
219+
files.push(fileList.item(i));
220+
}
216221
}
217222
}
218223
(function callback(delay) {

dist/angular-file-upload.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nuget/Package.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>angular-file-upload</id>
55
<title>Angular file upload</title>
6-
<version>1.3.0</version>
6+
<version>1.3.1</version>
77
<authors>Danial Farid, Georgios Diamantopoulos (nuget package)</authors>
88
<owners>Danial Farid</owners>
99
<licenseUrl>https://github.com/danialfarid/angular-file-upload/blob/master/LICENSE</licenseUrl>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-file-upload",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"devDependencies": {
55
"grunt": "~0.4.1",
66
"grunt-contrib-uglify": "~0.2.7",

0 commit comments

Comments
 (0)