Fixed #183

primefaces · Apr 26, 2016 · 8cc2676 · 8cc2676
1 parent 9767e1c
commit 8cc2676
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/components/autocomplete/autocomplete.ts b/components/autocomplete/autocomplete.ts
@@ -5,8 +5,6 @@ import {DomHandler} from '../dom/domhandler';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from 'angular2/common';
 import {CONST_EXPR} from 'angular2/src/facade/lang';
 
-declare var PUI: any;
-
 const AUTOCOMPLETE_VALUE_ACCESSOR: Provider = CONST_EXPR(
     new Provider(NG_VALUE_ACCESSOR, {
         useExisting: forwardRef(() => AutoComplete),
@@ -270,7 +268,7 @@ export class AutoComplete implements AfterViewInit,DoCheck,AfterViewChecked,Cont
     show() {
         if(!this.panelVisible) {
             this.panelVisible = true;
-            this.panel.style.zIndex = ++PUI.zindex;
+            this.panel.style.zIndex = ++DomHandler.zindex;
             this.domHandler.fadeIn(this.panel, 200);
         }        
     }

diff --git a/components/dialog/dialog.ts b/components/dialog/dialog.ts
@@ -1,8 +1,6 @@
 import {Component,ElementRef,AfterViewInit,AfterViewChecked,OnDestroy,Input,Output,EventEmitter,Renderer} from 'angular2/core';
 import {DomHandler} from '../dom/domhandler';
 
-declare var PUI: any;
-
 @Component({
     selector: 'p-dialog',
     template: `
@@ -100,7 +98,7 @@ export class Dialog implements AfterViewInit,AfterViewChecked,OnDestroy {
         if(this._visible) {
             this.onBeforeShow.emit(event);
 
-            this.el.nativeElement.children[0].style.zIndex = ++PUI.zindex;
+            this.el.nativeElement.children[0].style.zIndex = ++DomHandler.zindex;
 
             if(this.showEffect == 'fade')
                 this.domHandler.fadeIn(this.el.nativeElement.children[0], 250);
@@ -146,7 +144,7 @@ export class Dialog implements AfterViewInit,AfterViewChecked,OnDestroy {
         if(this.closeOnEscape && this.closable) {
             this.documentEscapeListener = this.renderer.listenGlobal('body', 'keydown', (event) => {
                 if(event.which == 27) {
-                    if(this.el.nativeElement.children[0].style.zIndex == PUI.zindex) {
+                    if(this.el.nativeElement.children[0].style.zIndex == DomHandler.zindex) {
                         this.hide(event);
                     }
                 }
@@ -205,7 +203,7 @@ export class Dialog implements AfterViewInit,AfterViewChecked,OnDestroy {
     }
 
     moveOnTop() {
-        this.el.nativeElement.children[0].style.zIndex = ++PUI.zindex;
+        this.el.nativeElement.children[0].style.zIndex = ++DomHandler.zindex;
     }
 
     initDrag(event) {

diff --git a/components/dom/domhandler.ts b/components/dom/domhandler.ts
@@ -2,7 +2,9 @@ import {Injectable} from 'angular2/core';
 
 @Injectable()
 export class DomHandler {
-
+
+    public static zindex: number = 1000;
+
     public addClass(element: any, className: string):void {
         if (element.classList)
             element.classList.add(className);

diff --git a/components/dropdown/dropdown.ts b/components/dropdown/dropdown.ts
@@ -4,8 +4,6 @@ import {DomHandler} from '../dom/domhandler';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from 'angular2/common';
 import {CONST_EXPR} from 'angular2/src/facade/lang';
 
-declare var PUI: any;
-
 const DROPDOWN_VALUE_ACCESSOR: Provider = CONST_EXPR(
     new Provider(NG_VALUE_ACCESSOR, {
         useExisting: forwardRef(() => Dropdown),
@@ -238,7 +236,7 @@ export class Dropdown implements OnInit,AfterViewInit,AfterViewChecked,DoCheck,O
     show(panel,container) {
         if(this.optionsToDisplay && this.optionsToDisplay.length) {
             this.panelVisible = true;
-            panel.style.zIndex = ++PUI.zindex;
+            panel.style.zIndex = ++DomHandler.zindex;
             this.domHandler.relativePosition(panel, container);
             this.domHandler.fadeIn(panel,250);
         }

diff --git a/components/multiselect/multiselect.ts b/components/multiselect/multiselect.ts
@@ -5,8 +5,6 @@ import {DomHandler} from '../dom/domhandler';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from 'angular2/common';
 import {CONST_EXPR} from 'angular2/src/facade/lang';
 
-declare var PUI: any;
-
 const MULTISELECT_VALUE_ACCESSOR: Provider = CONST_EXPR(
     new Provider(NG_VALUE_ACCESSOR, {
         useExisting: forwardRef(() => MultiSelect),
@@ -231,7 +229,7 @@ export class MultiSelect implements OnInit,AfterViewInit,AfterViewChecked,DoChec
 
     show() {
         this.overlayVisible = true;
-        this.panel.style.zIndex = ++PUI.zindex;
+        this.panel.style.zIndex = ++DomHandler.zindex;
         this.domHandler.relativePosition(this.panel, this.container);
         this.domHandler.fadeIn(this.panel, 250);
     }

diff --git a/components/overlaypanel/overlaypanel.ts b/components/overlaypanel/overlaypanel.ts
@@ -1,8 +1,6 @@
 import {Component,Input,Output,OnInit,OnDestroy,EventEmitter,Renderer,ElementRef} from 'angular2/core';
 import {DomHandler} from '../dom/domhandler';
 
-declare var PUI: any;
-
 @Component({
     selector: 'p-overlayPanel',
     template: `
@@ -89,7 +87,7 @@ export class OverlayPanel implements OnInit, OnDestroy {
         this.onBeforeShow.emit(null);
         let elementTarget = target||event.currentTarget||event.target;
         let container = this.el.nativeElement.children[0];
-        container.style.zIndex = ++PUI.zindex;
+        container.style.zIndex = ++DomHandler.zindex;
 
         if(this.visible) {
             this.domHandler.absolutePosition(container, elementTarget);