support 0/$ commands

jh-changes
Shin'ya Ueoka 7 years ago
parent b1908a2876
commit 21404ad534
  1. 2
      src/background/key-queue.js
  2. 10
      src/content/index.js
  3. 14
      src/content/scrolls.js
  4. 4
      src/shared/actions.js

@ -14,6 +14,8 @@ const DEFAULT_KEYMAP = {
'<C-F>': [ actions.SCROLL_PAGES, 1 ], '<C-F>': [ actions.SCROLL_PAGES, 1 ],
'gg': [ actions.SCROLL_TOP ], 'gg': [ actions.SCROLL_TOP ],
'G': [ actions.SCROLL_BOTTOM ], 'G': [ actions.SCROLL_BOTTOM ],
'0': [ actions.SCROLL_LEFT ],
'$': [ actions.SCROLL_RIGHT ],
'd': [ actions.TABS_CLOSE ], 'd': [ actions.TABS_CLOSE ],
'u': [ actions.TABS_REOPEN], 'u': [ actions.TABS_REOPEN],
'h': [ actions.TABS_PREV, 1 ], 'h': [ actions.TABS_PREV, 1 ],

@ -49,10 +49,16 @@ const invokeEvent = (action) => {
scrolls.scrollPages(window, action[1]); scrolls.scrollPages(window, action[1]);
break; break;
case actions.SCROLL_TOP: case actions.SCROLL_TOP:
scrolls.scrollTop(window, action[1]); scrolls.scrollTop(window);
break; break;
case actions.SCROLL_BOTTOM: case actions.SCROLL_BOTTOM:
scrolls.scrollBottom(window, action[1]); scrolls.scrollBottom(window);
break;
case actions.SCROLL_LEFT:
scrolls.scrollLeft(window);
break;
case actions.SCROLL_RIGHT:
scrolls.scrollRight(window);
break; break;
case actions.FOLLOW_START: case actions.FOLLOW_START:
new Follow(window.document, action[1] || false); new Follow(window.document, action[1] || false);

@ -25,4 +25,16 @@ const scrollBottom = (page) => {
page.scrollTo(x, y); page.scrollTo(x, y);
}; };
export { scrollLines, scrollPages, scrollTop, scrollBottom } const scrollLeft = (page) => {
let x = 0;
let y = page.scrollY;
page.scrollTo(x, y);
};
const scrollRight = (page) => {
let x = page.scrollMaxX;
let y = page.scrollY;
page.scrollTo(x, y);
};
export { scrollLines, scrollPages, scrollTop, scrollBottom, scrollLeft, scrollRight }

@ -9,6 +9,8 @@ export const SCROLL_LINES = 'scroll.lines';
export const SCROLL_PAGES = 'scroll.pages'; export const SCROLL_PAGES = 'scroll.pages';
export const SCROLL_TOP = 'scroll.top'; export const SCROLL_TOP = 'scroll.top';
export const SCROLL_BOTTOM = 'scroll.bottom'; export const SCROLL_BOTTOM = 'scroll.bottom';
export const SCROLL_LEFT= 'scroll.left';
export const SCROLL_RIGHT= 'scroll.right';
export const FOLLOW_START = 'follow.start'; export const FOLLOW_START = 'follow.start';
export const HISTORY_PREV = 'history.prev'; export const HISTORY_PREV = 'history.prev';
export const HISTORY_NEXT = 'history.next'; export const HISTORY_NEXT = 'history.next';
@ -34,6 +36,8 @@ const CONTENT_ACTION_SET = new Set([
SCROLL_PAGES, SCROLL_PAGES,
SCROLL_TOP, SCROLL_TOP,
SCROLL_BOTTOM, SCROLL_BOTTOM,
SCROLL_LEFT,
SCROLL_RIGHT,
FOLLOW_START, FOLLOW_START,
HISTORY_PREV, HISTORY_PREV,
HISTORY_NEXT HISTORY_NEXT