From 1f15d2264305a5492f3f95d9fbdaf1e31fbb33fd Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Wed, 23 Aug 2017 21:58:58 +0900 Subject: [PATCH] support zi/zo commands --- .eslintrc | 1 - src/background/index.js | 7 +++++++ src/background/key-queue.js | 2 ++ src/background/zooms.js | 34 ++++++++++++++++++++++++++++++++++ src/shared/actions.js | 6 +++++- 5 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 src/background/zooms.js diff --git a/.eslintrc b/.eslintrc index 38d7ea9..80fc259 100644 --- a/.eslintrc +++ b/.eslintrc @@ -22,7 +22,6 @@ "multiline-ternary": "off", "max-statements": ["error", 15], "no-console": "off", - "no-magic-numbers": ["error", { "ignore": [0, 1, 2] }], "no-param-reassign": "off", "no-ternary": "off", "object-curly-spacing": [ diff --git a/src/background/index.js b/src/background/index.js index f3bd65a..cfd5e77 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -1,6 +1,7 @@ import * as actions from '../shared/actions'; import * as tabs from './tabs'; import * as commands from './commands'; +import * as zooms from './zooms'; import KeyQueue from './key-queue'; const queue = new KeyQueue(); @@ -38,6 +39,12 @@ const doBackgroundAction = (sender, action) => { case actions.TABS_NEXT: tabs.selectNextTab(sender.tab.index, actions[1] || 1); break; + case actions.ZOOM_IN: + zooms.zoomIn(); + break; + case actions.ZOOM_OUT: + zooms.zoomOut(); + break; } } diff --git a/src/background/key-queue.js b/src/background/key-queue.js index a07c7f4..6319431 100644 --- a/src/background/key-queue.js +++ b/src/background/key-queue.js @@ -13,6 +13,8 @@ const DEFAULT_KEYMAP = [ { keys: [{ code: KeyboardEvent.DOM_VK_U }], action: [ actions.TABS_REOPEN]}, { keys: [{ code: KeyboardEvent.DOM_VK_H }], action: [ actions.TABS_PREV, 1 ]}, { keys: [{ code: KeyboardEvent.DOM_VK_L }], action: [ actions.TABS_NEXT, 1 ]}, + { keys: [{ code: KeyboardEvent.DOM_VK_Z }, { code: KeyboardEvent.DOM_VK_I }], action: [ actions.ZOOM_IN ]}, + { keys: [{ code: KeyboardEvent.DOM_VK_Z }, { code: KeyboardEvent.DOM_VK_O }], action: [ actions.ZOOM_OUT ]}, { keys: [{ code: KeyboardEvent.DOM_VK_F }], action: [ actions.FOLLOW_START, false ]}, { keys: [{ code: KeyboardEvent.DOM_VK_F, shift: true }], action: [ actions.FOLLOW_START, true ]}, { keys: [{ code: KeyboardEvent.DOM_VK_H, shift: true }], action: [ actions.HISTORY_PREV ]}, diff --git a/src/background/zooms.js b/src/background/zooms.js new file mode 100644 index 0000000..def2878 --- /dev/null +++ b/src/background/zooms.js @@ -0,0 +1,34 @@ +// For chromium +// const ZOOM_SETTINGS = [ +// 0.25, 0.33, 0.50, 0.66, 0.75, 0.80, 0.90, 1.00, +// 1.10, 1.25, 1.50, 1.75, 2.00, 2.50, 3.00, 4.00, 5.00 +// ]; + +const ZOOM_SETTINGS = [ + 0.33, 0.50, 0.66, 0.75, 0.80, 0.90, 1.00, + 1.10, 1.25, 1.50, 1.75, 2.00, 2.50, 3.00 +]; + +const zoomIn = (tabId = undefined) => { + browser.tabs.getZoom(tabId).then((factor) => { + for (let f of ZOOM_SETTINGS) { + if (f > factor) { + browser.tabs.setZoom(tabId, f); + break; + } + } + }); +} + +const zoomOut = (tabId = undefined) => { + browser.tabs.getZoom(tabId).then((factor) => { + for (let f of [].concat(ZOOM_SETTINGS).reverse()) { + if (f < factor) { + browser.tabs.setZoom(tabId, f); + break; + } + } + }); +} + +export { zoomIn, zoomOut }; diff --git a/src/shared/actions.js b/src/shared/actions.js index e01813b..768f06e 100644 --- a/src/shared/actions.js +++ b/src/shared/actions.js @@ -11,12 +11,16 @@ export const SCROLL_BOTTOM = 'scroll.bottom'; export const FOLLOW_START = 'follow.start'; export const HISTORY_PREV = 'history.prev'; export const HISTORY_NEXT = 'history.next'; +export const ZOOM_IN = 'zoom.in'; +export const ZOOM_OUT = 'zoom.out'; const BACKGROUND_ACTION_SET = new Set([ TABS_CLOSE, TABS_REOPEN, TABS_PREV, - TABS_NEXT + TABS_NEXT, + ZOOM_IN, + ZOOM_OUT ]); const CONTENT_ACTION_SET = new Set([