Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 64 additions & 60 deletions dist/angular-file-upload.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/angular-file-upload.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/angular-file-upload.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/angular-file-upload.min.js.map

Large diffs are not rendered by default.

29 changes: 21 additions & 8 deletions src/services/FileDrop.js
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ let {


export default function __identity(FileDirective) {


return class FileDrop extends FileDirective {
/**
* Creates instance of {FileDrop} object
@@ -26,13 +26,16 @@ export default function __identity(FileDirective) {
$destroy: 'destroy',
drop: 'onDrop',
dragover: 'onDragOver',
dragleave: 'onDragLeave'
dragleave: 'onDragLeave',
dragenter: 'onDragEnter'
},
// Name of property inside uploader._directive object
prop: 'drop'
});

super(extendedOptions);

this.dragCount = 0;
}
/**
* Returns options
@@ -52,12 +55,16 @@ export default function __identity(FileDirective) {
onDrop(event) {
var transfer = this._getTransfer(event);
if(!transfer) return;
this.dragCount = 0;
var options = this.getOptions();
var filters = this.getFilters();
this._preventAndStop(event);
forEach(this.uploader._directives.over, this._removeOverClass, this);
this.uploader.addToQueue(transfer.files, options, filters);
}
onDragEnter() {
this.dragCount++;
}
/**
* Event handler
*/
@@ -72,9 +79,15 @@ export default function __identity(FileDirective) {
* Event handler
*/
onDragLeave(event) {
if(event.currentTarget === this.element[0]) return;
this._preventAndStop(event);
forEach(this.uploader._directives.over, this._removeOverClass, this);
this.dragCount--;
if (event.currentTarget !== this.element[0]) return;
var that = this;
clearTimeout(that.onDragLeaveTimer);
that.onDragLeaveTimer = setTimeout(function(){
if (that.dragCount > 0) return;
that._preventAndStop(event);
forEach(that.uploader._directives.over, that._removeOverClass, that);
}, 0);
}
/**
* Helper
@@ -121,4 +134,4 @@ export default function __identity(FileDirective) {

__identity.$inject = [
'FileDirective'
];
];