aboutsummaryrefslogtreecommitdiff
path: root/src/content/actions/operation.js
diff options
context:
space:
mode:
authorShin'ya Ueoka <ueokande@i-beam.org>2018-01-13 15:31:39 +0900
committerShin'ya Ueoka <ueokande@i-beam.org>2018-01-13 16:24:24 +0900
commit2ca1b54faacb261e5a25331e030da13d07c09662 (patch)
treebf0ea5272e29b54b948c440ab3bd72024f56956e /src/content/actions/operation.js
parent42839161bbb1d79c0072b2c2c4cfe67a97f68c97 (diff)
add smoothscroll property
Diffstat (limited to 'src/content/actions/operation.js')
-rw-r--r--src/content/actions/operation.js19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/content/actions/operation.js b/src/content/actions/operation.js
index 8157127..d2e258c 100644
--- a/src/content/actions/operation.js
+++ b/src/content/actions/operation.js
@@ -5,9 +5,12 @@ import * as navigates from 'content/navigates';
import * as urls from 'content/urls';
import * as consoleFrames from 'content/console-frames';
import * as addonActions from './addon';
+import * as properties from 'shared/settings/properties';
// eslint-disable-next-line complexity
-const exec = (operation) => {
+const exec = (operation, settings) => {
+ let smoothscroll = settings.properties.smoothscroll ||
+ properties.defaults.smoothscroll;
switch (operation.type) {
case operations.ADDON_ENABLE:
return addonActions.enable();
@@ -24,19 +27,19 @@ const exec = (operation) => {
type: messages.FIND_PREV,
}), '*');
case operations.SCROLL_VERTICALLY:
- return scrolls.scrollVertically(operation.count);
+ return scrolls.scrollVertically(operation.count, smoothscroll);
case operations.SCROLL_HORIZONALLY:
- return scrolls.scrollHorizonally(operation.count);
+ return scrolls.scrollHorizonally(operation.count, smoothscroll);
case operations.SCROLL_PAGES:
- return scrolls.scrollPages(operation.count);
+ return scrolls.scrollPages(operation.count, smoothscroll);
case operations.SCROLL_TOP:
- return scrolls.scrollTop();
+ return scrolls.scrollTop(smoothscroll);
case operations.SCROLL_BOTTOM:
- return scrolls.scrollBottom();
+ return scrolls.scrollBottom(smoothscroll);
case operations.SCROLL_HOME:
- return scrolls.scrollHome();
+ return scrolls.scrollHome(smoothscroll);
case operations.SCROLL_END:
- return scrolls.scrollEnd();
+ return scrolls.scrollEnd(smoothscroll);
case operations.FOLLOW_START:
return window.top.postMessage(JSON.stringify({
type: messages.FOLLOW_START,