summaryrefslogtreecommitdiff
path: root/ext/bg/js/translator.js
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2016-07-02 19:51:13 -0700
committerAlex Yatskov <alex@foosoft.net>2016-07-02 19:51:13 -0700
commit30585892b812dbf19c15bd010d6032fffa204c0d (patch)
tree206927761682b43582bee8b84d50ffa7a6255485 /ext/bg/js/translator.js
parentbd89db4ec5a55e7b08b27a3d736a32e859084aff (diff)
parent261914328fb8b72d8984a21eaf7670a01f1da2c6 (diff)
Merge branch 'master' of https://github.com/FooSoft/yomichan-chrome
Diffstat (limited to 'ext/bg/js/translator.js')
-rw-r--r--ext/bg/js/translator.js10
1 files changed, 10 insertions, 0 deletions
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index bf1538e2..d79ec6d1 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -46,8 +46,17 @@ class Translator {
const pendingLoads = [];
for (let key of files) {
+ /*
+ Spidermonkey does not implement lexical bindings for for-of loop
+ (see https://bugzilla.mozilla.org/show_bug.cgi?id=449811)
+ so we need to manually make a new declaration for key.
+ Otherwise key will always remain the same in the callback to loadData
+ and the dictionary data will not be set correctly
+ */
+ let key_ = key;
pendingLoads.push(key);
Translator.loadData(this.paths[key], (response) => {
+ let key = key_
switch (key) {
case 'rules':
this.deinflector.setRules(JSON.parse(response));
@@ -228,6 +237,7 @@ class Translator {
static loadData(url, callback) {
const xhr = new XMLHttpRequest();
+ xhr.overrideMimeType("application/json");
xhr.addEventListener('load', () => callback(xhr.responseText));
xhr.open('GET', chrome.extension.getURL(url), true);
xhr.send();