hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-06 01:51:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Port hint -w/-wp to newfangled way

Browse source
This commit is contained in:
glacambre 2018-08-04 10:31:51 +02:00
parent 93acb6831b
commit caf76bb186
No known key found for this signature in database
GPG key ID: B9625DB1767553AC
2 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/excmds.ts
View file

@ -96,7 +96,7 @@
// Shared
import * as Messaging from "./messaging"
import { browserBg, activeTabId, activeTabContainerId, openInNewTab } from "./lib/webext"
import { browserBg, activeTabId, activeTabContainerId, openInNewTab, openInNewWindow } from "./lib/webext"
import * as Container from "./lib/containers"
import state from "./state"
import * as UrlUtil from "./url_util"
@ -3052,9 +3052,20 @@ export async function hint(option?: string, selectors?: string, ...rest: string[
} else if (option === "-r") {
selectHints = hinting.pipe_elements(DOM.elementsWithText())
onSelected = result => TTS.readText(result[0].textContent)
} else if (option === "-w") hinting.hintPageWindow()
else if (option === "-wp") hinting.hintPageWindowPrivate()
else {
} else if (option === "-w") {
selectHints = hinting.pipe_elements(hinting.hintables())
onSelected = result => {
result[0].focus()
if (result[0].href) return openInNewWindow({ url: new URL(result[0].href, window.location.href).href })
else return DOM.simulateClick(result[0])
}
} else if (option === "-wp") {
selectHints = hinting.pipe_elements(hinting.hintables())
onSelected = result => {
result[0].focus()
if (result[0].href) return openInNewWindow({ url: result[0].href, incognito: true })
}
} else {
selectHints = hinting.pipe(DOM.HINTTAGS_selectors)
onSelected = result => {
DOM.simulateClick(result[0] as HTMLElement)

21
src/hinting.ts
View file

@ -505,27 +505,6 @@ export function killables() {
import { openInNewTab, activeTabContainerId } from "./lib/webext"
import { openInNewWindow } from "./lib/webext"
export function hintPageWindow() {
hintPage(hintables(), hint => {
hint.target.focus()
if (hint.target.href) {
openInNewWindow({ url: hint.target.href })
} else {
// This is to mirror vimperator behaviour.
DOM.simulateClick(hint.target)
}
})
}
export function hintPageWindowPrivate() {
hintPage(hintables(), hint => {
hint.target.focus()
if (hint.target.href) {
openInNewWindow({ url: hint.target.href, incognito: true })
}
})
}
export function pipe(
selectors = DOM.HINTTAGS_selectors,
): Promise<[Element, number]> {