mirror of
https://github.com/vale981/tridactyl
synced 2025-03-05 17:41:40 -05:00
Add basic configuration with set
Currently does not import previous binds
This commit is contained in:
Oliver Blanthorn
parent
b990125792
commit
da68d5f398
3 changed files with 144 additions and 83 deletions
120
src/config.ts
Normal file
120
src/config.ts
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
// Sketch
|
||||
//
|
||||
// Need an easy way of getting and setting settings
|
||||
// If a setting is not set, the default should probably be returned.
|
||||
// That probably means that binds etc. should be per-key?
|
||||
//
|
||||
// We should probably store all settings in memory, and only load from storage on startup and when we set it
|
||||
//
|
||||
// Really, we'd like a way of just letting things use the variables
|
||||
//
|
||||
const CONFIGNAME = "userconfig"
|
||||
|
||||
type StorageMap = browser.storage.StorageMap
|
||||
|
||||
// make a naked object
|
||||
function o(object){
|
||||
return Object.assign(Object.create(null),object)
|
||||
}
|
||||
|
||||
let USERCONFIG = o({})
|
||||
const DEFAULTS = o({
|
||||
"nmaps": o({
|
||||
"o": "fillcmdline open",
|
||||
"O": "current_url open",
|
||||
"w": "fillcmdline winopen",
|
||||
"W": "current_url winopen",
|
||||
"t": "fillcmdline tabopen",
|
||||
//["t": "fillcmdline tabopen", // for now, use mozilla completion
|
||||
"]]": "followpage next",
|
||||
"[[": "followpage prev",
|
||||
"[c": "urlincrement -1",
|
||||
"]c": "urlincrement 1",
|
||||
"T": "current_url tabopen",
|
||||
"yy": "clipboard yank",
|
||||
"ys": "clipboard yankshort",
|
||||
"yc": "clipboard yankcanon",
|
||||
"p": "clipboard open",
|
||||
"P": "clipboard tabopen",
|
||||
"j": "scrollline 10",
|
||||
"k": "scrollline -10",
|
||||
"h": "scrollpx -50",
|
||||
"l": "scrollpx 50",
|
||||
"G": "scrollto 100",
|
||||
"gg": "scrollto 0",
|
||||
"H": "back",
|
||||
"L": "forward",
|
||||
"d": "tabclose",
|
||||
"u": "undo",
|
||||
"r": "reload",
|
||||
"R": "reloadhard",
|
||||
"gi": "focusinput -l",
|
||||
"gt": "tabnext_gt",
|
||||
"gT": "tabprev",
|
||||
"g^": "tabfirst",
|
||||
"g$": "tablast",
|
||||
"gr": "reader",
|
||||
"gu": "urlparent",
|
||||
"gU": "urlroot",
|
||||
":": "fillcmdline",
|
||||
"s": "fillcmdline open google",
|
||||
"S": "fillcmdline tabopen google",
|
||||
"M": "gobble 1 quickmark",
|
||||
"xx": "something",
|
||||
// "B": "fillcmdline bufferall",
|
||||
"b": "fillcmdline buffer",
|
||||
"ZZ": "qall",
|
||||
"f": "hint",
|
||||
"F": "hint -b",
|
||||
";i": "hint -i",
|
||||
";I": "hint -I",
|
||||
";y": "hint -y",
|
||||
";p": "hint -p",
|
||||
";;": "hint -;",
|
||||
";#": "hint -#",
|
||||
"I": "mode ignore",
|
||||
"a": "current_url bmark",
|
||||
"A": "bmark",
|
||||
})
|
||||
})
|
||||
|
||||
// currently only supports 2D or 1D storage
|
||||
export function get(target, property?){
|
||||
console.log(DEFAULTS)
|
||||
if (property !== undefined){
|
||||
if (USERCONFIG[target] !== undefined){
|
||||
return USERCONFIG[target][property] || DEFAULTS[target][property]
|
||||
}
|
||||
else return DEFAULTS[target][property]
|
||||
}
|
||||
// god knows what happens if it isn't an object
|
||||
if (typeof DEFAULTS[target] === "object") return Object.assign(DEFAULTS[target],USERCONFIG[target])
|
||||
else return DEFAULTS[target] || USERCONFIG[target]
|
||||
}
|
||||
|
||||
// if you don't specify a property and you should, this will wipe everything
|
||||
export function set(target, value, property?){
|
||||
if (property !== undefined){
|
||||
if (USERCONFIG[target] === undefined) USERCONFIG[target] = o({})
|
||||
return USERCONFIG[target][property] = value
|
||||
}
|
||||
USERCONFIG[target] = value
|
||||
}
|
||||
|
||||
export async function save(storage: "local" | "sync" = "sync"){
|
||||
let storageobj = storage == "local" ? browser.storage.local : browser.storage.sync
|
||||
storageobj.set({CONFIGNAME: USERCONFIG}).then(schlepp)
|
||||
}
|
||||
|
||||
|
||||
// Read all user configuration on start
|
||||
// Local storage overrides sync
|
||||
browser.storage.sync.get(CONFIGNAME).then(settings => {
|
||||
schlepp(settings)
|
||||
browser.storage.local.get(CONFIGNAME).then(schlepp)
|
||||
})
|
||||
|
||||
function schlepp(settings){
|
||||
// "Import" is a reserved so this will have to do
|
||||
Object.assign(USERCONFIG,settings[CONFIGNAME])
|
||||
}
|
||||
|
|
@ -1024,6 +1024,25 @@ export async function quickmark(key: string) {
|
|||
await bind("gw" + key, "winopen", address)
|
||||
}
|
||||
|
||||
//#background_helper
|
||||
import * as config from './config'
|
||||
|
||||
//#background
|
||||
export function get(target: string, property?: string){
|
||||
console.log(config.get(target,property))
|
||||
}
|
||||
|
||||
//#background
|
||||
export function set(target: string, value: string){
|
||||
config.set(target,value)
|
||||
}
|
||||
|
||||
//#background
|
||||
export function bind2(key: string, ...bindarr: string[]){
|
||||
let exstring = bindarr.join(" ")
|
||||
config.set("nmaps",exstring,key)
|
||||
}
|
||||
|
||||
// }}}
|
||||
|
||||
// {{{ HINTMODE
|
||||
|
|
|
|||
|
|
@ -3,88 +3,10 @@
|
|||
differs from Vim in that no map may be a prefix of another map (e.g. 'g' and 'gg' cannot both be maps). This simplifies the parser.
|
||||
*/
|
||||
|
||||
// Normal-mode mappings.
|
||||
// keystr -> ex_str
|
||||
// TODO: Move these into a tridactyl-wide state namespace
|
||||
// TODO: stop stealing keys from "insert mode"
|
||||
// r -> refresh page is particularly unhelpful
|
||||
// Can't stringify a map -> just use an object
|
||||
export const DEFAULTNMAPS = {
|
||||
"o": "fillcmdline open",
|
||||
"O": "current_url open",
|
||||
"w": "fillcmdline winopen",
|
||||
"W": "current_url winopen",
|
||||
"t": "fillcmdline tabopen",
|
||||
//["t": "fillcmdline tabopen", // for now, use mozilla completion
|
||||
"]]": "followpage next",
|
||||
"[[": "followpage prev",
|
||||
"[c": "urlincrement -1",
|
||||
"]c": "urlincrement 1",
|
||||
"T": "current_url tabopen",
|
||||
"yy": "clipboard yank",
|
||||
"ys": "clipboard yankshort",
|
||||
"yc": "clipboard yankcanon",
|
||||
"p": "clipboard open",
|
||||
"P": "clipboard tabopen",
|
||||
"j": "scrollline 10",
|
||||
"k": "scrollline -10",
|
||||
"h": "scrollpx -50",
|
||||
"l": "scrollpx 50",
|
||||
"G": "scrollto 100",
|
||||
"gg": "scrollto 0",
|
||||
"H": "back",
|
||||
"L": "forward",
|
||||
"d": "tabclose",
|
||||
"u": "undo",
|
||||
"r": "reload",
|
||||
"R": "reloadhard",
|
||||
"gi": "focusinput -l",
|
||||
"gt": "tabnext_gt",
|
||||
"gT": "tabprev",
|
||||
"g^": "tabfirst",
|
||||
"g$": "tablast",
|
||||
"gr": "reader",
|
||||
"gu": "urlparent",
|
||||
"gU": "urlroot",
|
||||
":": "fillcmdline",
|
||||
"s": "fillcmdline open google",
|
||||
"S": "fillcmdline tabopen google",
|
||||
"M": "gobble 1 quickmark",
|
||||
"xx": "something",
|
||||
// "B": "fillcmdline bufferall",
|
||||
"b": "fillcmdline buffer",
|
||||
"ZZ": "qall",
|
||||
"f": "hint",
|
||||
"F": "hint -b",
|
||||
";i": "hint -i",
|
||||
";I": "hint -I",
|
||||
";y": "hint -y",
|
||||
";p": "hint -p",
|
||||
";;": "hint -;",
|
||||
";#": "hint -#",
|
||||
"I": "mode ignore",
|
||||
"a": "current_url bmark",
|
||||
"A": "bmark",
|
||||
// Special keys must be prepended with 🄰
|
||||
// ["🄰Backspace", "something"],
|
||||
}
|
||||
import * as config from '../config'
|
||||
|
||||
let nmaps = Object.assign(Object.create(null), DEFAULTNMAPS)
|
||||
let nmaps = config.get("nmaps")
|
||||
|
||||
// Allow config to be changed in settings
|
||||
// TODO: make this more general
|
||||
browser.storage.sync.get("nmaps").then(lazyloadconfig)
|
||||
async function lazyloadconfig(storageResult){
|
||||
nmaps = Object.assign(Object.create(null), DEFAULTNMAPS, storageResult.nmaps)
|
||||
console.log(nmaps)
|
||||
}
|
||||
|
||||
browser.storage.onChanged.addListener(
|
||||
(changes, areaname) => {
|
||||
if (areaname == "sync") {
|
||||
browser.storage.sync.get("nmaps").then(lazyloadconfig)
|
||||
}
|
||||
})
|
||||
|
||||
// Split a string into a number prefix and some following keys.
|
||||
function keys_split_count(keys: string[]){
|
||||
|
|
@ -101,7 +23,7 @@ function keys_split_count(keys: string[]){
|
|||
// Given a valid keymap, resolve it to an ex_str
|
||||
function resolve_map(map) {
|
||||
// TODO: This needs to become recursive to allow maps to be defined in terms of other maps.
|
||||
return nmaps[map]
|
||||
return config.get("nmaps")[map]
|
||||
}
|
||||
|
||||
// Valid keystr to ex_str by splitting count, resolving keystr and appending count as final argument.
|
||||
|
|
@ -121,7 +43,7 @@ function possible_maps(keys): string[] {
|
|||
let [count, keystr] = keys_split_count(keys)
|
||||
|
||||
// Short circuit or search maps.
|
||||
if (Object.getOwnPropertyNames(nmaps).includes(keystr)) {
|
||||
if (Object.getOwnPropertyNames(config.get("nmaps")).includes(keystr)) {
|
||||
return [keystr,]
|
||||
} else {
|
||||
// Efficiency: this can be short-circuited.
|
||||
|
|
@ -131,7 +53,7 @@ function possible_maps(keys): string[] {
|
|||
|
||||
// A list of maps that start with the fragment.
|
||||
export function completions(fragment): string[] {
|
||||
let posskeystrs = Array.from(Object.keys(nmaps))
|
||||
let posskeystrs = Array.from(Object.keys(config.get("nmaps")))
|
||||
return posskeystrs.filter((key)=>key.startsWith(fragment))
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue