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

Merge pull request #4867 from dcaixinha/make-tabgrab-and-tabpush-move-to-next-tab

Browse source 
Make `tabgrab` and `tabpush` move to next tabgrab
This commit is contained in:
Oliver Blanthorn 2023-12-12 17:01:47 +00:00 • committed by GitHub
commit 5727425ecf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/excmds.ts
View file

@ -74,7 +74,7 @@
// Shared
import * as Messaging from "@src/lib/messaging"
import { ownWinTriIndex, getTriVersion, browserBg, activeTab, activeTabId, activeTabContainerId, openInNewTab, openInNewWindow, openInTab, queryAndURLwrangler, goToTab, getSortedTabs, prevActiveTab } from "@src/lib/webext"
import { ownWinTriIndex, getTriVersion, browserBg, activeTab, activeTabOnWindow, activeTabId, activeTabContainerId, openInNewTab, openInNewWindow, openInTab, queryAndURLwrangler, goToTab, getSortedTabs, prevActiveTab } from "@src/lib/webext"
import * as Container from "@src/lib/containers"
import state from "@src/state"
import * as State from "@src/state"
@ -2639,7 +2639,15 @@ export async function tabpush(windowId?: number) {
windows.sort((w1, w2) => w1.id - w2.id)
const nextWindow = windows[(windows.findIndex(window => window.id === currentWindow.id) + 1) % windows.length]
const tabId = await activeTabId()
return browser.tabs.move(tabId, { index: -1, windowId: windowId ?? nextWindow.id })
const winId = windowId ?? nextWindow.id
const pos = await config.getAsync("tabopenpos")
switch (pos) {
case "last":
return browser.tabs.move(tabId, { index: -1, windowId: winId })
default:
let index = (await activeTabOnWindow(winId)).index + 1
return browser.tabs.move(tabId, { index: index, windowId: winId })
}
}
/** Switch to the tab currently playing audio, if any. */
@ -2699,7 +2707,14 @@ export async function tabgrab(id: string) {
// Figure out where it should be put
const windowId = (await browser.windows.getLastFocused({ windowTypes: ["normal"] })).id
// Move window
return browser.tabs.move(tabid, { index: -1, windowId })
const pos = await config.getAsync("tabopenpos")
switch (pos) {
case "last":
return browser.tabs.move(tabid, { index: -1, windowId })
default:
let index = (await activeTab()).index + 1
return browser.tabs.move(tabid, { index: index, windowId })
}
}
/** Like [[open]], but in a new tab. If no address is given, it will open the newtab page, which can be set with `set newtab [url]`

9
src/lib/webext.ts
View file

@ -84,6 +84,15 @@ export async function activeTab() {
)[0]
}
export async function activeTabOnWindow(windowId?: number) {
return (
await browser.tabs.query({
windowId: windowId,
active: true
})
)[0]
}
export async function activeTabId() {
return (await activeTab()).id
}