Simplify _findFirstBulk (#1521)

FooSoft · Mar 13, 2021 · e1477ad · e1477ad
1 parent a00ed41
commit e1477ad
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/ext/js/language/dictionary-database.js b/ext/js/language/dictionary-database.js
@@ -296,7 +296,7 @@ class DictionaryDatabase {
 
     findTagMetaBulk(items) {
         const predicate = (row, item) => (row.dictionary === item.dictionary);
-        return this._findFirstBulk('tagMeta', 'name', items, predicate, this._createTagMeta.bind(this));
+        return this._findFirstBulk('tagMeta', 'name', items, predicate);
     }
 
     findTagForTitle(name, title) {
@@ -442,7 +442,7 @@ class DictionaryDatabase {
         });
     }
 
-    _findFirstBulk(objectStoreName, indexName, items, predicate, createResult) {
+    _findFirstBulk(objectStoreName, indexName, items, predicate) {
         return new Promise((resolve, reject) => {
             const count = items.length;
             const results = new Array(count);
@@ -462,7 +462,7 @@ class DictionaryDatabase {
                 const query = IDBKeyRange.only(item.query);
 
                 const onFind = (row) => {
-                    results[itemIndex] = createResult(row, itemIndex);
+                    results[itemIndex] = row;
                     if (++completeCount >= count) {
                         resolve(results);
                     }
@@ -501,10 +501,6 @@ class DictionaryDatabase {
         };
     }
 
-    _createTagMeta(row, index) {
-        return {row, index};
-    }
-
     _createTermMeta({expression, mode, data, dictionary}, index) {
         return {expression, mode, data, dictionary, index};
     }