aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--QA.md23
-rw-r--r--README.md17
-rw-r--r--e2e/ambassador/src/background/index.js4
-rw-r--r--e2e/ambassador/src/client/tabs.js11
-rw-r--r--e2e/ambassador/src/shared/messages.js2
-rw-r--r--e2e/contents/mark.test.js71
-rw-r--r--e2e/contents/zoom.test.js3
-rw-r--r--e2e/web-server/index.js2
-rw-r--r--package.json2
-rw-r--r--src/background/usecases/completions.js3
-rw-r--r--src/console/components/console.js5
-rw-r--r--src/shared/settings/properties.js2
12 files changed, 128 insertions, 17 deletions
diff --git a/QA.md b/QA.md
index b24caf9..4f37879 100644
--- a/QA.md
+++ b/QA.md
@@ -4,12 +4,6 @@
Test operations with default key maps.
-#### Scrolling
-
-- [ ] Smooth scroll by `:set smoothscroll`
-- [ ] Non-smooth scroll by `:set nosmoothscroll`
-- [ ] Configure custom hint character by settings `"smoothscroll": true`, `"smoothscroll": false`
-
#### Console
The behaviors of the console are tested in [Console section](#consoles).
@@ -48,9 +42,6 @@ The behaviors of the console are tested in [Console section](#consoles).
- [ ] Select link and open it in new tab in `<iframe>`/`<frame`> on following by <kbd>F</kbd>
- [ ] Select link and open it in `<area>` tags, for <kbd>f</kbd> and <kbd>F</kbd>
- [ ] Open new tab in background by `"background": true`
-- [ ] Configure custom hint character by `:set hintchars=012345678`
-- [ ] Configure custom hint character by settings `"hintchars": "012345678"` in add-on preferences
-- [ ] Opened tabs is in child on Tree Style Tab
### Consoles
@@ -122,6 +113,20 @@ The behaviors of the console are tested in [Console section](#consoles).
- [ ] Select next item by <kbd>Tab</kbd> and previous item by <kbd>Shift</kbd>+<kbd>Tab</kbd>
- [ ] Reopen tab on *only current window* by <kbd>u</kbd>
+### Properties
+
+- [ ] Configure custom hint character by `:set hintchars=012345678`
+- [ ] Configure custom hint character by settings `"hintchars": "012345678"` in add-on preferences
+- [ ] Opened tabs is in child on Tree Style Tab
+
+- [ ] Smooth scroll by `:set smoothscroll`
+- [ ] Non-smooth scroll by `:set nosmoothscroll`
+- [ ] Configure smooth scroll by settings `"smoothscroll": true`, `"smoothscroll": false`
+
+- [ ] Show search engine, bookmark and history items in order by `:set complete=sbh`
+- [ ] Show bookmark, search engine, and search engine items in order by `:set complete=bss`
+- [ ] Configure completion items by setting `"complete": "sbh"`, `"complete": "bss"`
+
### Settings
#### JSON Settings
diff --git a/README.md b/README.md
index 586b42c..cb4cbaa 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,10 @@ See [console commands](#console-commands) section for more detailed description
- <kbd>G</kbd>: scroll to bottom of a page
- <kbd>0</kbd>: scroll to the leftmost part of a page
- <kbd>$</kbd>: scroll to the rightmost part of a page
+- <kbd>m</kbd>: set a mark from current position
+- <kbd>'</kbd>: jump to position by the mark
+
+Lowercase alphabet mark (`[a-z]`) stores position on the current tab. Upper alphabet and numeric mark (`[A-Z0-9]`) stores position and tab.
#### Zoom
@@ -219,6 +223,19 @@ Set hint characters
:set hintchars=0123456789
```
+#### `complete` property
+
+Set completion items on `open`, `tabopen` `winopen` commands.
+The allowed value is character sequence of `s`, `b`, or `n`.
+Each character presents as following:
+- `s`: search engines
+- `b`: bookmark items
+- `h`: history items.
+
+```
+:set complete=sbn
+```
+
### Search engines
Vim Vixen supports search by search engines like Google and Yahoo.
diff --git a/e2e/ambassador/src/background/index.js b/e2e/ambassador/src/background/index.js
index 046b8c1..ce21dc8 100644
--- a/e2e/ambassador/src/background/index.js
+++ b/e2e/ambassador/src/background/index.js
@@ -1,6 +1,6 @@
import {
WINDOWS_CREATE, WINDOWS_REMOVE, WINDOWS_GET,
- TABS_CREATE, TABS_SELECT_AT, TABS_GET, TABS_UPDATE,
+ TABS_CREATE, TABS_SELECT_AT, TABS_GET, TABS_UPDATE, TABS_REMOVE,
TABS_GET_ZOOM, TABS_SET_ZOOM,
EVENT_KEYPRESS, EVENT_KEYDOWN, EVENT_KEYUP,
SCROLL_GET, SCROLL_SET,
@@ -30,6 +30,8 @@ receiveContentMessage((message) => {
return browser.tabs.get(message.tabId);
case TABS_UPDATE:
return browser.tabs.update(message.tabId, message.properties);
+ case TABS_REMOVE:
+ return browser.tabs.remove(message.tabId);
case TABS_GET_ZOOM:
return browser.tabs.getZoom(message.tabId);
case TABS_SET_ZOOM:
diff --git a/e2e/ambassador/src/client/tabs.js b/e2e/ambassador/src/client/tabs.js
index 290428c..d0cd578 100644
--- a/e2e/ambassador/src/client/tabs.js
+++ b/e2e/ambassador/src/client/tabs.js
@@ -1,5 +1,5 @@
import {
- TABS_CREATE, TABS_SELECT_AT, TABS_GET, TABS_UPDATE,
+ TABS_CREATE, TABS_SELECT_AT, TABS_GET, TABS_UPDATE, TABS_REMOVE,
TABS_GET_ZOOM, TABS_SET_ZOOM,
} from '../shared/messages';
import * as ipc from './ipc';
@@ -35,6 +35,13 @@ const update = (tabId, properties) => {
});
};
+const remove = (tabId) => {
+ return ipc.send({
+ type: TABS_REMOVE,
+ tabId
+ });
+};
+
const getZoom = (tabId) => {
return ipc.send({
tabId,
@@ -50,4 +57,4 @@ const setZoom = (tabId, factor) => {
});
};
-export { create, selectAt, get, update, getZoom, setZoom };
+export { create, selectAt, get, update, remove, getZoom, setZoom };
diff --git a/e2e/ambassador/src/shared/messages.js b/e2e/ambassador/src/shared/messages.js
index d148ca0..35c41d7 100644
--- a/e2e/ambassador/src/shared/messages.js
+++ b/e2e/ambassador/src/shared/messages.js
@@ -7,6 +7,7 @@ const TABS_CREATE = 'tabs.create';
const TABS_SELECT_AT = 'tabs.selectAt';
const TABS_GET = 'tabs.get';
const TABS_UPDATE = 'tabs.update';
+const TABS_REMOVE = 'tabs.remove';
const TABS_GET_ZOOM = 'tabs.get.zoom';
const TABS_SET_ZOOM = 'tabs.set.zoom';
const EVENT_KEYPRESS = 'event.keypress';
@@ -29,6 +30,7 @@ export {
TABS_SELECT_AT,
TABS_GET_ZOOM,
TABS_SET_ZOOM,
+ TABS_REMOVE,
EVENT_KEYPRESS,
EVENT_KEYDOWN,
diff --git a/e2e/contents/mark.test.js b/e2e/contents/mark.test.js
new file mode 100644
index 0000000..85566bd
--- /dev/null
+++ b/e2e/contents/mark.test.js
@@ -0,0 +1,71 @@
+import * as windows from "../ambassador/src/client/windows";
+import * as tabs from "../ambassador/src/client/tabs";
+import * as keys from "../ambassador/src/client/keys";
+import * as scrolls from "../ambassador/src/client/scrolls";
+import { CLIENT_URL } from '../web-server/url';
+
+describe("mark test", () => {
+ let targetWindow;
+
+ before(async () => {
+ targetWindow = await windows.create();
+ });
+
+ after(async () => {
+ await windows.remove(targetWindow.id);
+ });
+
+ it('set a local mark and jump to it', async () => {
+ let tab = await tabs.create(targetWindow.id, CLIENT_URL + '/mark#local');
+ await scrolls.set(tab.id, 100, 100);
+ await keys.press(tab.id, 'm');
+ await keys.press(tab.id, 'a');
+
+ await scrolls.set(tab.id, 200, 200);
+ await keys.press(tab.id, "'");
+ await keys.press(tab.id, 'a');
+
+ let scroll = await scrolls.get(tab.id);
+ expect(scroll.x).to.be.equals(100);
+ expect(scroll.y).to.be.equals(100);
+ });
+
+ it('set a global mark and jump to it', async () => {
+ let tab1 = await tabs.create(targetWindow.id, CLIENT_URL + '/mark#global1');
+ await scrolls.set(tab1.id, 100, 100);
+ await keys.press(tab1.id, 'm');
+ await keys.press(tab1.id, 'A');
+ await new Promise(resolve => { setTimeout(() => resolve(), 100) });
+ await scrolls.set(tab1.id, 200, 200);
+
+ let tab2 = await tabs.create(targetWindow.id, CLIENT_URL + '/mark#global2');
+ await keys.press(tab2.id, "'");
+ await keys.press(tab2.id, 'A');
+ await new Promise(resolve => { setTimeout(() => resolve(), 100) });
+
+ tab1 = await tabs.get(tab1.id);
+ expect(tab1.active).to.be.true;
+ let scroll = await scrolls.get(tab1.id);
+ expect(scroll.x).to.be.equals(100);
+ expect(scroll.y).to.be.equals(100);
+ });
+
+ it('set a global mark and creates new tab from gone', async () => {
+ let tab1 = await tabs.create(targetWindow.id, CLIENT_URL + '/mark#gone');
+ await scrolls.set(tab1.id, 100, 100);
+ await keys.press(tab1.id, 'm');
+ await keys.press(tab1.id, 'A');
+ await tabs.remove(tab1.id);
+ await new Promise(resolve => { setTimeout(() => resolve(), 100) });
+
+ let tab2 = await tabs.create(targetWindow.id, CLIENT_URL + '/mark#newtab');
+ await keys.press(tab2.id, "'");
+ await keys.press(tab2.id, 'A');
+ await new Promise(resolve => { setTimeout(() => resolve(), 100) });
+
+ let win = await windows.get(targetWindow.id);
+ let found = win.tabs.find(tab => tab.url === CLIENT_URL + '/mark#gone')
+ expect(found).to.be.an('object');
+ expect(found.id).to.not.equal(tab1.id);
+ });
+});
diff --git a/e2e/contents/zoom.test.js b/e2e/contents/zoom.test.js
index 2d90e28..74d4f56 100644
--- a/e2e/contents/zoom.test.js
+++ b/e2e/contents/zoom.test.js
@@ -23,6 +23,7 @@ describe("zoom test", () => {
let before = await tabs.getZoom(targetTab.id);
await keys.press(targetTab.id, 'z');
await keys.press(targetTab.id, 'i');
+ await new Promise(resolve => setTimeout(resolve, 100));
let actual = await tabs.getZoom(targetTab.id);
expect(actual).to.be.greaterThan(before);
@@ -32,6 +33,7 @@ describe("zoom test", () => {
let before = await tabs.getZoom(targetTab.id);
await keys.press(targetTab.id, 'z');
await keys.press(targetTab.id, 'o');
+ await new Promise(resolve => setTimeout(resolve, 100));
let actual = await tabs.getZoom(targetTab.id);
expect(actual).to.be.lessThan(before);
@@ -42,6 +44,7 @@ describe("zoom test", () => {
let before = await tabs.getZoom(targetTab.id);
await keys.press(targetTab.id, 'z');
await keys.press(targetTab.id, 'z');
+ await new Promise(resolve => setTimeout(resolve, 100));
let actual = await tabs.getZoom(targetTab.id);
expect(actual).to.be.lessThan(before);
diff --git a/e2e/web-server/index.js b/e2e/web-server/index.js
index bf60078..376e118 100644
--- a/e2e/web-server/index.js
+++ b/e2e/web-server/index.js
@@ -72,7 +72,7 @@ http.createServer(function (req, res) {
}
let u = url.parse(req.url);
- if (u.pathname === '/scroll') {
+ if (u.pathname === '/scroll' || u.pathname === '/mark') {
handleScroll(req, res);
} else if (u.pathname === '/a-pagenation') {
handleAPagenation(req, res);
diff --git a/package.json b/package.json
index 1b8ea3e..102ac3b 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
"sass-loader": "^7.1.0",
"sinon-chrome": "^2.3.2",
"style-loader": "^0.22.0",
- "web-ext": "github:ueokande/web-ext#patched-2.7.0",
+ "web-ext": "github:ueokande/web-ext#patched-2.9.1",
"webextensions-api-fake": "^0.5.1",
"webpack": "^4.20.2",
"webpack-cli": "^3.1.2"
diff --git a/src/background/usecases/completions.js b/src/background/usecases/completions.js
index 2dc71cc..21dc668 100644
--- a/src/background/usecases/completions.js
+++ b/src/background/usecases/completions.js
@@ -39,7 +39,8 @@ export default class CompletionsInteractor {
let settings = await this.settingRepository.get();
let groups = [];
- for (let c of settings.properties.complete) {
+ let complete = settings.properties.complete || properties.defaults.complete;
+ for (let c of complete) {
if (c === 's') {
// eslint-disable-next-line no-await-in-loop
let engines = await this.querySearchEngineItems(name, keywords);
diff --git a/src/console/components/console.js b/src/console/components/console.js
index bd3e344..4fc8a53 100644
--- a/src/console/components/console.js
+++ b/src/console/components/console.js
@@ -97,9 +97,12 @@ export default class ConsoleComponent {
}
onInput(e) {
+ let state = this.store.getState();
let text = e.target.value;
this.store.dispatch(consoleActions.setConsoleText(text));
- this.store.dispatch(consoleActions.getCompletions(text));
+ if (state.mode === 'command') {
+ this.store.dispatch(consoleActions.getCompletions(text));
+ }
}
onInputShown(state) {
diff --git a/src/shared/settings/properties.js b/src/shared/settings/properties.js
index 96f10ac..f8e61a0 100644
--- a/src/shared/settings/properties.js
+++ b/src/shared/settings/properties.js
@@ -12,7 +12,7 @@ const types = {
const defaults = {
hintchars: 'abcdefghijklmnopqrstuvwxyz',
smoothscroll: false,
- complete: 'sbn',
+ complete: 'sbh',
};
const docs = {
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 16:51:24 +0000