chore(alert): add keyup to body via HostListener

ionic-team · Mar 5, 2016 · 70efe7d · 70efe7d
1 parent a2f858b
commit 70efe7d
Showing 1 changed file with 13 additions and 24 deletions.
diff --git a/ionic/components/alert/alert.ts b/ionic/components/alert/alert.ts
@@ -1,4 +1,4 @@
-import {Component, ElementRef, Renderer} from 'angular2/core';
+import {Component, ElementRef, Renderer, HostListener} from 'angular2/core';
 import {NgClass, NgSwitch, NgIf, NgFor} from 'angular2/common';
 
 import {Animation} from '../../animations/animation';
@@ -271,7 +271,6 @@ class AlertCmp {
   subHdrId: string;
   msgId: string;
   inputType: string;
-  keyUp: any;
 
   constructor(
     private _viewCtrl: ViewController,
@@ -342,26 +341,24 @@ class AlertCmp {
     if (checkedInput) {
       this.activeId = checkedInput.id;
     }
+  }
 
-    let self = this;
-    self.keyUp = function(ev) {
-      if (ev.keyCode === 13) {
-        console.debug('alert, enter button');
-        let button = self.d.buttons[self.d.buttons.length - 1];
-        self.btnClick(button);
-
-      } else if (ev.keyCode === 27) {
-        console.debug('alert, escape button');
-        self.bdClick();
-      }
-    };
+  @HostListener('body:keyup', ['$event'])
+  private _keyUp(ev: KeyboardEvent) {
+    if (ev.keyCode === 13) {
+      console.debug('alert, enter button');
+      let button = this.d.buttons[this.d.buttons.length - 1];
+      this.btnClick(button);
 
-    document.addEventListener('keyup', this.keyUp);
+    } else if (ev.keyCode === 27) {
+      console.debug('alert, escape button');
+      this.bdClick();
+    }
   }
 
   onPageDidEnter() {
     let activeElement: any = document.activeElement;
-    if (activeElement) {
+    if (document.activeElement) {
       activeElement.blur();
     }
 
@@ -441,14 +438,6 @@ class AlertCmp {
     });
     return values;
   }
-
-  onPageWillLeave() {
-    document.removeEventListener('keyup', this.keyUp);
-  }
-
-  ngOnDestroy() {
-    document.removeEventListener('keyup', this.keyUp);
-  }
 }
 
 export interface AlertOptions {