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

Merge pull request #1593 from saulrh/deprecated-browser-extension-getURL

Browse source 
browser.extension.getURL -> browser.runtime.getURL
This commit is contained in:
Oliver Blanthorn 2019-05-27 10:48:00 +01:00 • committed by GitHub
commit b61569c167
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/completions.ts
View file

@ -15,7 +15,7 @@ import { enumerate } from "@src/lib/itertools"
import { toNumber } from "@src/lib/convert"
import * as aliases from "@src/lib/aliases"
export const DEFAULT_FAVICON = browser.extension.getURL(
export const DEFAULT_FAVICON = browser.runtime.getURL(
"static/defaultFavicon.svg",
)

2
src/completions/History.ts
View file

@ -103,7 +103,7 @@ export class HistoryCompletionSource extends Completions.CompletionSourceFuse {
// In the nonewtab version, this will return `null` and upset getURL.
// Ternary op below prevents the runtime error.
const newtab = (browser.runtime.getManifest()).chrome_url_overrides.newtab
const newtaburl = newtab !== null ? browser.extension.getURL(newtab) : null
const newtaburl = newtab !== null ? browser.runtime.getURL(newtab) : null
if (!query || config.get("historyresults") === 0) {
return (await browserBg.topSites.get())
.filter(page => page.url !== newtaburl)

2
src/content/commandline_content.ts
View file

@ -24,7 +24,7 @@ const cmdline_iframe = window.document.createElementNS(
cmdline_iframe.className = "cleanslate"
cmdline_iframe.setAttribute(
"src",
browser.extension.getURL("static/commandline.html"),
browser.runtime.getURL("static/commandline.html"),
)
cmdline_iframe.setAttribute("id", "cmdline_iframe")

2
src/content/editor.ts
View file

@ -6,7 +6,7 @@ export const EditorCmds = new Proxy(_EditorCmds, {
get(target, property) {
if (target[property]) {
return (...args) => {
if ((document.activeElement as any).src === browser.extension.getURL("static/commandline.html")) {
if ((document.activeElement as any).src === browser.runtime.getURL("static/commandline.html")) {
return messageOwnTab("commandline_frame", "editor_function", [property].concat(args))
}
return _EditorCmds[property](DOM.getLastUsedInput(), ...args)

16
src/excmds.ts
View file

@ -1279,7 +1279,7 @@ export async function help(...helpItems: string[]) {
if (resolved.includes(helpItem)) break
}
if (resolved.length > 0) {
return browser.extension.getURL("static/docs/modules/_src_excmds_.html") + "#" + helpItem
return browser.runtime.getURL("static/docs/modules/_src_excmds_.html") + "#" + helpItem
}
return ""
},
@ -1294,13 +1294,13 @@ export async function help(...helpItems: string[]) {
if (helpItem in bindings) {
helpItem = bindings[helpItem].split(" ")
helpItem = ["composite", "fillcmdline"].includes(helpItem[0]) ? helpItem[1] : helpItem[0]
return browser.extension.getURL("static/docs/modules/_src_excmds_.html") + "#" + helpItem
return browser.runtime.getURL("static/docs/modules/_src_excmds_.html") + "#" + helpItem
}
}
return ""
},
// -e: look for an excmd
"-e": (settings, helpItem) => browser.extension.getURL("static/docs/modules/_src_excmds_.html") + "#" + helpItem,
"-e": (settings, helpItem) => browser.runtime.getURL("static/docs/modules/_src_excmds_.html") + "#" + helpItem,
// -s: look for a setting
"-s": (settings, helpItem) => {
let subSettings = settings
@ -1314,7 +1314,7 @@ export async function help(...helpItems: string[]) {
}
}
if (settingHelpAnchor !== "") {
return browser.extension.getURL("static/docs/classes/_src_lib_config_.default_config.html") + "#" + settingHelpAnchor.slice(0, -1)
return browser.runtime.getURL("static/docs/classes/_src_lib_config_.default_config.html") + "#" + settingHelpAnchor.slice(0, -1)
}
return ""
},
@ -1344,7 +1344,7 @@ export async function help(...helpItems: string[]) {
}, "")
}
if ((await activeTab()).url.startsWith(browser.extension.getURL("static/docs/"))) {
if ((await activeTab()).url.startsWith(browser.runtime.getURL("static/docs/"))) {
open(url)
} else {
tabopen(url)
@ -1356,7 +1356,7 @@ export async function help(...helpItems: string[]) {
*/
//#background
export async function tutor(newtab?: string) {
const tutor = browser.extension.getURL("static/clippy/1-tutor.html")
const tutor = browser.runtime.getURL("static/clippy/1-tutor.html")
if (newtab) tabopen(tutor)
else open(tutor)
}
@ -1366,7 +1366,7 @@ export async function tutor(newtab?: string) {
*/
//#background
export async function credits(excmd?: string) {
const creditspage = browser.extension.getURL("static/authors.html")
const creditspage = browser.runtime.getURL("static/authors.html")
tabopen(creditspage)
}
@ -4151,7 +4151,7 @@ export async function issue() {
logger.warning("issue(): Couldn't find textarea element in github issue page.")
return
}
let template = await (fetch(browser.extension.getURL("issue_template.md"))
let template = await (fetch(browser.runtime.getURL("issue_template.md"))
.then(resp => resp.body.getReader())
.then(reader => reader.read())
.then(r => (new TextDecoder("utf-8")).decode(r.value)))