From 5364d00671aac490599a34ffc85023982215b81e Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Thu, 2 Mar 2017 15:02:43 -0600 Subject: [PATCH] refactor(toggle): move to constants from enum move to constants from enum --- src/components/toggle/toggle-gesture.ts | 4 ++-- src/components/toggle/toggle.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/toggle/toggle-gesture.ts b/src/components/toggle/toggle-gesture.ts index 6c0283e864..2399e91829 100644 --- a/src/components/toggle/toggle-gesture.ts +++ b/src/components/toggle/toggle-gesture.ts @@ -1,4 +1,4 @@ -import { GestureController, GesturePriority, GESTURE_TOGGLE } from '../../gestures/gesture-controller'; +import { GestureController, GESTURE_PRIORITY_TOGGLE, GESTURE_TOGGLE } from '../../gestures/gesture-controller'; import { DomController } from '../../platform/dom-controller'; import { PanGesture } from '../../gestures/drag-gesture'; import { Platform } from '../../platform/platform'; @@ -24,7 +24,7 @@ export class ToggleGesture extends PanGesture { domController: domCtrl, gesture: gestureCtrl.createGesture({ name: GESTURE_TOGGLE, - priority: GesturePriority.Toggle, + priority: GESTURE_PRIORITY_TOGGLE }) }); } diff --git a/src/components/toggle/toggle.ts b/src/components/toggle/toggle.ts index 9fcfaaa136..6b4346b0b6 100644 --- a/src/components/toggle/toggle.ts +++ b/src/components/toggle/toggle.ts @@ -9,7 +9,7 @@ import { Haptic } from '../../tap-click/haptic'; import { Ion } from '../ion'; import { isTrueProperty, assert } from '../../util/util'; import { Item } from '../item/item'; -import { Key } from '../../platform/key'; +import { KEY_ENTER, KEY_SPACE } from '../../platform/key'; import { Platform } from '../../platform/platform'; import { ToggleGesture } from './toggle-gesture'; @@ -293,7 +293,7 @@ export class Toggle extends Ion implements IonicTapInput, AfterContentInit, Cont * @private */ @HostListener('keyup', ['$event']) _keyup(ev: KeyboardEvent) { - if (ev.keyCode === Key.SPACE || ev.keyCode === Key.ENTER) { + if (ev.keyCode === KEY_SPACE || ev.keyCode === KEY_ENTER) { console.debug(`toggle, keyup: ${ev.keyCode}`); ev.preventDefault(); ev.stopPropagation();