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

Merge pull request #309 from ueokande/default-properties

Browse source 
Default properties
This commit is contained in:
Shin'ya Ueoka 2018-01-14 00:14:08 +00:00 • committed by GitHub
commit d4450b3e98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/shared/settings/default.js
View file

@ -60,9 +60,9 @@ export default {
"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": {
} }
}`, }`,
}; };

4
src/shared/settings/storage.js
View file

@ -18,7 +18,9 @@ const loadValue = () => {
} else if (settings.source === 'form') { } else if (settings.source === 'form') {
value = settingsValues.valueFromForm(settings.form); value = settingsValues.valueFromForm(settings.form);
} }
return value; return Object.assign({},
settingsValues.valueFromJson(DefaultSettings.json),
value);
}); });
}; };