jab2870
/
Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use string settings on default settings

Browse Source
jh-changes
Shin'ya UEOKA 5 years ago
parent da3ce77aa0
commit 16352502cf
2 changed files with 85 additions and 164 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 87
      src/shared/SettingData.ts
  2. 162
      src/shared/settings/Settings.ts

87
src/shared/SettingData.ts
Unescape View File

@ -1,5 +1,5 @@
import * as operations from './operations'; import * as operations from './operations';
import Settings from './settings/Settings'; import Settings, { DefaultSettingJSONText } from './settings/Settings';
import Keymaps from './settings/Keymaps'; import Keymaps from './settings/Keymaps';
import Search from './settings/Search'; import Search from './settings/Search';
import Properties from './settings/Properties'; import Properties from './settings/Properties';
@ -336,88 +336,5 @@ export default class SettingData {
export const DefaultSettingData: SettingData = SettingData.valueOf({ export const DefaultSettingData: SettingData = SettingData.valueOf({
source: 'json', source: 'json',
json: `{ json: DefaultSettingJSONText,
"keymaps": {
"0": { "type": "scroll.home" },
":": { "type": "command.show" },
"o": { "type": "command.show.open", "alter": false },
"O": { "type": "command.show.open", "alter": true },
"t": { "type": "command.show.tabopen", "alter": false },
"T": { "type": "command.show.tabopen", "alter": true },
"w": { "type": "command.show.winopen", "alter": false },
"W": { "type": "command.show.winopen", "alter": true },
"b": { "type": "command.show.buffer" },
"a": { "type": "command.show.addbookmark", "alter": true },
"k": { "type": "scroll.vertically", "count": -1 },
"j": { "type": "scroll.vertically", "count": 1 },
"h": { "type": "scroll.horizonally", "count": -1 },
"l": { "type": "scroll.horizonally", "count": 1 },
"<C-U>": { "type": "scroll.pages", "count": -0.5 },
"<C-D>": { "type": "scroll.pages", "count": 0.5 },
"<C-B>": { "type": "scroll.pages", "count": -1 },
"<C-F>": { "type": "scroll.pages", "count": 1 },
"gg": { "type": "scroll.top" },
"G": { "type": "scroll.bottom" },
"$": { "type": "scroll.end" },
"d": { "type": "tabs.close" },
"D": { "type": "tabs.close", "select": "left" },
"x$": { "type": "tabs.close.right" },
"!d": { "type": "tabs.close.force" },
"u": { "type": "tabs.reopen" },
"K": { "type": "tabs.prev" },
"J": { "type": "tabs.next" },
"gT": { "type": "tabs.prev" },
"gt": { "type": "tabs.next" },
"g0": { "type": "tabs.first" },
"g$": { "type": "tabs.last" },
"<C-6>": { "type": "tabs.prevsel" },
"r": { "type": "tabs.reload", "cache": false },
"R": { "type": "tabs.reload", "cache": true },
"zp": { "type": "tabs.pin.toggle" },
"zd": { "type": "tabs.duplicate" },
"zi": { "type": "zoom.in" },
"zo": { "type": "zoom.out" },
"zz": { "type": "zoom.neutral" },
"f": { "type": "follow.start", "newTab": false },
"F": { "type": "follow.start", "newTab": true, "background": false },
"m": { "type": "mark.set.prefix" },
"'": { "type": "mark.jump.prefix" },
"H": { "type": "navigate.history.prev" },
"L": { "type": "navigate.history.next" },
"[[": { "type": "navigate.link.prev" },
"]]": { "type": "navigate.link.next" },
"gu": { "type": "navigate.parent" },
"gU": { "type": "navigate.root" },
"gi": { "type": "focus.input" },
"gf": { "type": "page.source" },
"gh": { "type": "page.home" },
"gH": { "type": "page.home", "newTab": true },
"y": { "type": "urls.yank" },
"p": { "type": "urls.paste", "newTab": false },
"P": { "type": "urls.paste", "newTab": true },
"/": { "type": "find.start" },
"n": { "type": "find.next" },
"N": { "type": "find.prev" },
".": { "type": "repeat.last" },
"<S-Esc>": { "type": "addon.toggle.enabled" }
},
"search": {
"default": "google",
"engines": {
"google": "https://google.com/search?q={}",
"yahoo": "https://search.yahoo.com/search?p={}",
"bing": "https://www.bing.com/search?q={}",
"duckduckgo": "https://duckduckgo.com/?q={}",
"twitter": "https://twitter.com/search?q={}",
"wikipedia": "https://en.wikipedia.org/w/index.php?search={}"
}
},
"properties": {
"hintchars": "abcdefghijklmnopqrstuvwxyz",
"smoothscroll": false,
"complete": "sbh"
},
"blacklist": [
]
}`,
}); });

162
src/shared/settings/Settings.ts
Unescape View File

@ -69,86 +69,90 @@ export default class Settings {
} }
} }
export const DefaultSetting: Settings = Settings.fromJSON({ export const DefaultSettingJSONText = `{
keymaps: { "keymaps": {
'0': { 'type': 'scroll.home' }, "0": { "type": "scroll.home" },
':': { 'type': 'command.show' }, ":": { "type": "command.show" },
'o': { 'type': 'command.show.open', 'alter': false }, "o": { "type": "command.show.open", "alter": false },
'O': { 'type': 'command.show.open', 'alter': true }, "O": { "type": "command.show.open", "alter": true },
't': { 'type': 'command.show.tabopen', 'alter': false }, "t": { "type": "command.show.tabopen", "alter": false },
'T': { 'type': 'command.show.tabopen', 'alter': true }, "T": { "type": "command.show.tabopen", "alter": true },
'w': { 'type': 'command.show.winopen', 'alter': false }, "w": { "type": "command.show.winopen", "alter": false },
'W': { 'type': 'command.show.winopen', 'alter': true }, "W": { "type": "command.show.winopen", "alter": true },
'b': { 'type': 'command.show.buffer' }, "b": { "type": "command.show.buffer" },
'a': { 'type': 'command.show.addbookmark', 'alter': true }, "a": { "type": "command.show.addbookmark", "alter": true },
'k': { 'type': 'scroll.vertically', 'count': -1 }, "k": { "type": "scroll.vertically", "count": -1 },
'j': { 'type': 'scroll.vertically', 'count': 1 }, "j": { "type": "scroll.vertically", "count": 1 },
'h': { 'type': 'scroll.horizonally', 'count': -1 }, "h": { "type": "scroll.horizonally", "count": -1 },
'l': { 'type': 'scroll.horizonally', 'count': 1 }, "l": { "type": "scroll.horizonally", "count": 1 },
'<C-U>': { 'type': 'scroll.pages', 'count': -0.5 }, "<C-U>": { "type": "scroll.pages", "count": -0.5 },
'<C-D>': { 'type': 'scroll.pages', 'count': 0.5 }, "<C-D>": { "type": "scroll.pages", "count": 0.5 },
'<C-B>': { 'type': 'scroll.pages', 'count': -1 }, "<C-B>": { "type": "scroll.pages", "count": -1 },
'<C-F>': { 'type': 'scroll.pages', 'count': 1 }, "<C-F>": { "type": "scroll.pages", "count": 1 },
'gg': { 'type': 'scroll.top' }, "gg": { "type": "scroll.top" },
'G': { 'type': 'scroll.bottom' }, "G": { "type": "scroll.bottom" },
'$': { 'type': 'scroll.end' }, "$": { "type": "scroll.end" },
'd': { 'type': 'tabs.close' }, "d": { "type": "tabs.close" },
'D': { 'type': 'tabs.close', 'select': 'left' }, "D": { "type": "tabs.close", "select": "left" },
'x$': { 'type': 'tabs.close.right' }, "x$": { "type": "tabs.close.right" },
'!d': { 'type': 'tabs.close.force' }, "!d": { "type": "tabs.close.force" },
'u': { 'type': 'tabs.reopen' }, "u": { "type": "tabs.reopen" },
'K': { 'type': 'tabs.prev' }, "K": { "type": "tabs.prev" },
'J': { 'type': 'tabs.next' }, "J": { "type": "tabs.next" },
'gT': { 'type': 'tabs.prev' }, "gT": { "type": "tabs.prev" },
'gt': { 'type': 'tabs.next' }, "gt": { "type": "tabs.next" },
'g0': { 'type': 'tabs.first' }, "g0": { "type": "tabs.first" },
'g$': { 'type': 'tabs.last' }, "g$": { "type": "tabs.last" },
'<C-6>': { 'type': 'tabs.prevsel' }, "<C-6>": { "type": "tabs.prevsel" },
'r': { 'type': 'tabs.reload', 'cache': false }, "r": { "type": "tabs.reload", "cache": false },
'R': { 'type': 'tabs.reload', 'cache': true }, "R": { "type": "tabs.reload", "cache": true },
'zp': { 'type': 'tabs.pin.toggle' }, "zp": { "type": "tabs.pin.toggle" },
'zd': { 'type': 'tabs.duplicate' }, "zd": { "type": "tabs.duplicate" },
'zi': { 'type': 'zoom.in' }, "zi": { "type": "zoom.in" },
'zo': { 'type': 'zoom.out' }, "zo": { "type": "zoom.out" },
'zz': { 'type': 'zoom.neutral' }, "zz": { "type": "zoom.neutral" },
'f': { 'type': 'follow.start', 'newTab': false, 'background': false }, "f": { "type": "follow.start", "newTab": false },
'F': { 'type': 'follow.start', 'newTab': true, 'background': false }, "F": { "type": "follow.start", "newTab": true, "background": false },
'm': { 'type': 'mark.set.prefix' }, "m": { "type": "mark.set.prefix" },
'\'': { 'type': 'mark.jump.prefix' }, "'": { "type": "mark.jump.prefix" },
'H': { 'type': 'navigate.history.prev' }, "H": { "type": "navigate.history.prev" },
'L': { 'type': 'navigate.history.next' }, "L": { "type": "navigate.history.next" },
'[[': { 'type': 'navigate.link.prev' }, "[[": { "type": "navigate.link.prev" },
']]': { 'type': 'navigate.link.next' }, "]]": { "type": "navigate.link.next" },
'gu': { 'type': 'navigate.parent' }, "gu": { "type": "navigate.parent" },
'gU': { 'type': 'navigate.root' }, "gU": { "type": "navigate.root" },
'gi': { 'type': 'focus.input' }, "gi": { "type": "focus.input" },
'gf': { 'type': 'page.source' }, "gf": { "type": "page.source" },
'gh': { 'type': 'page.home', 'newTab': false }, "gh": { "type": "page.home" },
'gH': { 'type': 'page.home', 'newTab': true }, "gH": { "type": "page.home", "newTab": true },
'y': { 'type': 'urls.yank' }, "y": { "type": "urls.yank" },
'p': { 'type': 'urls.paste', 'newTab': false }, "p": { "type": "urls.paste", "newTab": false },
'P': { 'type': 'urls.paste', 'newTab': true }, "P": { "type": "urls.paste", "newTab": true },
'/': { 'type': 'find.start' }, "/": { "type": "find.start" },
'n': { 'type': 'find.next' }, "n": { "type": "find.next" },
'N': { 'type': 'find.prev' }, "N": { "type": "find.prev" },
'.': { 'type': 'repeat.last' }, ".": { "type": "repeat.last" },
'<S-Esc>': { 'type': 'addon.toggle.enabled' } "<S-Esc>": { "type": "addon.toggle.enabled" }
}, },
search: { "search": {
default: 'google', "default": "google",
engines: { "engines": {
'google': 'https://google.com/search?q={}', "google": "https://google.com/search?q={}",
'yahoo': 'https://search.yahoo.com/search?p={}', "yahoo": "https://search.yahoo.com/search?p={}",
'bing': 'https://www.bing.com/search?q={}', "bing": "https://www.bing.com/search?q={}",
'duckduckgo': 'https://duckduckgo.com/?q={}', "duckduckgo": "https://duckduckgo.com/?q={}",
'twitter': 'https://twitter.com/search?q={}', "twitter": "https://twitter.com/search?q={}",
'wikipedia': 'https://en.wikipedia.org/w/index.php?search={}' "wikipedia": "https://en.wikipedia.org/w/index.php?search={}"
} }
}, },
properties: { "properties": {
hintchars: 'abcdefghijklmnopqrstuvwxyz', "hintchars": "abcdefghijklmnopqrstuvwxyz",
smoothscroll: false, "smoothscroll": false,
complete: 'sbh' "complete": "sbh"
}, },
blacklist: [], "blacklist": [
}); ]
}`;
export const DefaultSetting: Settings =
Settings.fromJSON(JSON.parse(DefaultSettingJSONText));