aboutsummaryrefslogtreecommitdiff
path: root/ext/bg/js/database.js
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-06-26 20:23:53 -0700
committerAlex Yatskov <alex@foosoft.net>2017-06-26 20:23:53 -0700
commitc23298dbb2f3f26ff96da80f69d70051cc14f733 (patch)
treeda544b095a4665655013bccd115b9efad5c8a7e1 /ext/bg/js/database.js
parent16baf9a400ac11a1c4f53ba6665db03a900511e0 (diff)
parent21b29ff135269fe33f5ae064abc74cfde6f2a5f5 (diff)
Merge branch 'master' into firefox-amo
Diffstat (limited to 'ext/bg/js/database.js')
-rw-r--r--ext/bg/js/database.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 51f639d9..70aeb0d7 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -155,7 +155,7 @@ class Database {
return this.db.dictionaries.toArray();
}
- importDictionary(indexUrl, callback) {
+ importDictionary(archive, callback) {
if (this.db === null) {
return Promise.reject('database not initialized');
}
@@ -204,7 +204,7 @@ class Database {
return this.db.terms.bulkAdd(rows).then(() => {
if (callback) {
- callback(total, current, indexUrl);
+ callback(total, current);
}
});
};
@@ -224,11 +224,11 @@ class Database {
return this.db.kanji.bulkAdd(rows).then(() => {
if (callback) {
- callback(total, current, indexUrl);
+ callback(total, current);
}
});
};
- return jsonLoadDb(indexUrl, indexLoaded, termsLoaded, kanjiLoaded).then(() => summary);
+ return zipLoadDb(archive, indexLoaded, termsLoaded, kanjiLoaded).then(() => summary);
}
}