Merge pull request #280 from mkjeff/master

fix(dropdowns): dropdown should close correctly when used in modals (fixes #267, fixes #221)
valor-software · Mar 25, 2016 · 6c1358e · 6c1358e
2 parents f7a857c + a7a02ff
commit 6c1358e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/components/dropdown/dropdown.directive.ts b/components/dropdown/dropdown.directive.ts
@@ -23,6 +23,7 @@ export class Dropdown implements OnInit, OnDestroy {
   @Output() public isOpenChange:EventEmitter<boolean> = new EventEmitter();
   @HostBinding('class.dropdown') private addClass = true;
 
+
   private _isOpen:boolean;
   // index of selected element
   public selectedOption:number;

diff --git a/components/dropdown/dropdown.service.ts b/components/dropdown/dropdown.service.ts
@@ -7,18 +7,17 @@ import {Dropdown} from './dropdown.directive';
 
 export class DropdownService {
   private openScope:Dropdown;
-  private dropdownScope:Dropdown;
 
   private closeDropdownBind:EventListener = this.closeDropdown.bind(this);
   private keybindFilterBind:EventListener = this.keybindFilter.bind(this);
 
   public open(dropdownScope:Dropdown) {
     if (!this.openScope) {
-      window.document.addEventListener('click', this.closeDropdownBind);
+      window.document.addEventListener('click', this.closeDropdownBind, true);
       window.document.addEventListener('keydown', this.keybindFilterBind);
     }
 
-    if (this.openScope && this.openScope !== this.dropdownScope) {
+    if (this.openScope && this.openScope !== dropdownScope) {
       this.openScope.isOpen = false;
     }
 
@@ -31,7 +30,7 @@ export class DropdownService {
     }
 
     this.openScope = null;
-    window.document.removeEventListener('click', this.closeDropdownBind);
+    window.document.removeEventListener('click', this.closeDropdownBind, true);
     window.document.removeEventListener('keydown', this.keybindFilterBind);
   }