summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-07-09 15:23:11 -0700
committerAlex Yatskov <alex@foosoft.net>2017-07-09 15:23:11 -0700
commitb3984ccd54340195fc352033f61d33e4b5f492ea (patch)
tree2c75588abd020998c0745f8871a043ae48c77073
parentd57c5530b7ad56a7cc89782b4d186d8fddb55d86 (diff)
cleanup
-rw-r--r--ext/bg/js/database.js14
-rw-r--r--ext/bg/js/options.js2
-rw-r--r--ext/fg/js/util.js18
3 files changed, 15 insertions, 19 deletions
diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 70aeb0d7..400ebd6a 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -35,7 +35,7 @@ class Database {
}
prepare() {
- if (this.db !== null) {
+ if (!this.db) {
return Promise.reject('database already initialized');
}
@@ -53,7 +53,7 @@ class Database {
}
purge() {
- if (this.db === null) {
+ if (!this.db) {
return Promise.reject('database not initialized');
}
@@ -66,7 +66,7 @@ class Database {
}
findTerms(term, dictionaries) {
- if (this.db === null) {
+ if (!this.db) {
return Promise.reject('database not initialized');
}
@@ -96,7 +96,7 @@ class Database {
}
findKanji(kanji, dictionaries) {
- if (this.db === null) {
+ if (!this.db) {
return Promise.reject('database not initialized');
}
@@ -124,7 +124,7 @@ class Database {
}
cacheTagMeta(dictionaries) {
- if (this.db === null) {
+ if (!this.db) {
return Promise.reject('database not initialized');
}
@@ -148,7 +148,7 @@ class Database {
}
getDictionaries() {
- if (this.db === null) {
+ if (!this.db) {
return Promise.reject('database not initialized');
}
@@ -156,7 +156,7 @@ class Database {
}
importDictionary(archive, callback) {
- if (this.db === null) {
+ if (!this.db) {
return Promise.reject('database not initialized');
}
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 5aa18366..728ddae4 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -337,7 +337,7 @@ function ankiFieldsPopulate(element, options) {
const container = tab.find('tbody').empty();
const modelName = element.val();
- if (modelName === null) {
+ if (!modelName) {
return Promise.resolve();
}
diff --git a/ext/fg/js/util.js b/ext/fg/js/util.js
index e1b0e080..2acd81c4 100644
--- a/ext/fg/js/util.js
+++ b/ext/fg/js/util.js
@@ -117,7 +117,7 @@ function docImposterDestroy() {
function docRangeFromPoint(point) {
const element = document.elementFromPoint(point.x, point.y);
- if (element !== null) {
+ if (element) {
if (element.nodeName === 'IMG' || element.nodeName === 'BUTTON') {
return new TextSourceElement(element);
} else if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
@@ -128,23 +128,19 @@ function docRangeFromPoint(point) {
if (!document.caretRangeFromPoint) {
document.caretRangeFromPoint = (x, y) => {
const position = document.caretPositionFromPoint(x,y);
- if (position === null) {
- return null;
+ if (position) {
+ const range = document.createRange();
+ range.setStart(position.offsetNode, position.offset);
+ range.setEnd(position.offsetNode, position.offset);
+ return range;
}
-
- const range = document.createRange();
- range.setStart(position.offsetNode, position.offset);
- range.setEnd(position.offsetNode, position.offset);
- return range;
};
}
const range = document.caretRangeFromPoint(point.x, point.y);
- if (range !== null) {
+ if (range) {
return new TextSourceRange(range);
}
-
- return null;
}
function docSentenceExtract(source, extent) {