Skip to content

Commit 439dceb

Browse files
committed
Merge pull request #14 from jutaz/bugfix/ensure-that-file-is-an-object-before-proceeeding
Bugfix - Ensure that file is an object before accessing it
2 parents 029295a + 70205a1 commit 439dceb

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"author": "Louis Sivillo",
33
"name": "angular-file-dnd",
44
"description": "AngularJS directive leveraging HTML5 Drag and Drop and the FileReader API",
5-
"version": "1.0.4",
5+
"version": "1.0.5",
66
"main": "dist/angular-file-dnd.min.js",
77
"dependencies": {
8-
"angular": "~1.2.0"
8+
"angular": "^1.2.0"
99
}
1010
}

dist/angular-file-dnd.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@
7878
}
7979
};
8080
file = getDataTransfer(event).files[0];
81+
if (!angular.isObject(file)) {
82+
return;
83+
}
8184
name = file.name;
8285
type = file.type;
8386
size = file.size;

dist/angular-file-dnd.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.

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-dnd",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"dependencies": {},
55
"devDependencies": {
66
"grunt": "~0.4.1",

src/directive/file_dropzone.coffee

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ angular.module('omr.angularFileDnD', [])
6666
scope.$emit 'file-dropzone-drop-event', {file: scope.file, type: type, name: name, size: size}
6767

6868
file = getDataTransfer(event).files[0]
69+
# Ensure that file will be an object.
70+
return unless angular.isObject(file)
6971
name = file.name
7072
type = file.type
7173
size = file.size

0 commit comments

Comments
 (0)