aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/content/actions/follow-controller.js (renamed from src/content/actions/follow.js)8
-rw-r--r--src/content/actions/index.js8
-rw-r--r--src/content/components/top-content/follow-controller.js17
-rw-r--r--src/content/reducers/follow-controller.js (renamed from src/content/reducers/follow.js)8
-rw-r--r--src/content/reducers/index.js6
-rw-r--r--test/content/actions/follow-controller.test.js35
-rw-r--r--test/content/actions/follow.test.js35
-rw-r--r--test/content/reducers/follow-controller.test.js48
-rw-r--r--test/content/reducers/follow.test.js48
9 files changed, 107 insertions, 106 deletions
diff --git a/src/content/actions/follow.js b/src/content/actions/follow-controller.js
index 5a18dd5..3fd4dce 100644
--- a/src/content/actions/follow.js
+++ b/src/content/actions/follow-controller.js
@@ -2,27 +2,27 @@ import actions from 'content/actions';
const enable = (newTab) => {
return {
- type: actions.FOLLOW_ENABLE,
+ type: actions.FOLLOW_CONTROLLER_ENABLE,
newTab,
};
};
const disable = () => {
return {
- type: actions.FOLLOW_DISABLE,
+ type: actions.FOLLOW_CONTROLLER_DISABLE,
};
};
const keyPress = (key) => {
return {
- type: actions.FOLLOW_KEY_PRESS,
+ type: actions.FOLLOW_CONTROLLER_KEY_PRESS,
key: key
};
};
const backspace = () => {
return {
- type: actions.FOLLOW_BACKSPACE,
+ type: actions.FOLLOW_CONTROLLER_BACKSPACE,
};
};
diff --git a/src/content/actions/index.js b/src/content/actions/index.js
index 83fa7cf..8cc2303 100644
--- a/src/content/actions/index.js
+++ b/src/content/actions/index.js
@@ -17,8 +17,8 @@ export default {
COMPLETION_SELECT_PREV: 'completions.select.prev',
// Follow
- FOLLOW_ENABLE: 'follow.enable',
- FOLLOW_DISABLE: 'follow.disable',
- FOLLOW_KEY_PRESS: 'follow.key.press',
- FOLLOW_BACKSPACE: 'follow.backspace',
+ FOLLOW_CONTROLLER_ENABLE: 'follow.controller.enable',
+ FOLLOW_CONTROLLER_DISABLE: 'follow.controller.disable',
+ FOLLOW_CONTROLLER_KEY_PRESS: 'follow.controller.key.press',
+ FOLLOW_CONTROLLER_BACKSPACE: 'follow.controller.backspace',
};
diff --git a/src/content/components/top-content/follow-controller.js b/src/content/components/top-content/follow-controller.js
index a87ecc7..38869e6 100644
--- a/src/content/components/top-content/follow-controller.js
+++ b/src/content/components/top-content/follow-controller.js
@@ -1,4 +1,4 @@
-import * as followActions from 'content/actions/follow';
+import * as followControllerActions from 'content/actions/follow-controller';
import messages from 'shared/messages';
import HintKeyProducer from 'content/hint-key-producer';
@@ -28,7 +28,8 @@ export default class FollowController {
onMessage(message, sender) {
switch (message.type) {
case messages.FOLLOW_START:
- return this.store.dispatch(followActions.enable(message.newTab));
+ return this.store.dispatch(
+ followControllerActions.enable(message.newTab));
case messages.FOLLOW_RESPONSE_COUNT_TARGETS:
return this.create(message.count, sender);
case messages.FOLLOW_KEY_PRESS:
@@ -38,7 +39,7 @@ export default class FollowController {
update() {
let prevState = this.state;
- this.state = this.store.getState().follow;
+ this.state = this.store.getState().followController;
if (!prevState.enabled && this.state.enabled) {
this.count();
@@ -53,7 +54,7 @@ export default class FollowController {
let shown = this.keys.filter(key => key.startsWith(this.state.keys));
if (shown.length === 1) {
this.activate();
- this.store.dispatch(followActions.disable());
+ this.store.dispatch(followControllerActions.disable());
}
broadcastMessage(this.win, {
@@ -73,18 +74,18 @@ export default class FollowController {
switch (key) {
case 'Enter':
this.activate();
- this.store.dispatch(followActions.disable());
+ this.store.dispatch(followControllerActions.disable());
break;
case 'Escape':
- this.store.dispatch(followActions.disable());
+ this.store.dispatch(followControllerActions.disable());
break;
case 'Backspace':
case 'Delete':
- this.store.dispatch(followActions.backspace());
+ this.store.dispatch(followControllerActions.backspace());
break;
default:
if (DEFAULT_HINT_CHARSET.includes(key)) {
- this.store.dispatch(followActions.keyPress(key));
+ this.store.dispatch(followControllerActions.keyPress(key));
}
break;
}
diff --git a/src/content/reducers/follow.js b/src/content/reducers/follow-controller.js
index b7c0cf3..2afb232 100644
--- a/src/content/reducers/follow.js
+++ b/src/content/reducers/follow-controller.js
@@ -8,21 +8,21 @@ const defaultState = {
export default function reducer(state = defaultState, action = {}) {
switch (action.type) {
- case actions.FOLLOW_ENABLE:
+ case actions.FOLLOW_CONTROLLER_ENABLE:
return Object.assign({}, state, {
enabled: true,
newTab: action.newTab,
keys: '',
});
- case actions.FOLLOW_DISABLE:
+ case actions.FOLLOW_CONTROLLER_DISABLE:
return Object.assign({}, state, {
enabled: false,
});
- case actions.FOLLOW_KEY_PRESS:
+ case actions.FOLLOW_CONTROLLER_KEY_PRESS:
return Object.assign({}, state, {
keys: state.keys + action.key,
});
- case actions.FOLLOW_BACKSPACE:
+ case actions.FOLLOW_CONTROLLER_BACKSPACE:
return Object.assign({}, state, {
keys: state.keys.slice(0, -1),
});
diff --git a/src/content/reducers/index.js b/src/content/reducers/index.js
index ae4a845..17c0429 100644
--- a/src/content/reducers/index.js
+++ b/src/content/reducers/index.js
@@ -1,14 +1,14 @@
import addonReducer from './addon';
import settingReducer from './setting';
import inputReducer from './input';
-import followReducer from './follow';
+import followControllerReducer from './follow-controller';
// Make setting reducer instead of re-use
const defaultState = {
addon: addonReducer(undefined, {}),
setting: settingReducer(undefined, {}),
input: inputReducer(undefined, {}),
- follow: followReducer(undefined, {}),
+ followController: followControllerReducer(undefined, {}),
};
export default function reducer(state = defaultState, action = {}) {
@@ -16,6 +16,6 @@ export default function reducer(state = defaultState, action = {}) {
addon: addonReducer(state.addon, action),
setting: settingReducer(state.setting, action),
input: inputReducer(state.input, action),
- follow: followReducer(state.follow, action),
+ followController: followControllerReducer(state.followController, action),
});
}
diff --git a/test/content/actions/follow-controller.test.js b/test/content/actions/follow-controller.test.js
new file mode 100644
index 0000000..298abf2
--- /dev/null
+++ b/test/content/actions/follow-controller.test.js
@@ -0,0 +1,35 @@
+import { expect } from "chai";
+import actions from 'content/actions';
+import * as followControllerActions from 'content/actions/follow-controller';
+
+describe('follow-controller actions', () => {
+ describe('enable', () => {
+ it('creates FOLLOW_CONTROLLER_ENABLE action', () => {
+ let action = followControllerActions.enable(true);
+ expect(action.type).to.equal(actions.FOLLOW_CONTROLLER_ENABLE);
+ expect(action.newTab).to.equal(true);
+ });
+ });
+
+ describe('disable', () => {
+ it('creates FOLLOW_CONTROLLER_DISABLE action', () => {
+ let action = followControllerActions.disable(true);
+ expect(action.type).to.equal(actions.FOLLOW_CONTROLLER_DISABLE);
+ });
+ });
+
+ describe('keyPress', () => {
+ it('creates FOLLOW_CONTROLLER_KEY_PRESS action', () => {
+ let action = followControllerActions.keyPress(100);
+ expect(action.type).to.equal(actions.FOLLOW_CONTROLLER_KEY_PRESS);
+ expect(action.key).to.equal(100);
+ });
+ });
+
+ describe('backspace', () => {
+ it('creates FOLLOW_CONTROLLER_BACKSPACE action', () => {
+ let action = followControllerActions.backspace(100);
+ expect(action.type).to.equal(actions.FOLLOW_CONTROLLER_BACKSPACE);
+ });
+ });
+});
diff --git a/test/content/actions/follow.test.js b/test/content/actions/follow.test.js
deleted file mode 100644
index 3ac844c..0000000
--- a/test/content/actions/follow.test.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { expect } from "chai";
-import actions from 'content/actions';
-import * as followActions from 'content/actions/follow';
-
-describe('follow actions', () => {
- describe('enable', () => {
- it('creates FOLLOW_ENABLE action', () => {
- let action = followActions.enable(true);
- expect(action.type).to.equal(actions.FOLLOW_ENABLE);
- expect(action.newTab).to.equal(true);
- });
- });
-
- describe('disable', () => {
- it('creates FOLLOW_DISABLE action', () => {
- let action = followActions.disable(true);
- expect(action.type).to.equal(actions.FOLLOW_DISABLE);
- });
- });
-
- describe('keyPress', () => {
- it('creates FOLLOW_KEY_PRESS action', () => {
- let action = followActions.keyPress(100);
- expect(action.type).to.equal(actions.FOLLOW_KEY_PRESS);
- expect(action.key).to.equal(100);
- });
- });
-
- describe('backspace', () => {
- it('creates FOLLOW_BACKSPACE action', () => {
- let action = followActions.backspace(100);
- expect(action.type).to.equal(actions.FOLLOW_BACKSPACE);
- });
- });
-});
diff --git a/test/content/reducers/follow-controller.test.js b/test/content/reducers/follow-controller.test.js
new file mode 100644
index 0000000..f4b91d2
--- /dev/null
+++ b/test/content/reducers/follow-controller.test.js
@@ -0,0 +1,48 @@
+import { expect } from "chai";
+import actions from 'content/actions';
+import followControllerReducer from 'content/reducers/follow-controller';
+
+describe('follow-controller reducer', () => {
+ it ('returns the initial state', () => {
+ let state = followControllerReducer(undefined, {});
+ expect(state).to.have.property('enabled', false);
+ expect(state).to.have.property('newTab');
+ expect(state).to.have.deep.property('keys', '');
+ });
+
+ it ('returns next state for FOLLOW_CONTROLLER_ENABLE', () => {
+ let action = { type: actions.FOLLOW_CONTROLLER_ENABLE, newTab: true };
+ let state = followControllerReducer({ enabled: false, newTab: false }, action);
+ expect(state).to.have.property('enabled', true);
+ expect(state).to.have.property('newTab', true);
+ expect(state).to.have.property('keys', '');
+ });
+
+ it ('returns next state for FOLLOW_CONTROLLER_DISABLE', () => {
+ let action = { type: actions.FOLLOW_CONTROLLER_DISABLE };
+ let state = followControllerReducer({ enabled: true }, action);
+ expect(state).to.have.property('enabled', false);
+ });
+
+ it ('returns next state for FOLLOW_CONTROLLER_KEY_PRESS', () => {
+ let action = { type: actions.FOLLOW_CONTROLLER_KEY_PRESS, key: 'a'};
+ let state = followControllerReducer({ keys: '' }, action);
+ expect(state).to.have.deep.property('keys', 'a');
+
+ action = { type: actions.FOLLOW_CONTROLLER_KEY_PRESS, key: 'b'};
+ state = followControllerReducer(state, action);
+ expect(state).to.have.deep.property('keys', 'ab');
+ });
+
+ it ('returns next state for FOLLOW_CONTROLLER_BACKSPACE', () => {
+ let action = { type: actions.FOLLOW_CONTROLLER_BACKSPACE };
+ let state = followControllerReducer({ keys: 'ab' }, action);
+ expect(state).to.have.deep.property('keys', 'a');
+
+ state = followControllerReducer(state, action);
+ expect(state).to.have.deep.property('keys', '');
+
+ state = followControllerReducer(state, action);
+ expect(state).to.have.deep.property('keys', '');
+ });
+});
diff --git a/test/content/reducers/follow.test.js b/test/content/reducers/follow.test.js
deleted file mode 100644
index e2b3445..0000000
--- a/test/content/reducers/follow.test.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import { expect } from "chai";
-import actions from 'content/actions';
-import followReducer from 'content/reducers/follow';
-
-describe('follow reducer', () => {
- it ('returns the initial state', () => {
- let state = followReducer(undefined, {});
- expect(state).to.have.property('enabled', false);
- expect(state).to.have.property('newTab');
- expect(state).to.have.deep.property('keys', '');
- });
-
- it ('returns next state for FOLLOW_ENABLE', () => {
- let action = { type: actions.FOLLOW_ENABLE, newTab: true };
- let state = followReducer({ enabled: false, newTab: false }, action);
- expect(state).to.have.property('enabled', true);
- expect(state).to.have.property('newTab', true);
- expect(state).to.have.property('keys', '');
- });
-
- it ('returns next state for FOLLOW_DISABLE', () => {
- let action = { type: actions.FOLLOW_DISABLE };
- let state = followReducer({ enabled: true }, action);
- expect(state).to.have.property('enabled', false);
- });
-
- it ('returns next state for FOLLOW_KEY_PRESS', () => {
- let action = { type: actions.FOLLOW_KEY_PRESS, key: 'a'};
- let state = followReducer({ keys: '' }, action);
- expect(state).to.have.deep.property('keys', 'a');
-
- action = { type: actions.FOLLOW_KEY_PRESS, key: 'b'};
- state = followReducer(state, action);
- expect(state).to.have.deep.property('keys', 'ab');
- });
-
- it ('returns next state for FOLLOW_BACKSPACE', () => {
- let action = { type: actions.FOLLOW_BACKSPACE };
- let state = followReducer({ keys: 'ab' }, action);
- expect(state).to.have.deep.property('keys', 'a');
-
- state = followReducer(state, action);
- expect(state).to.have.deep.property('keys', '');
-
- state = followReducer(state, action);
- expect(state).to.have.deep.property('keys', '');
- });
-});
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 17:41:26 +0000