Fixed #3254

primefaces · Jun 29, 2017 · bd83ad0 · bd83ad0
1 parent b46f36c
commit bd83ad0
Showing 1 changed file with 25 additions and 14 deletions.
diff --git a/src/app/components/multiselect/multiselect.ts b/src/app/components/multiselect/multiselect.ts
@@ -1,4 +1,4 @@
-import {NgModule,Component,ElementRef,OnInit,AfterViewInit,AfterViewChecked,DoCheck,OnDestroy,Input,Output,Renderer2,EventEmitter,IterableDiffers,forwardRef,ViewChild,private cd: ChangeDetectorRef} from '@angular/core';
+import {NgModule,Component,ElementRef,OnInit,AfterViewInit,AfterViewChecked,DoCheck,OnDestroy,Input,Output,Renderer2,EventEmitter,IterableDiffers,forwardRef,ViewChild,ChangeDetectorRef} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {SelectItem} from '../common/selectitem';
 import {DomHandler} from '../dom/domhandler';
@@ -142,16 +142,6 @@ export class MultiSelect implements OnInit,AfterViewInit,AfterViewChecked,DoChec
 
     ngOnInit() {
         this.updateLabel();
-
-        this.documentClickListener = this.renderer.listen('document', 'click', () => {
-            if(!this.selfClick && !this.panelClick && this.overlayVisible) {
-                this.hide();
-            }
-
-            this.selfClick = false;
-            this.panelClick = false;
-            this.cd.markForCheck();
-        });
     }
 
     ngAfterViewInit() {
@@ -266,6 +256,7 @@ export class MultiSelect implements OnInit,AfterViewInit,AfterViewChecked,DoChec
     show() {
         this.overlayVisible = true;
         this.panel.style.zIndex = String(++DomHandler.zindex);
+        this.bindDocumentClickListener();
 
         if(this.appendTo)
             this.domHandler.absolutePosition(this.panel, this.container);
@@ -277,6 +268,7 @@ export class MultiSelect implements OnInit,AfterViewInit,AfterViewChecked,DoChec
 
     hide() {
         this.overlayVisible = false;
+        this.unbindDocumentClickListener();
     }
 
     close(event) {
@@ -389,11 +381,30 @@ export class MultiSelect implements OnInit,AfterViewInit,AfterViewChecked,DoChec
             return this.options;
         }
     }
-
-    ngOnDestroy() {
+
+    bindDocumentClickListener() {
+        if(!this.documentClickListener) {
+            this.documentClickListener = this.renderer.listen('document', 'click', () => {
+                if(!this.selfClick && !this.panelClick && this.overlayVisible) {
+                    this.hide();
+                }
+
+                this.selfClick = false;
+                this.panelClick = false;
+                this.cd.markForCheck();
+            });
+        }        
+    }
+
+    unbindDocumentClickListener() {
         if(this.documentClickListener) {
             this.documentClickListener();
-        }
+            this.documentClickListener = null;
+        }        
+    }
+
+    ngOnDestroy() {
+        this.unbindDocumentClickListener();
 
         if(this.appendTo) {
             this.container.appendChild(this.panel);