alex/yomichan
1
Fork 0
Code Releases Activity

cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2017-07-09 15:23:11 -07:00
parent d57c5530b7
commit b3984ccd54
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/bg/js/database.js
View File

@ -35,7 +35,7 @@ class Database {
} }
prepare() { prepare() {
if (this.db !== null) { if (!this.db) {
return Promise.reject('database already initialized'); return Promise.reject('database already initialized');
} }
@ -53,7 +53,7 @@ class Database {
} }
purge() { purge() {
if (this.db === null) { if (!this.db) {
return Promise.reject('database not initialized'); return Promise.reject('database not initialized');
} }
@ -66,7 +66,7 @@ class Database {
} }
findTerms(term, dictionaries) { findTerms(term, dictionaries) {
if (this.db === null) { if (!this.db) {
return Promise.reject('database not initialized'); return Promise.reject('database not initialized');
} }
@ -96,7 +96,7 @@ class Database {
} }
findKanji(kanji, dictionaries) { findKanji(kanji, dictionaries) {
if (this.db === null) { if (!this.db) {
return Promise.reject('database not initialized'); return Promise.reject('database not initialized');
} }
@ -124,7 +124,7 @@ class Database {
} }
cacheTagMeta(dictionaries) { cacheTagMeta(dictionaries) {
if (this.db === null) { if (!this.db) {
return Promise.reject('database not initialized'); return Promise.reject('database not initialized');
} }
@ -148,7 +148,7 @@ class Database {
} }
getDictionaries() { getDictionaries() {
if (this.db === null) { if (!this.db) {
return Promise.reject('database not initialized'); return Promise.reject('database not initialized');
} }
@ -156,7 +156,7 @@ class Database {
} }
importDictionary(archive, callback) { importDictionary(archive, callback) {
if (this.db === null) { if (!this.db) {
return Promise.reject('database not initialized'); return Promise.reject('database not initialized');
} }

2
ext/bg/js/options.js
View File

@ -337,7 +337,7 @@ function ankiFieldsPopulate(element, options) {
const container = tab.find('tbody').empty(); const container = tab.find('tbody').empty();
const modelName = element.val(); const modelName = element.val();
if (modelName === null) { if (!modelName) {
return Promise.resolve(); return Promise.resolve();
} }

18
ext/fg/js/util.js
View File

@ -117,7 +117,7 @@ function docImposterDestroy() {
function docRangeFromPoint(point) { function docRangeFromPoint(point) {
const element = document.elementFromPoint(point.x, point.y); const element = document.elementFromPoint(point.x, point.y);
if (element !== null) { if (element) {
if (element.nodeName === 'IMG' || element.nodeName === 'BUTTON') { if (element.nodeName === 'IMG' || element.nodeName === 'BUTTON') {
return new TextSourceElement(element); return new TextSourceElement(element);
} else if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') { } else if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
@ -128,23 +128,19 @@ function docRangeFromPoint(point) {
if (!document.caretRangeFromPoint) { if (!document.caretRangeFromPoint) {
document.caretRangeFromPoint = (x, y) => { document.caretRangeFromPoint = (x, y) => {
const position = document.caretPositionFromPoint(x,y); const position = document.caretPositionFromPoint(x,y);
if (position === null) { if (position) {
return null; 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); const range = document.caretRangeFromPoint(point.x, point.y);
if (range !== null) { if (range) {
return new TextSourceRange(range); return new TextSourceRange(range);
} }
return null;
} }
function docSentenceExtract(source, extent) { function docSentenceExtract(source, extent) {