summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-02-11 12:16:14 -0800
committerAlex Yatskov <alex@foosoft.net>2017-02-11 12:16:14 -0800
commit701c91ea66852631ccc6e7bfb23b49578646ff33 (patch)
tree536cc30e178abdf6c28b47b88a67770250a106bf /ext
parent7398e74d71a91dfc1397c28f8dc5df4205d96249 (diff)
block placeholder audio with a short audio clip1.0.13
Diffstat (limited to 'ext')
-rw-r--r--ext/fg/js/frame.js23
-rw-r--r--ext/fg/mp3/button.mp3bin0 -> 17735 bytes
-rw-r--r--ext/manifest.json5
3 files changed, 22 insertions, 6 deletions
diff --git a/ext/fg/js/frame.js b/ext/fg/js/frame.js
index 83d6d7ef..ca0636f9 100644
--- a/ext/fg/js/frame.js
+++ b/ext/fg/js/frame.js
@@ -170,12 +170,27 @@ class Frame {
}
for (const key in this.audioCache) {
- this.audioCache[key].pause();
+ const audio = this.audioCache[key];
+ if (audio !== null) {
+ audio.pause();
+ }
}
- const audio = this.audioCache[url] || new Audio(url);
- audio.currentTime = 0;
- audio.play();
+ let audio = this.audioCache[url];
+ if (audio) {
+ audio.currentTime = 0;
+ audio.play();
+ } else {
+ audio = new Audio(url);
+ audio.onloadeddata = () => {
+ if (audio.duration === 5.694694) {
+ audio = new Audio('mp3/button.mp3');
+ }
+
+ this.audioCache[url] = audio;
+ audio.play();
+ };
+ }
}
handleError(error) {
diff --git a/ext/fg/mp3/button.mp3 b/ext/fg/mp3/button.mp3
new file mode 100644
index 00000000..7a9728d1
--- /dev/null
+++ b/ext/fg/mp3/button.mp3
Binary files differ
diff --git a/ext/manifest.json b/ext/manifest.json
index 1c80435f..0a1301c1 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "Yomichan",
- "version": "1.0.12",
+ "version": "1.0.13",
"description": "Japanese dictionary with Anki integration",
"icons": {"16": "img/icon16.png", "48": "img/icon48.png", "128": "img/icon128.png"},
@@ -31,13 +31,14 @@
],
"web_accessible_resources": [
"fg/css/frame.css",
+ "fg/frame.html",
"fg/img/add_kanji.png",
"fg/img/add_term_kana.png",
"fg/img/add_term_kanji.png",
"fg/img/play_audio.png",
"fg/img/spinner.gif",
"fg/js/frame.js",
- "fg/frame.html",
+ "fg/mp3/button.mp3",
"fg/ttf/kanji-stroke-orders.ttf",
"fg/ttf/vl-gothic-regular.ttf"
]