From b9fe3343fc46fb9898f6da9cff8bf0e4ab4e982c Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Tue, 15 Aug 2017 20:47:52 +0900 Subject: add key-queue test --- src/background/index.js | 2 +- src/background/key-queue.js | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/background') diff --git a/src/background/index.js b/src/background/index.js index 604ea92..d27c557 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -2,7 +2,7 @@ import * as actions from '../shared/actions'; import * as tabs from './tabs'; import KeyQueue from './key-queue'; -const queue = new KeyQueue(); +const queue = new KeyQueue(KeyQueue.DEFAULT_KEYMAP); const keyDownHandle = (request) => { return queue.push({ diff --git a/src/background/key-queue.js b/src/background/key-queue.js index e21399e..666eec3 100644 --- a/src/background/key-queue.js +++ b/src/background/key-queue.js @@ -12,20 +12,20 @@ const DEFAULT_KEYMAP = [ export default class KeyQueue { - constructor(keymap) { + constructor() { this.data = []; - this.keymap = keymap; + this.keymap = DEFAULT_KEYMAP; } push(key) { this.data.push(key); - let filtered = DEFAULT_KEYMAP.filter((map) => { + let filtered = this.keymap.filter((map) => { return keys.hasPrefix(map.keys, this.data) }); if (filtered.length == 0) { this.data = []; - return; + return null; } else if (filtered.length == 1) { let map = filtered[0]; if (map.keys.length == this.data.length) { @@ -35,4 +35,8 @@ export default class KeyQueue { } return null; } + + queuedKeys() { + return this.data; + } } -- cgit v1.2.3 From 7f64413cc95a8b3e842e888563f78bee6dcb8937 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Tue, 15 Aug 2017 20:49:04 +0900 Subject: add test task --- package.json | 2 +- src/background/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/background') diff --git a/package.json b/package.json index 6663579..e62dd5c 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "scripts": { "start": "webpack -w --debug", "lint": "eslint src", - "test": "true" + "test": "karma start" }, "repository": { "type": "git", diff --git a/src/background/index.js b/src/background/index.js index d27c557..604ea92 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -2,7 +2,7 @@ import * as actions from '../shared/actions'; import * as tabs from './tabs'; import KeyQueue from './key-queue'; -const queue = new KeyQueue(KeyQueue.DEFAULT_KEYMAP); +const queue = new KeyQueue(); const keyDownHandle = (request) => { return queue.push({ -- cgit v1.2.3