diff options
author | Alex Yatskov <alex@foosoft.net> | 2017-01-28 18:46:15 -0800 |
---|---|---|
committer | Alex Yatskov <alex@foosoft.net> | 2017-01-28 18:46:15 -0800 |
commit | 8efe5b1fbf6bf1539c93f25b6b87918c1a651f00 (patch) | |
tree | 6d407c4dc5dcb6d93ad38c10f2721d5d24ddd2a3 /ext/bg/js | |
parent | bf9925ec9cabd5a755152aa89df1f87e38d53534 (diff) |
workaround for broken const in firefox
Diffstat (limited to 'ext/bg/js')
-rw-r--r-- | ext/bg/js/database.js | 12 | ||||
-rw-r--r-- | ext/bg/js/deinflector.js | 14 | ||||
-rw-r--r-- | ext/bg/js/options.js | 12 | ||||
-rw-r--r-- | ext/bg/js/translator.js | 14 | ||||
-rw-r--r-- | ext/bg/js/util.js | 18 | ||||
-rw-r--r-- | ext/bg/js/yomichan.js | 10 |
6 files changed, 40 insertions, 40 deletions
diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js index 7dc533e3..cae96306 100644 --- a/ext/bg/js/database.js +++ b/ext/bg/js/database.js @@ -87,7 +87,7 @@ class Database { }).then(() => { return this.cacheTagMeta(dictionaries); }).then(() => { - for (const result of results) { + for (let result of results) { result.tagMeta = this.tagMetaCache[result.dictionary] || {}; } @@ -115,7 +115,7 @@ class Database { }).then(() => { return this.cacheTagMeta(dictionaries); }).then(() => { - for (const result of results) { + for (let result of results) { result.tagMeta = this.tagMetaCache[result.dictionary] || {}; } @@ -129,7 +129,7 @@ class Database { } const promises = []; - for (const dictionary of dictionaries) { + for (let dictionary of dictionaries) { if (this.tagMetaCache[dictionary]) { continue; } @@ -246,7 +246,7 @@ class Database { return this.db.dictionaries.add({title, version, revision, hasTerms, hasKanji}).then(() => { const rows = []; - for (const tag in tagMeta || {}) { + for (let tag in tagMeta || {}) { const meta = tagMeta[tag]; const row = sanitizeTag({ name: tag, @@ -266,7 +266,7 @@ class Database { const termsLoaded = (title, entries, total, current) => { const rows = []; - for (const [expression, reading, tags, rules, score, ...glossary] of entries) { + for (let [expression, reading, tags, rules, score, ...glossary] of entries) { rows.push({ expression, reading, @@ -287,7 +287,7 @@ class Database { const kanjiLoaded = (title, entries, total, current) => { const rows = []; - for (const [character, onyomi, kunyomi, tags, ...meanings] of entries) { + for (let [character, onyomi, kunyomi, tags, ...meanings] of entries) { rows.push({ character, onyomi, diff --git a/ext/bg/js/deinflector.js b/ext/bg/js/deinflector.js index 6e480068..256ae1a1 100644 --- a/ext/bg/js/deinflector.js +++ b/ext/bg/js/deinflector.js @@ -32,8 +32,8 @@ class Deinflection { if (this.rules.length === 0) { this.definitions = definitions; } else { - for (const rule of this.rules) { - for (const definition of definitions) { + for (let rule of this.rules) { + for (let definition of definitions) { if (definition.rules.includes(rule)) { this.definitions.push(definition); } @@ -46,11 +46,11 @@ class Deinflection { }; const promises = []; - for (const reason in reasons) { - for (const variant of reasons[reason]) { + for (let reason in reasons) { + for (let variant of reasons[reason]) { let accept = this.rules.length === 0; if (!accept) { - for (const rule of this.rules) { + for (let rule of this.rules) { if (variant.rulesIn.includes(rule)) { accept = true; break; @@ -95,8 +95,8 @@ class Deinflection { } const results = []; - for (const child of this.children) { - for (const result of child.gather()) { + for (let child of this.children) { + for (let result of child.gather()) { if (this.reason.length > 0) { result.reasons.push(this.reason); } diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index ca2792c0..25e0945c 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -48,7 +48,7 @@ function optionsSetDefaults(options) { }; const combine = (target, source) => { - for (const key in source) { + for (let key in source) { if (!(key in target)) { target[key] = source[key]; } @@ -104,8 +104,8 @@ function optionsVersion(options) { '{glossary-list}': '{glossary}' }; - for (const name in fields) { - for (const fixup in fixups) { + for (let name in fields) { + for (let fixup in fixups) { fields[name] = fields[name].replace(fixup, fixups[fixup]); } } @@ -114,7 +114,7 @@ function optionsVersion(options) { fixupFields(options.anki.terms.fields); fixupFields(options.anki.kanji.fields); - for (const title in options.dictionaries) { + for (let title in options.dictionaries) { const dictionary = options.dictionaries[title]; dictionary.enabled = dictionary.enableTerms || dictionary.enableKanji; dictionary.priority = 0; @@ -127,8 +127,8 @@ function optionsVersion(options) { '{glossary-list}': '{glossary}' }; - for (const name in fields) { - for (const fixup in fixups) { + for (let name in fields) { + for (let fixup in fixups) { fields[name] = fields[name].replace(fixup, fixups[fixup]); } } diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js index e7c2aac2..82dffd91 100644 --- a/ext/bg/js/translator.js +++ b/ext/bg/js/translator.js @@ -54,8 +54,8 @@ class Translator { } }).then(deinflections => { let definitions = []; - for (const deinflection of deinflections) { - for (const definition of deinflection.definitions) { + for (let deinflection of deinflections) { + for (let definition of deinflection.definitions) { const tags = definition.tags.map(tag => buildTag(tag, definition.tagMeta)); tags.push(buildDictTag(definition.dictionary)); definitions.push({ @@ -76,7 +76,7 @@ class Translator { definitions = sortTermDefs(definitions, dictionaries); let length = 0; - for (const definition of definitions) { + for (let definition of definitions) { length = Math.max(length, definition.source.length); } @@ -95,7 +95,7 @@ class Translator { const processed = {}; const promises = []; - for (const c of text) { + for (let c of text) { if (!processed[c]) { promises.push(this.database.findKanji(c, titles)); processed[c] = true; @@ -104,7 +104,7 @@ class Translator { return Promise.all(promises).then(defSets => { const definitions = defSets.reduce((a, b) => a.concat(b), []); - for (const definition of definitions) { + for (let definition of definitions) { const tags = definition.tags.map(tag => buildTag(tag, definition.tagMeta)); tags.push(buildDictTag(definition.dictionary)); definition.tags = sortTags(tags); @@ -130,7 +130,7 @@ class Translator { return Promise.all(promises).then(results => { let deinflections = []; - for (const result of results) { + for (let result of results) { deinflections = deinflections.concat(result); } @@ -139,7 +139,7 @@ class Translator { } processKanji(definitions) { - for (const definition of definitions) { + for (let definition of definitions) { const tags = definition.tags.map(tag => buildTag(tag, definition.tagMeta)); definition.tags = sortTags(tags); } diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js index 108c88e7..0b649ef6 100644 --- a/ext/bg/js/util.js +++ b/ext/bg/js/util.js @@ -19,7 +19,7 @@ function kanjiLinks(options) { let result = ''; - for (const c of options.fn(this)) { + for (let c of options.fn(this)) { if (isKanji(c)) { result += `<a href="#" class="kanji-link">${c}</a>`; } else { @@ -41,7 +41,7 @@ function isKanji(c) { function enabledDicts(options) { const dictionaries = {}; - for (const title in options.dictionaries) { + for (let title in options.dictionaries) { const dictionary = options.dictionaries[title]; if (dictionary.enabled) { dictionaries[title] = dictionary; @@ -104,7 +104,7 @@ function sortTermDefs(definitions, dictionaries=null) { function undupeTermDefs(definitions) { const definitionGroups = {}; - for (const definition of definitions) { + for (let definition of definitions) { const definitionExisting = definitionGroups[definition.id]; if (!definitionGroups.hasOwnProperty(definition.id) || definition.expression.length > definitionExisting.expression.length) { definitionGroups[definition.id] = definition; @@ -112,7 +112,7 @@ function undupeTermDefs(definitions) { } const definitionsUnique = []; - for (const key in definitionGroups) { + for (let key in definitionGroups) { definitionsUnique.push(definitionGroups[key]); } @@ -121,7 +121,7 @@ function undupeTermDefs(definitions) { function groupTermDefs(definitions, dictionaries) { const groups = {}; - for (const definition of definitions) { + for (let definition of definitions) { const key = [definition.source, definition.expression].concat(definition.reasons); if (definition.reading) { key.push(definition.reading); @@ -136,7 +136,7 @@ function groupTermDefs(definitions, dictionaries) { } const results = []; - for (const key in groups) { + for (let key in groups) { const groupDefs = groups[key]; const firstDef = groupDefs[0]; sortTermDefs(groupDefs, dictionaries); @@ -160,7 +160,7 @@ function buildDictTag(name) { function buildTag(name, meta) { const tag = {name}; const symbol = name.split(':')[0]; - for (const prop in meta[symbol] || {}) { + for (let prop in meta[symbol] || {}) { tag[prop] = meta[symbol][prop]; } @@ -217,7 +217,7 @@ function formatField(field, definition, mode, options) { 'url' ]; - for (const marker of markers) { + for (let marker of markers) { const data = { marker, definition, @@ -303,7 +303,7 @@ function importJsonDb(indexUrl, indexLoaded, termsLoaded, kanjiLoaded) { } let chain = Promise.resolve(); - for (const loader of loaders) { + for (let loader of loaders) { chain = chain.then(loader); } diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js index d97dc586..d7bf0e80 100644 --- a/ext/bg/js/yomichan.js +++ b/ext/bg/js/yomichan.js @@ -81,7 +81,7 @@ class Yomichan { tabInvokeAll(action, params) { chrome.tabs.query({}, tabs => { - for (const tab of tabs) { + for (let tab of tabs) { chrome.tabs.sendMessage(tab.id, {action, params}, () => null); } }); @@ -106,7 +106,7 @@ class Yomichan { fields: [] }; - for (const name in fields) { + for (let name in fields) { if (fields[name].includes('{audio}')) { audio.fields.push(name); } @@ -117,7 +117,7 @@ class Yomichan { } } - for (const name in fields) { + for (let name in fields) { note.fields[name] = formatField( fields[name], definition, @@ -175,8 +175,8 @@ class Yomichan { api_canAddDefinitions({definitions, modes, callback}) { const notes = []; - for (const definition of definitions) { - for (const mode of modes) { + for (let definition of definitions) { + for (let mode of modes) { notes.push(this.formatNote(definition, mode)); } } |