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

Special case 'about:blank' and '' in :open

Browse source
This commit is contained in:
Colin Caine 2018-04-19 16:35:10 +01:00
parent ec51fbba88
commit a11d7704a8
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/excmds.ts
View file

@ -87,7 +87,7 @@
// Shared // Shared
import * as Messaging from "./messaging" import * as Messaging from "./messaging"
import { l } from "./lib/webext" import { l, browserBg, activeTabId } from "./lib/webext"
import state from "./state" import state from "./state"
import * as UrlUtil from "./url_util" import * as UrlUtil from "./url_util"
import * as config from "./config" import * as config from "./config"
@ -114,7 +114,7 @@ import { flatten } from "./itertools"
import "./number.mod" import "./number.mod"
import { ModeName } from "./state" import { ModeName } from "./state"
import * as keydown from "./keydown_background" import * as keydown from "./keydown_background"
import { activeTab, activeTabId, firefoxVersionAtLeast, openInNewTab } from "./lib/webext" import { activeTab, firefoxVersionAtLeast, openInNewTab } from "./lib/webext"
import * as CommandLineBackground from "./commandline_background" import * as CommandLineBackground from "./commandline_background"
/** @hidden */ /** @hidden */
@ -375,10 +375,16 @@ export async function reloadhard(n = 1) {
"searchengine": "google" or any of [[SEARCH_URLS]] "searchengine": "google" or any of [[SEARCH_URLS]]
*/ */
//#content //#content
export function open(...urlarr: string[]) { export async function open(...urlarr: string[]) {
let url = urlarr.join(" ") let url = urlarr.join(" ")
if (url === "") url = config.get("newtab") || browser.extension.getURL("static/newtab.html")
window.location.href = forceURI(url) // Setting window.location to about:blank results in a page we can't access, tabs.update works.
// tabs.update goes to the new tab page if url === "".
if (["", "about:blank"].includes(url)) {
browserBg.tabs.update(await activeTabId(), { url })
} else {
window.location.href = forceURI(url)
}
} }
/** @hidden */ /** @hidden */