jab2870/Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Scroll on global mark and handle gone tab

Browse source
This commit is contained in:
Shin'ya Ueoka 2018-10-12 14:59:45 +09:00
parent 003742ec51
commit e248477ecb
9 changed files with 49 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/background/usecases/mark.js
View file

@ -2,17 +2,19 @@ import GlobalMark from '../domains/global-mark';
import TabPresenter from '../presenters/tab';
import MarkRepository from '../repositories/mark';
import ConsolePresenter from '../presenters/console';
import ContentMessageClient from '../infrastructures/content-message-client';
export default class MarkInteractor {
constructor() {
this.tabPresenter = new TabPresenter();
this.markRepository = new MarkRepository();
this.consolePresenter = new ConsolePresenter();
this.contentMessageClient = new ContentMessageClient();
}
async setGlobal(key, x, y) {
let tab = await this.tabPresenter.getCurrent();
let mark = new GlobalMark(tab.id, x, y);
let mark = new GlobalMark(tab.id, tab.url, x, y);
return this.markRepository.setMark(key, mark);
}
@ -23,7 +25,15 @@ export default class MarkInteractor {
if (!mark) {
return this.consolePresenter.showError(current.id, 'Mark is not set');
}
// TODO scroll pages and handle if tab is gone
return this.tabPresenter.select(mark.tabId);
return this.contentMessageClient.scrollTo(
mark.tabId, mark.x, mark.y
).then(() => {
return this.tabPresenter.select(mark.tabId);
}).catch(async() => {
let tab = await this.tabPresenter.create(mark.url);
let mark2 = new GlobalMark(tab.id, mark.url, mark.x, mark.y);
return this.markRepository.setMark(key, mark2);
});
}
}