Fix emoji's on iPad.

bustle · May 11, 2016 · 8f205b3 · 8f205b3
1 parent 64f7d69
commit 8f205b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/js/utils/key.js b/src/js/utils/key.js
@@ -51,11 +51,7 @@ export const SPECIAL_KEYS = {
 
 // heuristic for determining if `event` is a key event
 function isKeyEvent(event) {
-  return !!event.charCode ||
-    !!event.keyCode ||
-    !!event.metaKey ||
-    !!event.shiftKey ||
-    !!event.ctrlKey;
+  return /^key/.test(event.type);
 }
 
 /**

diff --git a/tests/unit/utils/key-test.js b/tests/unit/utils/key-test.js
@@ -8,31 +8,35 @@ const {module, test} = Helpers;
 module('Unit: Utils: Key');
 
 test('#hasModifier with no modifier', (assert) => {
-  const key = Key.fromEvent({ keyCode: 42 });
+  const event = Helpers.dom.createMockEvent('keydown', null, { keyCode: 42 });
+  const key = Key.fromEvent(event);
 
   assert.ok(!key.hasModifier(MODIFIERS.META), "META not pressed");
   assert.ok(!key.hasModifier(MODIFIERS.CTRL), "CTRL not pressed");
   assert.ok(!key.hasModifier(MODIFIERS.SHIFT), "SHIFT not pressed");
 });
 
 test('#hasModifier with META', (assert) => {
-  const key = Key.fromEvent({ metaKey: true });
+  const event = Helpers.dom.createMockEvent('keyup', null, { metaKey: true });
+  const key = Key.fromEvent(event);
 
   assert.ok(key.hasModifier(MODIFIERS.META), "META pressed");
   assert.ok(!key.hasModifier(MODIFIERS.CTRL), "CTRL not pressed");
   assert.ok(!key.hasModifier(MODIFIERS.SHIFT), "SHIFT not pressed");
 });
 
 test('#hasModifier with CTRL', (assert) => {
-  const key = Key.fromEvent({ ctrlKey: true });
+  const event = Helpers.dom.createMockEvent('keypress', null, { ctrlKey: true });
+  const key = Key.fromEvent(event);
 
   assert.ok(!key.hasModifier(MODIFIERS.META), "META not pressed");
   assert.ok(key.hasModifier(MODIFIERS.CTRL), "CTRL pressed");
   assert.ok(!key.hasModifier(MODIFIERS.SHIFT), "SHIFT not pressed");
 });
 
 test('#hasModifier with SHIFT', (assert) => {
-  const key = Key.fromEvent({ shiftKey: true });
+  const event = Helpers.dom.createMockEvent('keydown', null, { shiftKey: true });
+  const key = Key.fromEvent(event);
 
   assert.ok(!key.hasModifier(MODIFIERS.META), "META not pressed");
   assert.ok(!key.hasModifier(MODIFIERS.CTRL), "CTRL not pressed");