Merge branch 'development' of github.com:valor-software/ng2-file-upload into development

This commit is contained in:
Dmitriy Shekhovtsov
2017-01-17 15:58:36 +02:00
5 changed files with 41 additions and 32 deletions

View File

@@ -8,7 +8,7 @@ export class FileDropDirective {
@Output() public fileOver:EventEmitter<any> = new EventEmitter();
@Output() public onFileDrop:EventEmitter<File[]> = new EventEmitter<File[]>();
private element:ElementRef;
protected element:ElementRef;
public constructor(element:ElementRef) {
this.element = element;
@@ -61,16 +61,16 @@ export class FileDropDirective {
this.fileOver.emit(false);
}
private _getTransfer(event:any):any {
protected _getTransfer(event:any):any {
return event.dataTransfer ? event.dataTransfer : event.originalEvent.dataTransfer; // jQuery fix;
}
private _preventAndStop(event:any):any {
protected _preventAndStop(event:any):any {
event.preventDefault();
event.stopPropagation();
}
private _haveFiles(types:any):any {
protected _haveFiles(types:any):any {
if (!types) {
return false;
}