Skip to content

Commit

Permalink
Merge branch 'ediri-patch-1' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
valorkin committed Jan 17, 2017
2 parents 34c0d35 + 3544868 commit a997198
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ webpack.config.js

# AoT generated files
factories
/**/*.ngfactory.ts
/**/*.ngfactory.ts
6 changes: 4 additions & 2 deletions components/file-upload/file-drop.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ export class FileDropDirective {

@HostListener('dragleave', ['$event'])
public onDragLeave(event:any):any {
if (event.currentTarget === (this as any).element[0]) {
return;
if ((this as any).element) {
if (event.currentTarget === (this as any).element[0]) {
return;
}
}

this._preventAndStop(event);
Expand Down

0 comments on commit a997198

Please sign in to comment.