From edf1c0ff6d9eadd17c98f00ef027c27d1b89a8ee Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sat, 22 Jul 2017 23:19:38 -0700 Subject: [PATCH] cleanup --- ext/fg/frame.html | 2 +- ext/fg/js/{background.js => api.js} | 30 ++++++++++++++--------------- ext/fg/js/display-frame.js | 10 +++++----- ext/fg/js/frontend.js | 6 +++--- ext/manifest.json | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) rename ext/fg/js/{background.js => api.js} (64%) diff --git a/ext/fg/frame.html b/ext/fg/frame.html index 80e69967..9ff2c585 100644 --- a/ext/fg/frame.html +++ b/ext/fg/frame.html @@ -35,7 +35,7 @@ - + diff --git a/ext/fg/js/background.js b/ext/fg/js/api.js similarity index 64% rename from ext/fg/js/background.js rename to ext/fg/js/api.js index c072468b..e252637e 100644 --- a/ext/fg/js/background.js +++ b/ext/fg/js/api.js @@ -17,7 +17,7 @@ */ -function bgInvoke(action, params={}) { +function apiInvoke(action, params={}) { return new Promise((resolve, reject) => { try { chrome.runtime.sendMessage({action, params}, ({result, error}) => { @@ -34,30 +34,30 @@ function bgInvoke(action, params={}) { }); } -function bgOptionsGet() { - return bgInvoke('optionsGet'); +function apiOptionsGet() { + return apiInvoke('optionsGet'); } -function bgTermsFind(text) { - return bgInvoke('termsFind', {text}); +function apiTermsFind(text) { + return apiInvoke('termsFind', {text}); } -function bgKanjiFind(text) { - return bgInvoke('kanjiFind', {text}); +function apiKanjiFind(text) { + return apiInvoke('kanjiFind', {text}); } -function bgTemplateRender(template, data) { - return bgInvoke('templateRender', {data, template}); +function apiTemplateRender(template, data) { + return apiInvoke('templateRender', {data, template}); } -function bgDefinitionsAddable(definitions, modes) { - return bgInvoke('definitionsAddable', {definitions, modes}).catch(() => null); +function apiDefinitionsAddable(definitions, modes) { + return apiInvoke('definitionsAddable', {definitions, modes}).catch(() => null); } -function bgDefinitionAdd(definition, mode) { - return bgInvoke('definitionAdd', {definition, mode}); +function apiDefinitionAdd(definition, mode) { + return apiInvoke('definitionAdd', {definition, mode}); } -function bgNoteView(noteId) { - return bgInvoke('noteView', {noteId}); +function apiNoteView(noteId) { + return apiInvoke('noteView', {noteId}); } diff --git a/ext/fg/js/display-frame.js b/ext/fg/js/display-frame.js index c7da43e8..09bd9255 100644 --- a/ext/fg/js/display-frame.js +++ b/ext/fg/js/display-frame.js @@ -24,23 +24,23 @@ window.displayFrame = new class extends Display { } definitionAdd(definition, mode) { - return bgDefinitionAdd(definition, mode); + return apiDefinitionAdd(definition, mode); } definitionsAddable(definitions, modes) { - return bgDefinitionsAddable(definitions, modes); + return apiDefinitionsAddable(definitions, modes); } noteView(noteId) { - return bgNoteView(noteId); + return apiNoteView(noteId); } templateRender(template, data) { - return bgTemplateRender(template, data); + return apiTemplateRender(template, data); } kanjiFind(character) { - return bgKanjiFind(character); + return apiKanjiFind(character); } handleError(error) { diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js index 8b4c182c..9974d878 100644 --- a/ext/fg/js/frontend.js +++ b/ext/fg/js/frontend.js @@ -28,7 +28,7 @@ window.yomichanFrontend = new class { this.pendingLookup = false; this.options = null; - bgOptionsGet().then(options => { + apiOptionsGet().then(options => { this.options = options; window.addEventListener('mouseover', this.onMouseOver.bind(this)); window.addEventListener('mousedown', this.onMouseDown.bind(this)); @@ -175,7 +175,7 @@ window.yomichanFrontend = new class { searchTerms(textSource) { textSource.setEndOffset(this.options.scanning.length); - return bgTermsFind(textSource.text()).then(({definitions, length}) => { + return apiTermsFind(textSource.text()).then(({definitions, length}) => { if (definitions.length === 0) { return false; } else { @@ -203,7 +203,7 @@ window.yomichanFrontend = new class { searchKanji(textSource) { textSource.setEndOffset(1); - return bgKanjiFind(textSource.text()).then(definitions => { + return apiKanjiFind(textSource.text()).then(definitions => { if (definitions.length === 0) { return false; } else { diff --git a/ext/manifest.json b/ext/manifest.json index a318e539..288976f3 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -18,7 +18,7 @@ "fg/js/document.js", "fg/js/source-range.js", "fg/js/source-element.js", - "fg/js/background.js", + "fg/js/api.js", "fg/js/popup.js", "fg/js/frontend.js" ],