diff --git a/src/content/actions/operation.js b/src/content/actions/operation.js index 89d7fec..94aa356 100644 --- a/src/content/actions/operation.js +++ b/src/content/actions/operation.js @@ -6,6 +6,7 @@ import * as focuses from 'content/focuses'; import * as urls from 'content/urls'; import * as consoleFrames from 'content/console-frames'; import * as addonActions from './addon'; +import * as markActions from './mark'; import * as properties from 'shared/settings/properties'; // eslint-disable-next-line complexity, max-lines-per-function @@ -57,6 +58,10 @@ const exec = (operation, repeat, settings, addonEnabled) => { background: operation.background, }), '*'); break; + case operations.MARK_SET_PREFIX: + return markActions.startSet(); + case operations.MARK_JUMP_PREFIX: + return markActions.startJump(); case operations.NAVIGATE_HISTORY_PREV: navigates.historyPrev(window); break; diff --git a/src/content/reducers/mark.js b/src/content/reducers/mark.js index b6a071f..700c03f 100644 --- a/src/content/reducers/mark.js +++ b/src/content/reducers/mark.js @@ -1,19 +1,19 @@ import actions from 'content/actions'; const defaultState = { - set: false, - jump: false, + setMode: false, + jumpMode: false, marks: {}, }; export default function reducer(state = defaultState, action = {}) { switch (action.type) { case actions.MARK_START_SET: - return { ...state, set: true }; + return { ...state, setMode: true }; case actions.MARK_START_JUMP: - return { ...state, jump: true }; + return { ...state, jumpMode: true }; case actions.MARK_CANCEL: - return { ...state, set: false, jump: false }; + return { ...state, setMode: false, jumpMode: false }; case actions.MARK_SET_LOCAL: { let marks = { ...state.marks }; marks[action.key] = { y: action.y }; diff --git a/test/content/reducers/mark.test.js b/test/content/reducers/mark.test.js index 39c04cd..6358bf1 100644 --- a/test/content/reducers/mark.test.js +++ b/test/content/reducers/mark.test.js @@ -4,30 +4,30 @@ import reducer from 'content/reducers/mark'; describe("mark reducer", () => { it('return the initial state', () => { let state = reducer(undefined, {}); - expect(state.set).to.be.false; - expect(state.jump).to.be.false; + expect(state.setMode).to.be.false; + expect(state.jumpMode).to.be.false; expect(state.marks).to.be.empty; }); it('starts set mode', () => { let action = { type: actions.MARK_START_SET }; let state = reducer(undefined, action); - expect(state.set).to.be.true; + expect(state.setMode).to.be.true; }); it('starts jump mode', () => { let action = { type: actions.MARK_START_JUMP }; let state = reducer(undefined, action); - expect(state.jump).to.be.true; + expect(state.jumpMode).to.be.true; }); it('cancels set and jump mode', () => { let action = { type: actions.MARK_CANCEL }; - let state = reducer({ set: true }, action); - expect(state.set).to.be.false; + let state = reducer({ setMode: true }, action); + expect(state.setMode).to.be.false; - state = reducer({ jump: true }, action); - expect(state.jump).to.be.false; + state = reducer({ jumpMode: true }, action); + expect(state.jumpMode).to.be.false; }); it('stores local mark', () => {