alex/yomichan
1
Fork 0
Code Releases Activity

Cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2016-11-14 09:12:49 -08:00
parent 984a3ad756
commit 71d8cd4a32
1 changed files with 146 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

287
ext/bg/js/options-form.js
View File

@ -16,42 +16,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
//
// General
//
function yomichan() { function yomichan() {
return chrome.extension.getBackgroundPage().yomichan; return chrome.extension.getBackgroundPage().yomichan;
} }
function database() {
return yomichan().translator.database;
}
function anki() {
return yomichan().anki;
}
function fieldsToDict(selection) {
const result = {};
selection.each((index, element) => {
result[$(element).data('field')] = $(element).val();
});
return result;
}
function modelIdToFieldOptKey(id) {
return {
'anki-term-model': 'ankiTermFields',
'anki-kanji-model': 'ankiKanjiFields'
}[id];
}
function modelIdToMarkers(id) {
return {
'anki-term-model': ['audio', 'expression', 'expression-furigana', 'glossary', 'glossary-list', 'reading', 'sentence', 'tags', 'url'],
'anki-kanji-model': ['character', 'glossary', 'glossary-list', 'kunyomi', 'onyomi', 'url'],
}[id];
}
function getFormValues() { function getFormValues() {
return loadOptions().then(optsOld => { return loadOptions().then(optsOld => {
const optsNew = $.extend({}, optsOld); const optsNew = $.extend({}, optsOld);
@ -115,21 +87,92 @@ function updateVisibility(opts) {
} }
} }
//
// Dictionary
//
function database() {
return yomichan().translator.database;
}
function showDictionaryError(error) {
const dialog = $('#dict-error');
if (error) {
dialog.show().find('span').text(error);
} else {
dialog.hide();
}
}
function showDictionarySpinner(show) {
const spinner = $('#dict-spinner');
if (show) {
spinner.show();
} else {
spinner.hide();
}
}
function populateDictionaries(opts) {
showDictionaryError(null);
showDictionarySpinner(true);
const dictGroups = $('#dict-groups').empty();
const dictWarning = $('#dict-warning').hide();
let dictCount = 0;
return database().getDictionaries().then(rows => {
rows.forEach(row => {
const dictOpts = opts.dictionaries[row.title] || {enableTerms: false, enableKanji: false};
const html = Handlebars.templates['dictionary.html']({
title: row.title,
version: row.version,
hasTerms: row.hasTerms,
hasKanji: row.hasKanji,
enableTerms: dictOpts.enableTerms,
enableKanji: dictOpts.enableKanji
});
dictGroups.append($(html));
++dictCount;
});
$('.dict-enable-terms, .dict-enable-kanji').change(onOptionsChanged);
$('.dict-delete').click(onDictionaryDelete);
}).catch(error => {
showDictionaryError(error);
}).then(() => {
showDictionarySpinner(false);
if (dictCount === 0) {
dictWarning.show();
}
});
}
function onDictionaryPurge() {
showDictionaryError(null);
showDictionarySpinner(true);
const dictControls = $('#dict-importer, #dict-groups').hide();
const dictProgress = $('#dict-purge-progress').show();
return database().purge().catch(error => {
showDictionaryError(error);
}).then(() => {
showDictionarySpinner(false);
dictControls.show();
dictProgress.hide();
return loadOptions().then(opts => populateDictionaries(opts));
});
}
function onDictionaryDelete() { function onDictionaryDelete() {
showDictionaryError(null);
showDictionarySpinner(true);
const dictGroup = $(this).closest('.dict-group'); const dictGroup = $(this).closest('.dict-group');
const dictProgress = dictGroup.find('.dict-delete-progress').show();
const dictError = $('#dict-error'); const dictControls = dictGroup.find('.dict-group-controls').hide();
dictError.hide();
const dictSpinner = $('#dict-spinner');
dictSpinner.show();
const dictProgress = dictGroup.find('.dict-delete-progress');
dictProgress.show();
const dictControls = dictGroup.find('.dict-group-controls');
dictControls.hide();
const setProgress = percent => { const setProgress = percent => {
dictProgress.find('.progress-bar').css('width', `${percent}%`); dictProgress.find('.progress-bar').css('width', `${percent}%`);
}; };
@ -137,9 +180,9 @@ function onDictionaryDelete() {
setProgress(0.0); setProgress(0.0);
database().deleteDictionary(dictGroup.data('title'), (total, current) => setProgress(current / total * 100.0)).catch(error => { database().deleteDictionary(dictGroup.data('title'), (total, current) => setProgress(current / total * 100.0)).catch(error => {
dictError.show().find('span').text(error); showDictionaryError(error);
}).then(() => { }).then(() => {
dictSpinner.hide(); showDictionarySpinner(false);
dictProgress.hide(); dictProgress.hide();
dictControls.show(); dictControls.show();
return loadOptions().then(opts => populateDictionaries(opts)); return loadOptions().then(opts => populateDictionaries(opts));
@ -147,25 +190,18 @@ function onDictionaryDelete() {
} }
function onDictionaryImport() { function onDictionaryImport() {
const dictImporter = $('#dict-importer'); showDictionaryError(null);
dictImporter.hide(); showDictionarySpinner(true);
const dictError = $('#dict-error');
dictError.hide();
const dictProgress = $('#dict-import-progress');
dictProgress.show();
const dictSpinner = $('#dict-spinner');
dictSpinner.show();
const dictUrl = $('#dict-url');
const dictImporter = $('#dict-importer').hide();
const dictProgress = $('#dict-import-progress').show();
const setProgress = percent => { const setProgress = percent => {
dictProgress.find('.progress-bar').css('width', `${percent}%`); dictProgress.find('.progress-bar').css('width', `${percent}%`);
}; };
setProgress(0.0); setProgress(0.0);
const dictUrl = $('#dict-url');
loadOptions().then(opts => { loadOptions().then(opts => {
database().importDictionary(dictUrl.val(), (total, current) => setProgress(current / total * 100.0)).then(summary => { database().importDictionary(dictUrl.val(), (total, current) => setProgress(current / total * 100.0)).then(summary => {
opts.dictionaries[summary.title] = {enableTerms: summary.hasTerms, enableKanji: summary.hasKanji}; opts.dictionaries[summary.title] = {enableTerms: summary.hasTerms, enableKanji: summary.hasKanji};
@ -173,13 +209,13 @@ function onDictionaryImport() {
}).then(() => { }).then(() => {
return populateDictionaries(opts); return populateDictionaries(opts);
}).catch(error => { }).catch(error => {
dictError.show().find('span').text(error); showDictionaryError(error);
}).then(() => { }).then(() => {
showDictionaryError(false);
dictImporter.show(); dictImporter.show();
dictUrl.val(''); dictUrl.val('');
dictUrl.trigger('input'); dictUrl.trigger('input');
dictProgress.hide(); dictProgress.hide();
dictSpinner.hide();
}); });
}); });
} }
@ -203,6 +239,37 @@ function onDictionaryUpdateUrl() {
$('#dict-import').prop('disabled', $(this).val().length === 0); $('#dict-import').prop('disabled', $(this).val().length === 0);
} }
//
// Anki
//
function anki() {
return yomichan().anki;
}
function fieldsToDict(selection) {
const result = {};
selection.each((index, element) => {
result[$(element).data('field')] = $(element).val();
});
return result;
}
function modelIdToFieldOptKey(id) {
return {
'anki-term-model': 'ankiTermFields',
'anki-kanji-model': 'ankiKanjiFields'
}[id];
}
function modelIdToMarkers(id) {
return {
'anki-term-model': ['audio', 'expression', 'expression-furigana', 'glossary', 'glossary-list', 'reading', 'sentence', 'tags', 'url'],
'anki-kanji-model': ['character', 'glossary', 'glossary-list', 'kunyomi', 'onyomi', 'url'],
}[id];
}
function populateAnkiDeckAndModel(opts) { function populateAnkiDeckAndModel(opts) {
const ankiSpinner = $('#anki-spinner'); const ankiSpinner = $('#anki-spinner');
ankiSpinner.show(); ankiSpinner.show();
@ -271,69 +338,25 @@ function populateAnkiFields(element, opts) {
}); });
} }
function populateDictionaries(opts) { function onAnkiModelChanged(e) {
const dictGroups = $('#dict-groups'); if (!e.originalEvent) {
dictGroups.empty(); return;
}
const dictError = $('#dict-error'); getFormValues().then(({optsNew, optsOld}) => {
dictError.hide(); optsNew[modelIdToFieldOptKey($(this).id)] = {};
const dictWarning = $('#dict-warning'); const ankiSpinner = $('#anki-spinner');
dictWarning.hide(); ankiSpinner.show();
const dictSpinner = $('#dict-spinner'); populateAnkiFields($(this), optsNew).then(() => {
dictSpinner.show(); saveOptions(optsNew).then(() => yomichan().setOptions(optsNew));
}).catch(error => {
let dictCount = 0; $('#anki-error').show().find('span').text(error);
return database().getDictionaries().then(rows => { }).then(() => {
rows.forEach(row => { $('#anki-error').hide();
const dictOpts = opts.dictionaries[row.title] || {enableTerms: false, enableKanji: false}; ankiSpinner.hide();
const html = Handlebars.templates['dictionary.html']({
title: row.title,
version: row.version,
hasTerms: row.hasTerms,
hasKanji: row.hasKanji,
enableTerms: dictOpts.enableTerms,
enableKanji: dictOpts.enableKanji
});
dictGroups.append($(html));
++dictCount;
}); });
$('.dict-enable-terms, .dict-enable-kanji').change(onOptionsChanged);
$('.dict-delete').click(onDictionaryDelete);
}).catch(error => {
dictError.show().find('span').text(error);
}).then(() => {
if (dictCount === 0) {
dictWarning.show();
}
dictSpinner.hide();
});
}
function onPurgeDb() {
const dictControls = $('#dict-importer, #dict-groups');
dictControls.hide();
const dictProgress = $('#dict-purge-progress');
dictProgress.show();
const dictError = $('#dict-error');
dictError.hide();
const dictSpinner = $('#dict-spinner');
dictSpinner.show();
return database().purge().catch(error => {
dictError.show().find('span').text(error);
}).then(() => {
dictSpinner.hide();
dictProgress.hide();
dictControls.show();
return loadOptions().then(opts => populateDictionaries(opts));
}); });
} }
@ -362,27 +385,9 @@ function onOptionsChanged(e) {
}); });
} }
function onAnkiModelChanged(e) { //
if (!e.originalEvent) { // Initialization
return; //
}
getFormValues().then(({optsNew, optsOld}) => {
optsNew[modelIdToFieldOptKey($(this).id)] = {};
const ankiSpinner = $('#anki-spinner');
ankiSpinner.show();
populateAnkiFields($(this), optsNew).then(() => {
saveOptions(optsNew).then(() => yomichan().setOptions(optsNew));
}).catch(error => {
$('#anki-error').show().find('span').text(error);
}).then(() => {
$('#anki-error').hide();
ankiSpinner.hide();
});
});
}
$(document).ready(() => { $(document).ready(() => {
Handlebars.partials = Handlebars.templates; Handlebars.partials = Handlebars.templates;
@ -407,7 +412,7 @@ $(document).ready(() => {
$('input, select').not('.anki-model').change(onOptionsChanged); $('input, select').not('.anki-model').change(onOptionsChanged);
$('.anki-model').change(onAnkiModelChanged); $('.anki-model').change(onAnkiModelChanged);
$('#dict-purge').click(onPurgeDb); $('#dict-purge').click(onDictionaryPurge);
$('#dict-importer a').click(onDictionarySetUrl); $('#dict-importer a').click(onDictionarySetUrl);
$('#dict-import').click(onDictionaryImport); $('#dict-import').click(onDictionaryImport);
$('#dict-url').on('input', onDictionaryUpdateUrl); $('#dict-url').on('input', onDictionaryUpdateUrl);