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

Merge pull request #1072 from tridactyl/exclaim_why

Browse source 
[RFC] Try to make exclaim give better errors
This commit is contained in:
Oliver Blanthorn 2018-10-12 17:11:05 +01:00 • committed by GitHub
commit a555c6a330
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/excmds.ts
View file

@ -749,7 +749,7 @@ export function cssparse(...css: string[]) {
/** @hidden */ /** @hidden */
//#background //#background
export async function loadtheme(themename: string) { export async function loadtheme(themename: string) {
if (!await Native.nativegate("0.1.9")) return if (!(await Native.nativegate("0.1.9"))) return
const separator = (await browserBg.runtime.getPlatformInfo().os) == "win" ? "\\" : "/" const separator = (await browserBg.runtime.getPlatformInfo().os) == "win" ? "\\" : "/"
// remove the "tridactylrc" bit so that we're left with the directory // remove the "tridactylrc" bit so that we're left with the directory
const path = const path =
@ -871,7 +871,9 @@ export async function nativeopen(url: string, ...firefoxArgs: string[]) {
*/ */
//#background //#background
export async function exclaim(...str: string[]) { export async function exclaim(...str: string[]) {
fillcmdline((await Native.run(str.join(" "))).content) if (await Native.nativegate()) {
fillcmdline((await Native.run(str.join(" "))).content)
}
} // should consider how to give option to fillcmdline or not. We need flags. } // should consider how to give option to fillcmdline or not. We need flags.
/** /**
@ -879,7 +881,9 @@ export async function exclaim(...str: string[]) {
*/ */
//#background //#background
export async function exclaim_quiet(...str: string[]) { export async function exclaim_quiet(...str: string[]) {
return (await Native.run(str.join(" "))).content if (await Native.nativegate()) {
return (await Native.run(str.join(" "))).content
}
} }
/** /**

11
src/lib/config.ts
View file

@ -589,15 +589,16 @@ class default_config {
* Logging levels. Unless you're debugging Tridactyl, it's unlikely you'll ever need to change these. * Logging levels. Unless you're debugging Tridactyl, it's unlikely you'll ever need to change these.
*/ */
logging: { [key: string]: LoggingLevel } = { logging: { [key: string]: LoggingLevel } = {
messaging: "warning",
cmdline: "warning", cmdline: "warning",
controller: "warning",
containers: "warning", containers: "warning",
hinting: "warning", controller: "warning",
state: "warning",
excmd: "error", excmd: "error",
styling: "warning", hinting: "warning",
messaging: "warning",
native: "warning",
performance: "warning", performance: "warning",
state: "warning",
styling: "warning",
} }
noiframeon: string[] = [] noiframeon: string[] = []