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

Fix #194: add searchsetkeyword [keyword] [url]

Browse source 
Also, add config to the `tri` namespace for debugging.
This commit is contained in:
Oliver Blanthorn 2017-12-03 11:30:44 +00:00
parent e416c9afe4
commit 11b208c2a2
No known key found for this signature in database
GPG key ID: 2BB8C36BB504BFF3
4 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/background.ts
View file

@ -19,6 +19,7 @@ import * as excmds from './excmds_background'
import * as commandline_background from './commandline_background'
import * as controller from './controller'
import * as convert from './convert'
import * as config from './config'
import * as dom from './dom'
import * as hinting_background from './hinting_background'
import * as gobble_mode from './parsers/gobblemode'
@ -34,6 +35,7 @@ import * as webext from './lib/webext'
commandline_background,
controller,
convert,
config,
dom,
hinting_background,
gobble_mode,

19
src/config.ts
View file

@ -80,6 +80,25 @@ const DEFAULTS = o({
"A": "bmark",
}),
"searchengine": "google",
"searchurls": o({
"google":"https://www.google.com/search?q=",
"googleuk":"https://www.google.co.uk/search?q=",
"bing":"https://www.bing.com/search?q=",
"duckduckgo":"https://duckduckgo.com/?q=",
"yahoo":"https://search.yahoo.com/search?p=",
"twitter":"https://twitter.com/search?q=",
"wikipedia":"https://en.wikipedia.org/wiki/Special:Search/",
"youtube":"https://www.youtube.com/results?search_query=",
"amazon":"https://www.amazon.com/s/ref=nb_sb_noss?url=search-alias%3Daps&field-keywords=",
"amazonuk":"https://www.amazon.co.uk/s/ref=nb_sb_noss?url=search-alias%3Daps&field-keywords=",
"startpage":"https://www.startpage.com/do/search?query=",
"github":"https://github.com/search?utf8=✓&q=",
"searx":"https://searx.me/?category_general=on&q=",
"cnrtl":"http://www.cnrtl.fr/lexicographie/",
"osm":"https://www.openstreetmap.org/search?query=",
"mdn":"https://developer.mozilla.org/en-US/search?q=",
"gentoo_wiki":"https://wiki.gentoo.org/index.php?title=Special%3ASearch&profile=default&fulltext=Search&search=",
}),
"newtab": undefined,
"storageloc": "sync",
"homepages": [],

2
src/content.ts
View file

@ -14,6 +14,7 @@ console.log("Tridactyl content script loaded, boss!")
// Add various useful modules to the window for debugging
import * as commandline_content from './commandline_content'
import * as convert from './convert'
import * as config from './config'
import * as dom from './dom'
import * as excmds from './excmds_content'
import * as hinting_content from './hinting'
@ -28,6 +29,7 @@ import * as webext from './lib/webext'
browserBg: webext.browserBg,
commandline_content,
convert,
config,
dom,
excmds,
hinting_content,

31
src/excmds.ts
View file

@ -75,26 +75,6 @@ import * as config from './config'
//#background_helper
export const cmd_params = new Map<string, Map<string, string>>()
const SEARCH_URLS = new Map<string, string>([
["google","https://www.google.com/search?q="],
["googleuk","https://www.google.co.uk/search?q="],
["bing","https://www.bing.com/search?q="],
["duckduckgo","https://duckduckgo.com/?q="],
["yahoo","https://search.yahoo.com/search?p="],
["twitter","https://twitter.com/search?q="],
["wikipedia","https://en.wikipedia.org/wiki/Special:Search/"],
["youtube","https://www.youtube.com/results?search_query="],
["amazon","https://www.amazon.com/s/ref=nb_sb_noss?url=search-alias%3Daps&field-keywords="],
["amazonuk","https://www.amazon.co.uk/s/ref=nb_sb_noss?url=search-alias%3Daps&field-keywords="],
["startpage","https://www.startpage.com/do/search?query="],
["github","https://github.com/search?utf8=✓&q="],
["searx","https://searx.me/?category_general=on&q="],
["cnrtl","http://www.cnrtl.fr/lexicographie/"],
["osm","https://www.openstreetmap.org/search?query="],
["mdn","https://developer.mozilla.org/en-US/search?q="],
["gentoo_wiki","https://wiki.gentoo.org/index.php?title=Special%3ASearch&profile=default&fulltext=Search&search="],
])
// map a page-relation (next or previous) to a fallback pattern to match link texts against
const REL_PATTERN = {
next: /^(?:next|newer)\b|»|>>/i,
@ -109,8 +89,9 @@ function hasScheme(uri: string) {
/** @hidden */
function searchURL(provider: string, query: string) {
if (provider == "search") provider = config.get("searchengine")
if (SEARCH_URLS.has(provider)) {
const url = new URL(SEARCH_URLS.get(provider) + encodeURIComponent(query))
let searchurlprovider = config.get("searchurls", provider)
if (searchurlprovider !== undefined){
const url = new URL(searchurlprovider + encodeURIComponent(query))
// URL constructor doesn't convert +s because they're valid literals in
// the standard it adheres to. But they are special characters in
// x-www-form-urlencoded and e.g. google excepts query parameters in
@ -1005,6 +986,12 @@ export function bind(key: string, ...bindarr: string[]){
config.set("nmaps",exstring,key)
}
/** Set a search engine keyword for use with *open or `set searchengine` */
//#background
export function searchsetkeyword(keyword: string, url: string){
config.set("searchurls",forceURI(url),keyword)
}
/** Unbind a sequence of keys so that they do nothing at all.
See also: