summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-03-04 19:53:28 -0800
committerAlex Yatskov <alex@foosoft.net>2017-03-04 19:53:28 -0800
commite799aa5e5f7dd526214b8e55de86f525cefec3ee (patch)
tree03d7dc0644bbac88361b6c665947f34ccdaf499d
parent7269583547cb379a413496946abce145703b2b8a (diff)
cleanup
-rw-r--r--ext/bg/js/templates.js8
-rw-r--r--ext/bg/js/translator.js2
-rw-r--r--ext/bg/js/util.js4
-rw-r--r--ext/bg/js/yomichan.js2
-rw-r--r--ext/fg/js/popup.js2
-rw-r--r--ext/manifest.json8
-rw-r--r--ext/mixed/img/add-kanji.png (renamed from ext/mixed/img/add_kanji.png)bin733 -> 733 bytes
-rw-r--r--ext/mixed/img/add-term-kana.png (renamed from ext/mixed/img/add_term_kana.png)bin286 -> 286 bytes
-rw-r--r--ext/mixed/img/add-term-kanji.png (renamed from ext/mixed/img/add_term_kanji.png)bin733 -> 733 bytes
-rw-r--r--ext/mixed/img/play-audio.png (renamed from ext/mixed/img/play_audio.png)bin610 -> 610 bytes
-rw-r--r--ext/mixed/js/display.js2
-rw-r--r--tmpl/terms.html6
12 files changed, 17 insertions, 17 deletions
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 0fa41b36..8c8f4204 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -457,17 +457,17 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
},"13":function(container,depth0,helpers,partials,data) {
var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
- return " <a href=\"#\" title=\"Add term as expression\" class=\"action-add-note pending disabled\" data-mode=\"term_kanji\" data-index=\""
+ return " <a href=\"#\" title=\"Add term as expression\" class=\"action-add-note pending disabled\" data-mode=\"term-kanji\" data-index=\""
+ alias4(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"index","hash":{},"data":data}) : helper)))
- + "\"><img src=\"/mixed/img/add_term_kanji.png\"></a>\n <a href=\"#\" title=\"Add term as reading\" class=\"action-add-note pending disabled\" data-mode=\"term_kana\" data-index=\""
+ + "\"><img src=\"/mixed/img/add-term-kanji.png\"></a>\n <a href=\"#\" title=\"Add term as reading\" class=\"action-add-note pending disabled\" data-mode=\"term-kana\" data-index=\""
+ alias4(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"index","hash":{},"data":data}) : helper)))
- + "\"><img src=\"/mixed/img/add_term_kana.png\"></a>\n";
+ + "\"><img src=\"/mixed/img/add-term-kana.png\"></a>\n";
},"15":function(container,depth0,helpers,partials,data) {
var helper;
return " <a href=\"#\" title=\"Play audio\" class=\"action-play-audio\" data-index=\""
+ container.escapeExpression(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"index","hash":{},"data":data}) : helper)))
- + "\"><img src=\"/mixed/img/play_audio.png\"></a>\n";
+ + "\"><img src=\"/mixed/img/play-audio.png\"></a>\n";
},"17":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer =
" <div class=\"expression\"><ruby>";
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 967b8bfe..67430aef 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -31,7 +31,7 @@ class Translator {
}
const promises = [
- jsonLoadInt('bg/lang/deinflect.json'),
+ jsonLoadInt('/bg/lang/deinflect.json'),
this.database.prepare()
];
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index d91415f7..814a27f6 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -388,8 +388,8 @@ function dictFieldFormat(field, definition, mode, options) {
definition,
group: options.general.groupResults,
html: options.anki.htmlCards,
- modeTermKanji: mode === 'term_kanji',
- modeTermKana: mode === 'term_kana',
+ modeTermKanji: mode === 'term-kanji',
+ modeTermKana: mode === 'term-kana',
modeKanji: mode === 'kanji'
};
diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js
index 82a06146..a61be8be 100644
--- a/ext/bg/js/yomichan.js
+++ b/ext/bg/js/yomichan.js
@@ -149,7 +149,7 @@ window.yomichan = new class {
onInstalled(details) {
if (details.reason === 'install') {
- chrome.tabs.create({url: chrome.extension.getURL('bg/guide.html')});
+ chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
}
}
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index a9e27f49..12a6df13 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -25,7 +25,7 @@ class Popup {
this.container.id = 'yomichan-popup';
this.container.addEventListener('mousedown', e => e.stopPropagation());
this.container.addEventListener('scroll', e => e.stopPropagation());
- this.container.setAttribute('src', chrome.extension.getURL('fg/frame.html'));
+ this.container.setAttribute('src', chrome.extension.getURL('/fg/frame.html'));
document.body.appendChild(this.container);
}
diff --git a/ext/manifest.json b/ext/manifest.json
index 0c62b49d..d7dd5f9d 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -35,10 +35,10 @@
"fg/frame.html",
"fg/js/frame.js",
"mixed/css/frame.css",
- "mixed/img/add_kanji.png",
- "mixed/img/add_term_kana.png",
- "mixed/img/add_term_kanji.png",
- "mixed/img/play_audio.png",
+ "mixed/img/add-kanji.png",
+ "mixed/img/add-term-kana.png",
+ "mixed/img/add-term-kanji.png",
+ "mixed/img/play-audio.png",
"mixed/img/spinner.gif",
"mixed/mp3/button.mp3",
"mixed/ttf/kanji-stroke-orders.ttf",
diff --git a/ext/mixed/img/add_kanji.png b/ext/mixed/img/add-kanji.png
index 6332fefe..6332fefe 100644
--- a/ext/mixed/img/add_kanji.png
+++ b/ext/mixed/img/add-kanji.png
Binary files differ
diff --git a/ext/mixed/img/add_term_kana.png b/ext/mixed/img/add-term-kana.png
index 41ff8335..41ff8335 100644
--- a/ext/mixed/img/add_term_kana.png
+++ b/ext/mixed/img/add-term-kana.png
Binary files differ
diff --git a/ext/mixed/img/add_term_kanji.png b/ext/mixed/img/add-term-kanji.png
index 6332fefe..6332fefe 100644
--- a/ext/mixed/img/add_term_kanji.png
+++ b/ext/mixed/img/add-term-kanji.png
Binary files differ
diff --git a/ext/mixed/img/play_audio.png b/ext/mixed/img/play-audio.png
index 6056d234..6056d234 100644
--- a/ext/mixed/img/play_audio.png
+++ b/ext/mixed/img/play-audio.png
Binary files differ
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 860a3e43..f9467573 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -76,7 +76,7 @@ class Display {
}).catch(this.handleError.bind(this));
});
- return this.adderButtonsUpdate(['term_kanji', 'term_kana'], sequence);
+ return this.adderButtonsUpdate(['term-kanji', 'term-kana'], sequence);
}).catch(this.handleError.bind(this));
}
diff --git a/tmpl/terms.html b/tmpl/terms.html
index 923eb14f..04ba713d 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -21,11 +21,11 @@
<p>
<div class="actions">
{{#if addable}}
- <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="/mixed/img/add_term_kanji.png"></a>
- <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="/mixed/img/add_term_kana.png"></a>
+ <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term-kanji" data-index="{{@index}}"><img src="/mixed/img/add-term-kanji.png"></a>
+ <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term-kana" data-index="{{@index}}"><img src="/mixed/img/add-term-kana.png"></a>
{{/if}}
{{#if playback}}
- <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="/mixed/img/play_audio.png"></a>
+ <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="/mixed/img/play-audio.png"></a>
{{/if}}
</div>