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

Merge pull request #1194 from glacambre/fix_1193

Browse source 
config.ts: Fix getURL not merging site-specific config objects
This commit is contained in:
Oliver Blanthorn 2018-11-26 11:57:05 +00:00 • committed by GitHub
commit cd2f964136
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/lib/config.ts
View file

@ -806,21 +806,33 @@ export function mergeDeep(o1, o2) {
export function getURL(url, target) {
if (!USERCONFIG.subconfigs) return undefined
let key =
// For each key
// For each key
return (
Object.keys(USERCONFIG.subconfigs)
// Keep only the ones that have a match
.filter(k => url.match(k))
// Sort them from highest to lowest priority, default to a priority of 10
.filter(
k =>
url.match(k) &&
getDeepProperty(USERCONFIG.subconfigs[k], target) !=
undefined,
)
// Sort them from lowest to highest priority, default to a priority of 10
.sort(
(k1, k2) =>
(USERCONFIG.subconfigs[k2].priority || 10) -
(USERCONFIG.subconfigs[k1].priority || 10),
(USERCONFIG.subconfigs[k1].priority || 10) -
(USERCONFIG.subconfigs[k2].priority || 10),
)
// Get the first config name that has `target`
.find(k => getDeepProperty(USERCONFIG.subconfigs[k], target))
return getDeepProperty(USERCONFIG.subconfigs[key], target)
// Merge their corresponding value if they're objects, otherwise return the last value
.reduce((acc, curKey) => {
let curVal = getDeepProperty(
USERCONFIG.subconfigs[curKey],
target,
)
if (acc instanceof Object && curVal instanceof Object)
return mergeDeep(acc, curVal)
return curVal
}, {})
)
}
/** Get the value of the key target.