From 15eaad604425d36d957059072a4cbd805cc603f8 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Thu, 2 Mar 2017 15:07:34 -0600 Subject: [PATCH] refactor(platform): move to constants from enum, fix type definition move to constants from enum, fix type definition --- src/platform/key.ts | 19 ++++++++----------- src/platform/keyboard.ts | 4 ++-- src/platform/platform.ts | 2 +- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/platform/key.ts b/src/platform/key.ts index c013b4d445..eb797bac0e 100644 --- a/src/platform/key.ts +++ b/src/platform/key.ts @@ -1,12 +1,9 @@ -export enum Key { - LEFT = 37, - UP = 38, - RIGHT = 39, - DOWN = 40, - - ENTER = 13, - ESCAPE = 27, - SPACE = 32, - TAB = 9 -} +export const KEY_LEFT = 37; +export const KEY_UP = 38; +export const KEY_RIGHT = 39; +export const KEY_DOWN = 40; +export const KEY_ENTER = 13; +export const KEY_ESCAPE = 27; +export const KEY_SPACE = 32; +export const KEY_TAB = 9; diff --git a/src/platform/keyboard.ts b/src/platform/keyboard.ts index 00e5816ee3..7e8b3a7c1e 100644 --- a/src/platform/keyboard.ts +++ b/src/platform/keyboard.ts @@ -3,7 +3,7 @@ import { Injectable, NgZone } from '@angular/core'; import { Config } from '../config/config'; import { DomController } from './dom-controller'; import { isTextInput } from '../util/dom'; -import { Key } from './key'; +import { KEY_TAB } from './key'; import { Platform } from './platform'; @@ -176,7 +176,7 @@ export class Keyboard { // default is to add the focus-outline when the tab key is used function keyDown(ev: KeyboardEvent) { - if (!isKeyInputEnabled && ev.keyCode === Key.TAB) { + if (!isKeyInputEnabled && ev.keyCode === KEY_TAB) { isKeyInputEnabled = true; enableKeyInput(); } diff --git a/src/platform/platform.ts b/src/platform/platform.ts index af72a84399..9a1bcd2e97 100644 --- a/src/platform/platform.ts +++ b/src/platform/platform.ts @@ -796,7 +796,7 @@ export class Platform { // add the window resize event listener XXms after this.timeout(() => { - var timerId: number; + var timerId: any; this.registerListener(this._win, 'resize', () => { clearTimeout(timerId);