alex/yomichan
1
Fork 0
Code Releases Activity

Merge branch 'master' into firefox-amo

Browse Source
This commit is contained in:
Alex Yatskov 2017-04-09 11:42:20 -07:00
commit 3523b85be0
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/bg/options.html
View File

@ -197,14 +197,14 @@
<input type="text" id="interface-server" class="form-control"> <input type="text" id="interface-server" class="form-control">
</div> </div>
<p class="help-block">
Specify the information you would like included in your flashcards in the field editor below.
Please be aware that Anki requires the first field in the model to be unique. It is highly recommended
that you set it to <code>{expression}</code> for term flashcards and <code>{character}</code> for
Kanji flashcards.
</p>
<div id="anki-format"> <div id="anki-format">
<p class="help-block">
Specify the information you would like included in your flashcards in the field editor below.
Please be aware that Anki requires the first field in the model to be unique. It is highly recommended
that you set it to <code>{expression}</code> for term flashcards and <code>{character}</code> for
Kanji flashcards.
</p>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#terms" data-toggle="tab">Terms</a></li> <li class="active"><a href="#terms" data-toggle="tab">Terms</a></li>
<li><a href="#kanji" data-toggle="tab">Kanji</a></li> <li><a href="#kanji" data-toggle="tab">Kanji</a></li>

2
ext/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"manifest_version": 2, "manifest_version": 2,
"name": "Yomichan", "name": "Yomichan",
"version": "1.1.12", "version": "1.1.13",
"description": "Japanese dictionary with Anki integration", "description": "Japanese dictionary with Anki integration",
"icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"}, "icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"},

10
ext/mixed/js/display.js
View File

@ -74,7 +74,10 @@ class Display {
if (context) { if (context) {
for (const definition of definitions) { for (const definition of definitions) {
definition.cloze = clozeBuild(context.sentence, definition.source); if (context.sentence) {
definition.cloze = clozeBuild(context.sentence, definition.source);
}
definition.url = context.url; definition.url = context.url;
} }
} }
@ -108,7 +111,10 @@ class Display {
if (context) { if (context) {
for (const definition of definitions) { for (const definition of definitions) {
definition.cloze = clozeBuild(context.sentence); if (context.sentence) {
definition.cloze = clozeBuild(context.sentence);
}
definition.url = context.url; definition.url = context.url;
} }
} }