Merge branch 'patch-1' of git://github.com/ediri/ng2-file-upload into…

… ediri-patch-1 Conflicts: .npmignore
CutieDaisy · Jan 17, 2017 · 3544868 · 3544868
2 parents 34c0d35 + 63bf587
commit 3544868
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.npmignore b/.npmignore
@@ -24,4 +24,4 @@ webpack.config.js
 
 # AoT generated files
 factories
-/**/*.ngfactory.ts
+/**/*.ngfactory.ts
diff --git a/components/file-upload/file-drop.directive.ts b/components/file-upload/file-drop.directive.ts
@@ -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);