Merge branch 'master' into firefox-amo
This commit is contained in:
commit
bea50cca46
@ -25,7 +25,7 @@ function formRead() {
|
||||
return optionsLoad().then(optionsOld => {
|
||||
const optionsNew = $.extend(true, {}, optionsOld);
|
||||
|
||||
optionsNew.general.audioPlayback = $('#audio-playback-buttons').prop('checked');
|
||||
optionsNew.general.audioSource = $('#audio-playback-source').val();
|
||||
optionsNew.general.audioVolume = $('#audio-playback-volume').val();
|
||||
optionsNew.general.groupResults = $('#group-terms-results').prop('checked');
|
||||
optionsNew.general.softKatakana = $('#soft-katakana-search').prop('checked');
|
||||
@ -111,7 +111,7 @@ $(document).ready(() => {
|
||||
handlebarsRegister();
|
||||
|
||||
optionsLoad().then(options => {
|
||||
$('#audio-playback-buttons').prop('checked', options.general.audioPlayback);
|
||||
$('#audio-playback-source').val(options.general.audioSource);
|
||||
$('#audio-playback-volume').val(options.general.audioVolume);
|
||||
$('#group-terms-results').prop('checked', options.general.groupResults);
|
||||
$('#soft-katakana-search').prop('checked', options.general.softKatakana);
|
||||
|
||||
@ -25,9 +25,6 @@ function promiseCallback(promise, callback) {
|
||||
return promise.then(result => {
|
||||
callback({result});
|
||||
}).catch(error => {
|
||||
/* eslint-disable */
|
||||
console.log(error);
|
||||
/* eslint-enable */
|
||||
callback({error});
|
||||
});
|
||||
}
|
||||
@ -84,7 +81,7 @@ function optionsSetDefaults(options) {
|
||||
const defaults = {
|
||||
general: {
|
||||
enable: true,
|
||||
audioPlayback: true,
|
||||
audioSource: 'jpod101',
|
||||
audioVolume: 100,
|
||||
groupResults: true,
|
||||
softKatakana: true,
|
||||
@ -137,84 +134,15 @@ function optionsSetDefaults(options) {
|
||||
|
||||
function optionsVersion(options) {
|
||||
const fixups = [
|
||||
() => { },
|
||||
() => { },
|
||||
() => { },
|
||||
() => { },
|
||||
() => {
|
||||
const copy = (targetDict, targetKey, sourceDict, sourceKey) => {
|
||||
targetDict[targetKey] = sourceDict.hasOwnProperty(sourceKey) ? sourceDict[sourceKey] : targetDict[targetKey];
|
||||
};
|
||||
|
||||
copy(options.general, 'autoStart', options, 'activateOnStartup');
|
||||
copy(options.general, 'audioPlayback', options, 'enableAudioPlayback');
|
||||
copy(options.general, 'softKatakana', options, 'enableSoftKatakanaSearch');
|
||||
copy(options.general, 'groupResults', options, 'groupTermResults');
|
||||
copy(options.general, 'showAdvanced', options, 'showAdvancedOptions');
|
||||
|
||||
copy(options.scanning, 'requireShift', options, 'holdShiftToScan');
|
||||
copy(options.scanning, 'selectText', options, 'selectMatchedText');
|
||||
copy(options.scanning, 'delay', options, 'scanDelay');
|
||||
copy(options.scanning, 'length', options, 'scanLength');
|
||||
|
||||
options.anki.enable = options.ankiMethod === 'ankiconnect';
|
||||
|
||||
copy(options.anki, 'tags', options, 'ankiCardTags');
|
||||
copy(options.anki, 'sentenceExt', options, 'sentenceExtent');
|
||||
copy(options.anki.terms, 'deck', options, 'ankiTermDeck');
|
||||
copy(options.anki.terms, 'model', options, 'ankiTermModel');
|
||||
copy(options.anki.terms, 'fields', options, 'ankiTermFields');
|
||||
copy(options.anki.kanji, 'deck', options, 'ankiKanjiDeck');
|
||||
copy(options.anki.kanji, 'model', options, 'ankiKanjiModel');
|
||||
copy(options.anki.kanji, 'fields', options, 'ankiKanjiFields');
|
||||
|
||||
for (const title in options.dictionaries) {
|
||||
const dictionary = options.dictionaries[title];
|
||||
dictionary.enabled = dictionary.enableTerms || dictionary.enableKanji;
|
||||
dictionary.priority = 0;
|
||||
}
|
||||
},
|
||||
() => {
|
||||
const fixupFields = fields => {
|
||||
const fixups = {
|
||||
'{expression-furigana}': '{furigana}',
|
||||
'{glossary-list}': '{glossary}'
|
||||
};
|
||||
|
||||
for (const name in fields) {
|
||||
for (const fixup in fixups) {
|
||||
fields[name] = fields[name].replace(fixup, fixups[fixup]);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
fixupFields(options.anki.terms.fields);
|
||||
fixupFields(options.anki.kanji.fields);
|
||||
},
|
||||
() => {
|
||||
let hasEnabledDict = false;
|
||||
for (const title in options.dictionaries) {
|
||||
if (options.dictionaries[title].enabled) {
|
||||
hasEnabledDict = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasEnabledDict) {
|
||||
for (const title in options.dictionaries) {
|
||||
options.dictionaries[title].enabled = true;
|
||||
}
|
||||
}
|
||||
},
|
||||
() => {
|
||||
let hasEnabledDict = false;
|
||||
for (const title in options.dictionaries) {
|
||||
if (options.dictionaries[title].enabled) {
|
||||
hasEnabledDict = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasEnabledDict) {
|
||||
for (const title in options.dictionaries) {
|
||||
options.dictionaries[title].enabled = true;
|
||||
}
|
||||
if (options.general.audioPlayback) {
|
||||
options.general.audioSource = 'jpod101';
|
||||
} else {
|
||||
options.general.audioSource = 'disabled';
|
||||
}
|
||||
}
|
||||
];
|
||||
|
||||
@ -121,7 +121,7 @@ window.yomichan = new class {
|
||||
definitionAdd(definition, mode) {
|
||||
let promise = Promise.resolve();
|
||||
if (mode !== 'kanji') {
|
||||
promise = audioInject(definition, this.options.anki.terms.fields);
|
||||
promise = audioInject(definition, this.options.anki.terms.fields, this.options.general.audioSource);
|
||||
}
|
||||
|
||||
return promise.then(() => {
|
||||
|
||||
@ -37,8 +37,13 @@
|
||||
<label><input type="checkbox" id="soft-katakana-search"> Soft Katakana search</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label><input type="checkbox" id="audio-playback-buttons"> Audio playback buttons</label>
|
||||
<div class="form-group">
|
||||
<label for="audio-playback-source">Audio playback source</label>
|
||||
<select class="form-control" id="audio-playback-source">
|
||||
<option value="disabled">Disabled</option>
|
||||
<option value="jpod101">JapanesePod101</option>
|
||||
<option value="jpod101-alternate">JapanesePod101 (Alternate)</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group options-advanced">
|
||||
@ -52,7 +57,7 @@
|
||||
</div>
|
||||
|
||||
<div class="form-group options-advanced">
|
||||
<label>Popup size (in pixels)</label>
|
||||
<label>Popup size (width x height, in pixels)</label>
|
||||
<div class="row">
|
||||
<div class="col-xs-6"><input type="number" min="1" id="popup-width" class="form-control"></div>
|
||||
<div class="col-xs-6"><input type="number" min="1" id="popup-height" class="form-control"></div>
|
||||
|
||||
@ -75,7 +75,7 @@ window.driver = new class {
|
||||
}
|
||||
|
||||
const searchFunc = () => this.searchAt(this.lastMousePos);
|
||||
if (this.popup.isVisible()) {
|
||||
if (this.options.scanning.requireShift) {
|
||||
searchFunc();
|
||||
} else {
|
||||
this.popupTimerSet(searchFunc);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"manifest_version": 2,
|
||||
"name": "Yomichan",
|
||||
"version": "1.1.10",
|
||||
"version": "1.1.11",
|
||||
|
||||
"description": "Japanese dictionary with Anki integration",
|
||||
"icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"},
|
||||
|
||||
@ -69,7 +69,7 @@ class Display {
|
||||
definitions,
|
||||
addable: options.anki.enable,
|
||||
grouped: options.general.groupResults,
|
||||
playback: options.general.audioPlayback
|
||||
playback: options.general.audioSource !== 'disabled'
|
||||
};
|
||||
|
||||
if (context) {
|
||||
@ -335,7 +335,7 @@ class Display {
|
||||
this.audioCache[key].pause();
|
||||
}
|
||||
|
||||
audioBuildUrl(definition, this.responseCache).then(url => {
|
||||
audioBuildUrl(definition, this.options.general.audioSource, this.responseCache).then(url => {
|
||||
if (!url) {
|
||||
url = '/mixed/mp3/button.mp3';
|
||||
}
|
||||
|
||||
@ -21,7 +21,27 @@
|
||||
* Audio
|
||||
*/
|
||||
|
||||
function audioBuildUrl(definition, cache={}) {
|
||||
function audioBuildUrl(definition, mode, cache={}) {
|
||||
if (mode === 'jpod101') {
|
||||
let kana = definition.reading;
|
||||
let kanji = definition.expression;
|
||||
|
||||
if (!kana && wanakana.isHiragana(kanji)) {
|
||||
kana = kanji;
|
||||
kanji = null;
|
||||
}
|
||||
|
||||
const params = [];
|
||||
if (kanji) {
|
||||
params.push(`kanji=${encodeURIComponent(kanji)}`);
|
||||
}
|
||||
if (kana) {
|
||||
params.push(`kana=${encodeURIComponent(kana)}`);
|
||||
}
|
||||
|
||||
const url = `https://assets.languagepod101.com/dictionary/japanese/audiomp3.php?${params.join('&')}`;
|
||||
return Promise.resolve(url);
|
||||
} else if (mode === 'jpod101-alternate') {
|
||||
return new Promise((resolve, reject) => {
|
||||
const response = cache[definition.expression];
|
||||
if (response) {
|
||||
@ -63,6 +83,9 @@ function audioBuildUrl(definition, cache={}) {
|
||||
}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return Promise.reject('unsupported audio source');
|
||||
}
|
||||
}
|
||||
|
||||
function audioBuildFilename(definition) {
|
||||
@ -79,7 +102,7 @@ function audioBuildFilename(definition) {
|
||||
}
|
||||
}
|
||||
|
||||
function audioInject(definition, fields) {
|
||||
function audioInject(definition, fields, mode) {
|
||||
const filename = audioBuildFilename(definition);
|
||||
if (!filename) {
|
||||
return Promise.resolve(true);
|
||||
@ -97,7 +120,7 @@ function audioInject(definition, fields) {
|
||||
return Promise.resolve(true);
|
||||
}
|
||||
|
||||
return audioBuildUrl(definition).then(url => {
|
||||
return audioBuildUrl(definition, mode).then(url => {
|
||||
definition.audio = {url, filename};
|
||||
return true;
|
||||
}).catch(() => false);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user