alex/yomichan
1
Fork 0
Code Releases Activity

Merge pull request #213 from toasted-nutbread/options-isolation

Browse Source 
Isolate options objects created via settings.js
This commit is contained in:
Alex Yatskov 2019-09-15 11:34:34 -07:00 committed by GitHub
commit 5877861277
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ext/bg/js/settings.js
View File

@ -60,7 +60,7 @@ async function formRead(options) {
const optionsAnkiEnableOld = options.anki.enable; const optionsAnkiEnableOld = options.anki.enable;
options.anki.enable = $('#anki-enable').prop('checked'); options.anki.enable = $('#anki-enable').prop('checked');
options.anki.tags = $('#card-tags').val().split(/[,; ]+/); options.anki.tags = utilBackgroundIsolate($('#card-tags').val().split(/[,; ]+/));
options.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10); options.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10);
options.anki.server = $('#interface-server').val(); options.anki.server = $('#interface-server').val();
options.anki.screenshot.format = $('#screenshot-format').val(); options.anki.screenshot.format = $('#screenshot-format').val();
@ -70,20 +70,20 @@ async function formRead(options) {
if (optionsAnkiEnableOld && !ankiErrorShown()) { if (optionsAnkiEnableOld && !ankiErrorShown()) {
options.anki.terms.deck = $('#anki-terms-deck').val(); options.anki.terms.deck = $('#anki-terms-deck').val();
options.anki.terms.model = $('#anki-terms-model').val(); options.anki.terms.model = $('#anki-terms-model').val();
options.anki.terms.fields = ankiFieldsToDict($('#terms .anki-field-value')); options.anki.terms.fields = utilBackgroundIsolate(ankiFieldsToDict($('#terms .anki-field-value')));
options.anki.kanji.deck = $('#anki-kanji-deck').val(); options.anki.kanji.deck = $('#anki-kanji-deck').val();
options.anki.kanji.model = $('#anki-kanji-model').val(); options.anki.kanji.model = $('#anki-kanji-model').val();
options.anki.kanji.fields = ankiFieldsToDict($('#kanji .anki-field-value')); options.anki.kanji.fields = utilBackgroundIsolate(ankiFieldsToDict($('#kanji .anki-field-value')));
} }
options.general.mainDictionary = $('#dict-main').val(); options.general.mainDictionary = $('#dict-main').val();
$('.dict-group').each((index, element) => { $('.dict-group').each((index, element) => {
const dictionary = $(element); const dictionary = $(element);
options.dictionaries[dictionary.data('title')] = { options.dictionaries[dictionary.data('title')] = utilBackgroundIsolate({
priority: parseInt(dictionary.find('.dict-priority').val(), 10), priority: parseInt(dictionary.find('.dict-priority').val(), 10),
enabled: dictionary.find('.dict-enabled').prop('checked'), enabled: dictionary.find('.dict-enabled').prop('checked'),
allowSecondarySearches: dictionary.find('.dict-allow-secondary-searches').prop('checked') allowSecondarySearches: dictionary.find('.dict-allow-secondary-searches').prop('checked')
}; });
}); });
} }
@ -426,7 +426,7 @@ async function onDictionaryPurge(e) {
await utilDatabasePurge(); await utilDatabasePurge();
const optionsContext = getOptionsContext(); const optionsContext = getOptionsContext();
const options = await apiOptionsGet(optionsContext); const options = await apiOptionsGet(optionsContext);
options.dictionaries = {}; options.dictionaries = utilBackgroundIsolate({});
options.general.mainDictionary = ''; options.general.mainDictionary = '';
await settingsSaveOptions(); await settingsSaveOptions();
@ -468,7 +468,11 @@ async function onDictionaryImport(e) {
const summary = await utilDatabaseImport(e.target.files[0], updateProgress, exceptions); const summary = await utilDatabaseImport(e.target.files[0], updateProgress, exceptions);
const optionsContext = getOptionsContext(); const optionsContext = getOptionsContext();
const options = await apiOptionsGet(optionsContext); const options = await apiOptionsGet(optionsContext);
options.dictionaries[summary.title] = {enabled: true, priority: 0, allowSecondarySearches: false}; options.dictionaries[summary.title] = utilBackgroundIsolate({
enabled: true,
priority: 0,
allowSecondarySearches: false
});
if (summary.sequenced && options.general.mainDictionary === '') { if (summary.sequenced && options.general.mainDictionary === '') {
options.general.mainDictionary = summary.title; options.general.mainDictionary = summary.title;
} }
@ -621,7 +625,7 @@ async function onAnkiModelChanged(e) {
const optionsContext = getOptionsContext(); const optionsContext = getOptionsContext();
const options = await apiOptionsGet(optionsContext); const options = await apiOptionsGet(optionsContext);
await formRead(options); await formRead(options);
options.anki[tabId].fields = {}; options.anki[tabId].fields = utilBackgroundIsolate({});
await settingsSaveOptions(); await settingsSaveOptions();
ankiSpinnerShow(true); ankiSpinnerShow(true);

5
ext/bg/js/util.js
View File

@ -26,6 +26,11 @@ function utilIsolate(data) {
return JSON.parse(JSON.stringify(data)); return JSON.parse(JSON.stringify(data));
} }
function utilBackgroundIsolate(data) {
const backgroundPage = chrome.extension.getBackgroundPage();
return backgroundPage.utilIsolate(data);
}
function utilSetEqual(setA, setB) { function utilSetEqual(setA, setB) {
if (setA.size !== setB.size) { if (setA.size !== setB.size) {
return false; return false;