From b8fddd96c83e44d6d5aa8f5eeaa233674f59c4b7 Mon Sep 17 00:00:00 2001 From: siikamiika Date: Sun, 8 Dec 2019 11:10:19 +0200 Subject: fix popup preview resolves #302 --- ext/bg/settings-popup-preview.html | 1 + 1 file changed, 1 insertion(+) (limited to 'ext/bg/settings-popup-preview.html') diff --git a/ext/bg/settings-popup-preview.html b/ext/bg/settings-popup-preview.html index 339467d4..b79363c7 100644 --- a/ext/bg/settings-popup-preview.html +++ b/ext/bg/settings-popup-preview.html @@ -119,6 +119,7 @@ + -- cgit v1.2.3 From 2a19d8c59f31e47f28e8b32b5fcd7edb1621c759 Mon Sep 17 00:00:00 2001 From: siikamiika Date: Mon, 9 Dec 2019 19:43:35 +0200 Subject: remove one more /fg/js/util.js --- ext/bg/settings-popup-preview.html | 1 - 1 file changed, 1 deletion(-) (limited to 'ext/bg/settings-popup-preview.html') diff --git a/ext/bg/settings-popup-preview.html b/ext/bg/settings-popup-preview.html index b79363c7..9b92b4e2 100644 --- a/ext/bg/settings-popup-preview.html +++ b/ext/bg/settings-popup-preview.html @@ -126,7 +126,6 @@ - -- cgit v1.2.3 From ce51fe7eca2e893c8631c62ccb39ce3921ad1b6b Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Mon, 9 Dec 2019 22:45:28 -0500 Subject: Use a single api.js --- ext/bg/background.html | 2 +- ext/bg/context.html | 2 +- ext/bg/js/api.js | 98 ----------------------------- ext/bg/search.html | 2 +- ext/bg/settings-popup-preview.html | 2 +- ext/bg/settings.html | 2 +- ext/fg/float.html | 2 +- ext/fg/js/api.js | 126 ------------------------------------- ext/manifest.json | 2 +- ext/mixed/js/api.js | 126 +++++++++++++++++++++++++++++++++++++ 10 files changed, 133 insertions(+), 231 deletions(-) delete mode 100644 ext/bg/js/api.js delete mode 100644 ext/fg/js/api.js create mode 100644 ext/mixed/js/api.js (limited to 'ext/bg/settings-popup-preview.html') diff --git a/ext/bg/background.html b/ext/bg/background.html index 5a6970c3..11838d14 100644 --- a/ext/bg/background.html +++ b/ext/bg/background.html @@ -20,10 +20,10 @@ + - diff --git a/ext/bg/context.html b/ext/bg/context.html index eda09a68..0e50ed7c 100644 --- a/ext/bg/context.html +++ b/ext/bg/context.html @@ -180,8 +180,8 @@ + - diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js deleted file mode 100644 index 095734fb..00000000 --- a/ext/bg/js/api.js +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (C) 2016-2017 Alex Yatskov - * Author: Alex Yatskov - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -function apiOptionsGet(optionsContext) { - return utilBackend()._onApiOptionsGet({optionsContext}); -} - -function apiOptionsSet(changedOptions, optionsContext, source) { - return utilBackend()._onApiOptionsSet({changedOptions, optionsContext, source}); -} - -function apiOptionsGetFull() { - return utilBackend()._onApiOptionsGetFull(); -} - -function apiOptionsSave(source) { - return utilBackend()._onApiOptionsSave({source}); -} - -function apiTermsFind(text, details, optionsContext) { - return utilBackend()._onApiTermsFind({text, details, optionsContext}); -} - -function apiTextParse(text, optionsContext) { - return utilBackend()._onApiTextParse({text, optionsContext}); -} - -function apiTextParseMecab(text, optionsContext) { - return utilBackend()._onApiTextParseMecab({text, optionsContext}); -} - -function apiKanjiFind(text, optionsContext) { - return utilBackend()._onApiKanjiFind({text, optionsContext}); -} - -function apiDefinitionAdd(definition, mode, context, optionsContext) { - return utilBackend()._onApiDefinitionAdd({definition, mode, context, optionsContext}); -} - -function apiDefinitionsAddable(definitions, modes, optionsContext) { - return utilBackend()._onApiDefinitionsAddable({definitions, modes, optionsContext}); -} - -function apiNoteView(noteId) { - return utilBackend()._onApiNoteView({noteId}); -} - -function apiTemplateRender(template, data, dynamic) { - return utilBackend()._onApiTemplateRender({template, data, dynamic}); -} - -function apiCommandExec(command, params) { - return utilBackend()._onApiCommandExec({command, params}); -} - -function apiAudioGetUrl(definition, source, optionsContext) { - return utilBackend()._onApiAudioGetUrl({definition, source, optionsContext}); -} - -function apiScreenshotGet(options, sender) { - return utilBackend()._onApiScreenshotGet({options}, sender); -} - -function apiForward(action, params, sender) { - return utilBackend()._onApiForward({action, params}, sender); -} - -function apiFrameInformationGet(sender) { - return utilBackend()._onApiFrameInformationGet(null, sender); -} - -function apiInjectStylesheet(css, sender) { - return utilBackend()._onApiInjectStylesheet({css}, sender); -} - -function apiGetEnvironmentInfo() { - return utilBackend()._onApiGetEnvironmentInfo(); -} - -function apiClipboardGet() { - return utilBackend()._onApiClipboardGet(); -} diff --git a/ext/bg/search.html b/ext/bg/search.html index 7b4616da..409243dd 100644 --- a/ext/bg/search.html +++ b/ext/bg/search.html @@ -62,11 +62,11 @@ + - diff --git a/ext/bg/settings-popup-preview.html b/ext/bg/settings-popup-preview.html index 9b92b4e2..f33ecedf 100644 --- a/ext/bg/settings-popup-preview.html +++ b/ext/bg/settings-popup-preview.html @@ -119,9 +119,9 @@ + - diff --git a/ext/bg/settings.html b/ext/bg/settings.html index ea34b208..a3d8cb0c 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -881,10 +881,10 @@ + - diff --git a/ext/fg/float.html b/ext/fg/float.html index 67ee50b4..886e5e8b 100644 --- a/ext/fg/float.html +++ b/ext/fg/float.html @@ -33,8 +33,8 @@ + - diff --git a/ext/fg/js/api.js b/ext/fg/js/api.js deleted file mode 100644 index ae74b8dc..00000000 --- a/ext/fg/js/api.js +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (C) 2016-2017 Alex Yatskov - * Author: Alex Yatskov - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -function apiOptionsGet(optionsContext) { - return _apiInvoke('optionsGet', {optionsContext}); -} - -function apiOptionsGetFull() { - return _apiInvoke('optionsGetFull'); -} - -function apiOptionsSet(changedOptions, optionsContext, source) { - return _apiInvoke('optionsSet', {changedOptions, optionsContext, source}); -} - -function apiOptionsSave(source) { - return _apiInvoke('optionsSave', {source}); -} - -function apiTermsFind(text, details, optionsContext) { - return _apiInvoke('termsFind', {text, details, optionsContext}); -} - -function apiTextParse(text, optionsContext) { - return _apiInvoke('textParse', {text, optionsContext}); -} - -function apiTextParseMecab(text, optionsContext) { - return _apiInvoke('textParseMecab', {text, optionsContext}); -} - -function apiKanjiFind(text, optionsContext) { - return _apiInvoke('kanjiFind', {text, optionsContext}); -} - -function apiDefinitionAdd(definition, mode, context, optionsContext) { - return _apiInvoke('definitionAdd', {definition, mode, context, optionsContext}); -} - -function apiDefinitionsAddable(definitions, modes, optionsContext) { - return _apiInvoke('definitionsAddable', {definitions, modes, optionsContext}).catch(() => null); -} - -function apiNoteView(noteId) { - return _apiInvoke('noteView', {noteId}); -} - -function apiTemplateRender(template, data, dynamic) { - return _apiInvoke('templateRender', {data, template, dynamic}); -} - -function apiAudioGetUrl(definition, source, optionsContext) { - return _apiInvoke('audioGetUrl', {definition, source, optionsContext}); -} - -function apiCommandExec(command, params) { - return _apiInvoke('commandExec', {command, params}); -} - -function apiScreenshotGet(options) { - return _apiInvoke('screenshotGet', {options}); -} - -function apiForward(action, params) { - return _apiInvoke('forward', {action, params}); -} - -function apiFrameInformationGet() { - return _apiInvoke('frameInformationGet'); -} - -function apiInjectStylesheet(css) { - return _apiInvoke('injectStylesheet', {css}); -} - -function apiGetEnvironmentInfo() { - return _apiInvoke('getEnvironmentInfo'); -} - -function apiClipboardGet() { - return _apiInvoke('clipboardGet'); -} - -function _apiInvoke(action, params={}) { - const data = {action, params}; - return new Promise((resolve, reject) => { - try { - chrome.runtime.sendMessage(data, (response) => { - _apiCheckLastError(chrome.runtime.lastError); - if (response !== null && typeof response === 'object') { - if (typeof response.error !== 'undefined') { - reject(jsonToError(response.error)); - } else { - resolve(response.result); - } - } else { - const message = response === null ? 'Unexpected null response' : `Unexpected response of type ${typeof response}`; - reject(new Error(`${message} (${JSON.stringify(data)})`)); - } - }); - } catch (e) { - window.yomichan_orphaned = true; - reject(e); - } - }); -} - -function _apiCheckLastError() { - // NOP -} diff --git a/ext/manifest.json b/ext/manifest.json index 225ca441..1e819328 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -20,8 +20,8 @@ "js": [ "mixed/js/core.js", "mixed/js/dom.js", + "mixed/js/api.js", "mixed/js/text-scanner.js", - "fg/js/api.js", "fg/js/document.js", "fg/js/frontend-api-receiver.js", "fg/js/popup.js", diff --git a/ext/mixed/js/api.js b/ext/mixed/js/api.js new file mode 100644 index 00000000..ae74b8dc --- /dev/null +++ b/ext/mixed/js/api.js @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2016-2017 Alex Yatskov + * Author: Alex Yatskov + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +function apiOptionsGet(optionsContext) { + return _apiInvoke('optionsGet', {optionsContext}); +} + +function apiOptionsGetFull() { + return _apiInvoke('optionsGetFull'); +} + +function apiOptionsSet(changedOptions, optionsContext, source) { + return _apiInvoke('optionsSet', {changedOptions, optionsContext, source}); +} + +function apiOptionsSave(source) { + return _apiInvoke('optionsSave', {source}); +} + +function apiTermsFind(text, details, optionsContext) { + return _apiInvoke('termsFind', {text, details, optionsContext}); +} + +function apiTextParse(text, optionsContext) { + return _apiInvoke('textParse', {text, optionsContext}); +} + +function apiTextParseMecab(text, optionsContext) { + return _apiInvoke('textParseMecab', {text, optionsContext}); +} + +function apiKanjiFind(text, optionsContext) { + return _apiInvoke('kanjiFind', {text, optionsContext}); +} + +function apiDefinitionAdd(definition, mode, context, optionsContext) { + return _apiInvoke('definitionAdd', {definition, mode, context, optionsContext}); +} + +function apiDefinitionsAddable(definitions, modes, optionsContext) { + return _apiInvoke('definitionsAddable', {definitions, modes, optionsContext}).catch(() => null); +} + +function apiNoteView(noteId) { + return _apiInvoke('noteView', {noteId}); +} + +function apiTemplateRender(template, data, dynamic) { + return _apiInvoke('templateRender', {data, template, dynamic}); +} + +function apiAudioGetUrl(definition, source, optionsContext) { + return _apiInvoke('audioGetUrl', {definition, source, optionsContext}); +} + +function apiCommandExec(command, params) { + return _apiInvoke('commandExec', {command, params}); +} + +function apiScreenshotGet(options) { + return _apiInvoke('screenshotGet', {options}); +} + +function apiForward(action, params) { + return _apiInvoke('forward', {action, params}); +} + +function apiFrameInformationGet() { + return _apiInvoke('frameInformationGet'); +} + +function apiInjectStylesheet(css) { + return _apiInvoke('injectStylesheet', {css}); +} + +function apiGetEnvironmentInfo() { + return _apiInvoke('getEnvironmentInfo'); +} + +function apiClipboardGet() { + return _apiInvoke('clipboardGet'); +} + +function _apiInvoke(action, params={}) { + const data = {action, params}; + return new Promise((resolve, reject) => { + try { + chrome.runtime.sendMessage(data, (response) => { + _apiCheckLastError(chrome.runtime.lastError); + if (response !== null && typeof response === 'object') { + if (typeof response.error !== 'undefined') { + reject(jsonToError(response.error)); + } else { + resolve(response.result); + } + } else { + const message = response === null ? 'Unexpected null response' : `Unexpected response of type ${typeof response}`; + reject(new Error(`${message} (${JSON.stringify(data)})`)); + } + }); + } catch (e) { + window.yomichan_orphaned = true; + reject(e); + } + }); +} + +function _apiCheckLastError() { + // NOP +} -- cgit v1.2.3