From a2b66dc6cc3bd0d037c050eb49e270189a6617fb Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Tue, 7 Apr 2020 19:51:39 -0400 Subject: Rename apiForward to apiBroadcast --- ext/fg/js/frontend.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/fg/js/frontend.js') diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js index 31843212..bcb0b84a 100644 --- a/ext/fg/js/frontend.js +++ b/ext/fg/js/frontend.js @@ -18,7 +18,7 @@ /* global * TextScanner - * apiForward + * apiBroadcast * apiGetZoom * apiKanjiFind * apiOptionsGet @@ -261,12 +261,12 @@ class Frontend extends TextScanner { _broadcastRootPopupInformation() { if (!this.popup.isProxy() && this.popup.depth === 0) { - apiForward('rootPopupInformation', {popupId: this.popup.id, frameId: this.popup.frameId}); + apiBroadcast('rootPopupInformation', {popupId: this.popup.id, frameId: this.popup.frameId}); } } _broadcastDocumentInformation(uniqueId) { - apiForward('documentInformationBroadcast', { + apiBroadcast('documentInformationBroadcast', { uniqueId, frameId: this.popup.frameId, title: document.title -- cgit v1.2.3 From 4e5029f7ec82aaa99e16bd84a0ec2ad19a15c6b0 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Fri, 10 Apr 2020 11:06:55 -0700 Subject: Update license author field to broader to explicitly reflect that Yomichan is an ongoing community project. It really does take a village, and everyone who contributes code owns a part of it :) --- LICENSE | 2 +- ext/bg/css/settings.css | 3 +-- ext/bg/js/anki-note-builder.js | 3 +-- ext/bg/js/anki.js | 3 +-- ext/bg/js/audio-uri-builder.js | 3 +-- ext/bg/js/backend-api-forwarder.js | 3 +-- ext/bg/js/backend.js | 3 +-- ext/bg/js/clipboard-monitor.js | 3 +-- ext/bg/js/conditions.js | 3 +-- ext/bg/js/context.js | 3 +-- ext/bg/js/database.js | 3 +-- ext/bg/js/deinflector.js | 3 +-- ext/bg/js/dictionary-importer.js | 3 +-- ext/bg/js/dictionary.js | 3 +-- ext/bg/js/handlebars.js | 3 +-- ext/bg/js/japanese.js | 3 +-- ext/bg/js/json-schema.js | 3 +-- ext/bg/js/mecab.js | 3 +-- ext/bg/js/options.js | 3 +-- ext/bg/js/page-exit-prevention.js | 3 +-- ext/bg/js/profile-conditions.js | 3 +-- ext/bg/js/request.js | 3 +-- ext/bg/js/search-frontend.js | 3 +-- ext/bg/js/search-query-parser-generator.js | 3 +-- ext/bg/js/search-query-parser.js | 3 +-- ext/bg/js/search.js | 3 +-- ext/bg/js/settings/anki-templates.js | 3 +-- ext/bg/js/settings/anki.js | 3 +-- ext/bg/js/settings/audio-ui.js | 3 +-- ext/bg/js/settings/audio.js | 3 +-- ext/bg/js/settings/backup.js | 3 +-- ext/bg/js/settings/conditions-ui.js | 3 +-- ext/bg/js/settings/dictionaries.js | 3 +-- ext/bg/js/settings/main.js | 3 +-- ext/bg/js/settings/popup-preview-frame.js | 3 +-- ext/bg/js/settings/popup-preview.js | 3 +-- ext/bg/js/settings/profiles.js | 3 +-- ext/bg/js/settings/storage.js | 3 +-- ext/bg/js/text-source-map.js | 3 +-- ext/bg/js/translator.js | 3 +-- ext/bg/js/util.js | 3 +-- ext/bg/legal.html | 2 +- ext/fg/css/client.css | 3 +-- ext/fg/js/document.js | 3 +-- ext/fg/js/float.js | 3 +-- ext/fg/js/frame-offset-forwarder.js | 3 +-- ext/fg/js/frontend-api-receiver.js | 3 +-- ext/fg/js/frontend-api-sender.js | 3 +-- ext/fg/js/frontend-initialize.js | 3 +-- ext/fg/js/frontend.js | 3 +-- ext/fg/js/popup-nested.js | 3 +-- ext/fg/js/popup-proxy-host.js | 3 +-- ext/fg/js/popup-proxy.js | 3 +-- ext/fg/js/popup.js | 3 +-- ext/fg/js/source.js | 3 +-- ext/mixed/css/display-dark.css | 3 +-- ext/mixed/css/display-default.css | 3 +-- ext/mixed/css/display.css | 3 +-- ext/mixed/js/api.js | 3 +-- ext/mixed/js/audio-system.js | 3 +-- ext/mixed/js/core.js | 3 +-- ext/mixed/js/display-context.js | 3 +-- ext/mixed/js/display-generator.js | 3 +-- ext/mixed/js/display.js | 3 +-- ext/mixed/js/dom.js | 3 +-- ext/mixed/js/japanese.js | 3 +-- ext/mixed/js/object-property-accessor.js | 3 +-- ext/mixed/js/scroll.js | 3 +-- ext/mixed/js/template-handler.js | 3 +-- ext/mixed/js/text-scanner.js | 3 +-- ext/mixed/js/timer.js | 3 +-- test/dictionary-validate.js | 3 +-- test/lint/global-declarations.js | 4 ++-- test/schema-validate.js | 3 +-- test/test-database.js | 3 +-- test/test-dictionary.js | 3 +-- test/test-document.js | 3 +-- test/test-japanese.js | 3 +-- test/test-object-property-accessor.js | 3 +-- test/test-schema.js | 3 +-- test/test-text-source-map.js | 3 +-- test/yomichan-test.js | 3 +-- test/yomichan-vm.js | 3 +-- 83 files changed, 84 insertions(+), 164 deletions(-) (limited to 'ext/fg/js/frontend.js') diff --git a/LICENSE b/LICENSE index f8531a9f..23c698c5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2016-2020 Alex Yatskov +Copyright 2016-2020 Yomichan Authors 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 diff --git a/ext/bg/css/settings.css b/ext/bg/css/settings.css index 6344bd38..f55082e7 100644 --- a/ext/bg/css/settings.css +++ b/ext/bg/css/settings.css @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/anki-note-builder.js b/ext/bg/js/anki-note-builder.js index 244aaab8..8a707006 100644 --- a/ext/bg/js/anki-note-builder.js +++ b/ext/bg/js/anki-note-builder.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/anki.js b/ext/bg/js/anki.js index a70388bd..c7f7c0cc 100644 --- a/ext/bg/js/anki.js +++ b/ext/bg/js/anki.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2016-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2016-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/audio-uri-builder.js b/ext/bg/js/audio-uri-builder.js index 158006bb..dfd195d8 100644 --- a/ext/bg/js/audio-uri-builder.js +++ b/ext/bg/js/audio-uri-builder.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2017-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2017-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/backend-api-forwarder.js b/ext/bg/js/backend-api-forwarder.js index 170a6b32..93db77d7 100644 --- a/ext/bg/js/backend-api-forwarder.js +++ b/ext/bg/js/backend-api-forwarder.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js index 1fa7ede1..6386319b 100644 --- a/ext/bg/js/backend.js +++ b/ext/bg/js/backend.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2016-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2016-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/clipboard-monitor.js b/ext/bg/js/clipboard-monitor.js index c67525fc..e7e7378c 100644 --- a/ext/bg/js/clipboard-monitor.js +++ b/ext/bg/js/clipboard-monitor.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/conditions.js b/ext/bg/js/conditions.js index d4d1c0e0..eb9582df 100644 --- a/ext/bg/js/conditions.js +++ b/ext/bg/js/conditions.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/context.js b/ext/bg/js/context.js index c3e74656..e3d4ad4a 100644 --- a/ext/bg/js/context.js +++ b/ext/bg/js/context.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2017-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2017-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js index 4a677fea..ad4e3bad 100644 --- a/ext/bg/js/database.js +++ b/ext/bg/js/database.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2016-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2016-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/deinflector.js b/ext/bg/js/deinflector.js index d548d271..6ec6e899 100644 --- a/ext/bg/js/deinflector.js +++ b/ext/bg/js/deinflector.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2016-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2016-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/dictionary-importer.js b/ext/bg/js/dictionary-importer.js index 254fde4f..bf6809ec 100644 --- a/ext/bg/js/dictionary-importer.js +++ b/ext/bg/js/dictionary-importer.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js index 74bd5a64..15cc7615 100644 --- a/ext/bg/js/dictionary.js +++ b/ext/bg/js/dictionary.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2016-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2016-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/handlebars.js b/ext/bg/js/handlebars.js index 5fda5baa..860acb14 100644 --- a/ext/bg/js/handlebars.js +++ b/ext/bg/js/handlebars.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2016-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2016-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/japanese.js b/ext/bg/js/japanese.js index 2a2b39fd..5c49cca7 100644 --- a/ext/bg/js/japanese.js +++ b/ext/bg/js/japanese.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2016-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2016-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js index 58f804fd..f62402f9 100644 --- a/ext/bg/js/json-schema.js +++ b/ext/bg/js/json-schema.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/mecab.js b/ext/bg/js/mecab.js index 34ecd728..cd6e6c57 100644 --- a/ext/bg/js/mecab.js +++ b/ext/bg/js/mecab.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index abb054d4..20df2a68 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2016-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2016-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/page-exit-prevention.js b/ext/bg/js/page-exit-prevention.js index be06c495..f55cf024 100644 --- a/ext/bg/js/page-exit-prevention.js +++ b/ext/bg/js/page-exit-prevention.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/profile-conditions.js b/ext/bg/js/profile-conditions.js index 1fd78e5d..a0710bd1 100644 --- a/ext/bg/js/profile-conditions.js +++ b/ext/bg/js/profile-conditions.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/request.js b/ext/bg/js/request.js index 02eed6fb..957ac0f5 100644 --- a/ext/bg/js/request.js +++ b/ext/bg/js/request.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2017-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2017-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/search-frontend.js b/ext/bg/js/search-frontend.js index f130a6fa..9cc1436f 100644 --- a/ext/bg/js/search-frontend.js +++ b/ext/bg/js/search-frontend.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/search-query-parser-generator.js b/ext/bg/js/search-query-parser-generator.js index 664858a4..390841c1 100644 --- a/ext/bg/js/search-query-parser-generator.js +++ b/ext/bg/js/search-query-parser-generator.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/search-query-parser.js b/ext/bg/js/search-query-parser.js index 9f59f2e5..01a0ace5 100644 --- a/ext/bg/js/search-query-parser.js +++ b/ext/bg/js/search-query-parser.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js index 9250fdde..2ba3e468 100644 --- a/ext/bg/js/search.js +++ b/ext/bg/js/search.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2016-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2016-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/settings/anki-templates.js b/ext/bg/js/settings/anki-templates.js index e3852eb4..d5b6e677 100644 --- a/ext/bg/js/settings/anki-templates.js +++ b/ext/bg/js/settings/anki-templates.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/settings/anki.js b/ext/bg/js/settings/anki.js index f2e1ca76..b32a9517 100644 --- a/ext/bg/js/settings/anki.js +++ b/ext/bg/js/settings/anki.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/settings/audio-ui.js b/ext/bg/js/settings/audio-ui.js index 206539a4..73c64227 100644 --- a/ext/bg/js/settings/audio-ui.js +++ b/ext/bg/js/settings/audio-ui.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/settings/audio.js b/ext/bg/js/settings/audio.js index 38dd6349..3c6e126c 100644 --- a/ext/bg/js/settings/audio.js +++ b/ext/bg/js/settings/audio.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/settings/backup.js b/ext/bg/js/settings/backup.js index 21417dfb..bdfef658 100644 --- a/ext/bg/js/settings/backup.js +++ b/ext/bg/js/settings/backup.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/settings/conditions-ui.js b/ext/bg/js/settings/conditions-ui.js index 9d61d25e..84498b42 100644 --- a/ext/bg/js/settings/conditions-ui.js +++ b/ext/bg/js/settings/conditions-ui.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js index 33ced3b9..1a6d452b 100644 --- a/ext/bg/js/settings/dictionaries.js +++ b/ext/bg/js/settings/dictionaries.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js index 1653ee35..8fd94562 100644 --- a/ext/bg/js/settings/main.js +++ b/ext/bg/js/settings/main.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2016-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2016-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/settings/popup-preview-frame.js b/ext/bg/js/settings/popup-preview-frame.js index 6a149841..fba114e2 100644 --- a/ext/bg/js/settings/popup-preview-frame.js +++ b/ext/bg/js/settings/popup-preview-frame.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/settings/popup-preview.js b/ext/bg/js/settings/popup-preview.js index d1d2ff5e..091872be 100644 --- a/ext/bg/js/settings/popup-preview.js +++ b/ext/bg/js/settings/popup-preview.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/settings/profiles.js b/ext/bg/js/settings/profiles.js index b35b6309..867b17aa 100644 --- a/ext/bg/js/settings/profiles.js +++ b/ext/bg/js/settings/profiles.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/settings/storage.js b/ext/bg/js/settings/storage.js index ae305e22..d754a109 100644 --- a/ext/bg/js/settings/storage.js +++ b/ext/bg/js/settings/storage.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2019-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2019-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/text-source-map.js b/ext/bg/js/text-source-map.js index 24970978..1776ae07 100644 --- a/ext/bg/js/text-source-map.js +++ b/ext/bg/js/text-source-map.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js index 27f91c05..e4441384 100644 --- a/ext/bg/js/translator.js +++ b/ext/bg/js/translator.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2016-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2016-2020 Yomichan Authors * * 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 diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js index a7ed4a34..69536f02 100644 --- a/ext/bg/js/util.js +++ b/ext/bg/js/util.js @@ -1,6 +1,5 @@ /* - * Copyright (C) 2016-2020 Alex Yatskov - * Author: Alex Yatskov + * Copyright (C) 2016-2020 Yomichan Authors * * 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 diff --git a/ext/bg/legal.html b/ext/bg/legal.html index c1e606d7..78acf79a 100644 --- a/ext/bg/legal.html +++ b/ext/bg/legal.html @@ -17,7 +17,7 @@

Yomichan License

-Copyright (C) 2016-2020  Alex Yatskov
+Copyright (C) 2016-2020  Yomichan Authors
 
 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
diff --git a/ext/fg/css/client.css b/ext/fg/css/client.css
index 5720d8ac..227f5030 100644
--- a/ext/fg/css/client.css
+++ b/ext/fg/css/client.css
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/fg/js/document.js b/ext/fg/js/document.js
index 490f61bb..3b4cc28f 100644
--- a/ext/fg/js/document.js
+++ b/ext/fg/js/document.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 01055ca6..77e5ea0a 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/fg/js/frame-offset-forwarder.js b/ext/fg/js/frame-offset-forwarder.js
index 7b417b6e..b3c10bb8 100644
--- a/ext/fg/js/frame-offset-forwarder.js
+++ b/ext/fg/js/frame-offset-forwarder.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
diff --git a/ext/fg/js/frontend-api-receiver.js b/ext/fg/js/frontend-api-receiver.js
index 642d96df..4abd4e81 100644
--- a/ext/fg/js/frontend-api-receiver.js
+++ b/ext/fg/js/frontend-api-receiver.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/fg/js/frontend-api-sender.js b/ext/fg/js/frontend-api-sender.js
index 4431df61..1d539cab 100644
--- a/ext/fg/js/frontend-api-sender.js
+++ b/ext/fg/js/frontend-api-sender.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/frontend-initialize.js
index 4a1409db..0a586ff9 100644
--- a/ext/fg/js/frontend-initialize.js
+++ b/ext/fg/js/frontend-initialize.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 31843212..6fbbd0fb 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/fg/js/popup-nested.js b/ext/fg/js/popup-nested.js
index 39d91fd8..1b24614b 100644
--- a/ext/fg/js/popup-nested.js
+++ b/ext/fg/js/popup-nested.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/fg/js/popup-proxy-host.js b/ext/fg/js/popup-proxy-host.js
index 4b136e41..958462ff 100644
--- a/ext/fg/js/popup-proxy-host.js
+++ b/ext/fg/js/popup-proxy-host.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/fg/js/popup-proxy.js b/ext/fg/js/popup-proxy.js
index 966198a9..82ad9a8f 100644
--- a/ext/fg/js/popup-proxy.js
+++ b/ext/fg/js/popup-proxy.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 60dc16dd..42f08afa 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/fg/js/source.js b/ext/fg/js/source.js
index 6dc482bd..3d9afe0f 100644
--- a/ext/fg/js/source.js
+++ b/ext/fg/js/source.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/mixed/css/display-dark.css b/ext/mixed/css/display-dark.css
index 550dff3e..e4549bbf 100644
--- a/ext/mixed/css/display-dark.css
+++ b/ext/mixed/css/display-dark.css
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the entrys of the GNU General Public License as published by
diff --git a/ext/mixed/css/display-default.css b/ext/mixed/css/display-default.css
index 487b8cb8..7bcb1014 100644
--- a/ext/mixed/css/display-default.css
+++ b/ext/mixed/css/display-default.css
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the entrys of the GNU General Public License as published by
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index a4432016..92ba52c6 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the entrys of the GNU General Public License as published by
diff --git a/ext/mixed/js/api.js b/ext/mixed/js/api.js
index feec94df..066077cf 100644
--- a/ext/mixed/js/api.js
+++ b/ext/mixed/js/api.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/mixed/js/audio-system.js b/ext/mixed/js/audio-system.js
index 31c476b1..45b733fc 100644
--- a/ext/mixed/js/audio-system.js
+++ b/ext/mixed/js/audio-system.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/mixed/js/core.js b/ext/mixed/js/core.js
index db7fc69b..2d11c11a 100644
--- a/ext/mixed/js/core.js
+++ b/ext/mixed/js/core.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/mixed/js/display-context.js b/ext/mixed/js/display-context.js
index c11c2342..5ee78459 100644
--- a/ext/mixed/js/display-context.js
+++ b/ext/mixed/js/display-context.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index f1122e3d..b0cc2478 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 2f456c3e..bf6990a1 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2017-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2017-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/mixed/js/dom.js b/ext/mixed/js/dom.js
index 807a48e1..03acbb80 100644
--- a/ext/mixed/js/dom.js
+++ b/ext/mixed/js/dom.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/mixed/js/japanese.js b/ext/mixed/js/japanese.js
index e6b9a8a0..79d69946 100644
--- a/ext/mixed/js/japanese.js
+++ b/ext/mixed/js/japanese.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
diff --git a/ext/mixed/js/object-property-accessor.js b/ext/mixed/js/object-property-accessor.js
index 108afc0d..349037b3 100644
--- a/ext/mixed/js/object-property-accessor.js
+++ b/ext/mixed/js/object-property-accessor.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/mixed/js/scroll.js b/ext/mixed/js/scroll.js
index 72da8b65..840fdb9c 100644
--- a/ext/mixed/js/scroll.js
+++ b/ext/mixed/js/scroll.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/mixed/js/template-handler.js b/ext/mixed/js/template-handler.js
index a5a62937..f17fd60c 100644
--- a/ext/mixed/js/template-handler.js
+++ b/ext/mixed/js/template-handler.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
diff --git a/ext/mixed/js/text-scanner.js b/ext/mixed/js/text-scanner.js
index b8156c01..a1d96320 100644
--- a/ext/mixed/js/text-scanner.js
+++ b/ext/mixed/js/text-scanner.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/ext/mixed/js/timer.js b/ext/mixed/js/timer.js
index 1caf7a05..30408e93 100644
--- a/ext/mixed/js/timer.js
+++ b/ext/mixed/js/timer.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * 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
diff --git a/test/dictionary-validate.js b/test/dictionary-validate.js
index 6496f2ac..f1730852 100644
--- a/test/dictionary-validate.js
+++ b/test/dictionary-validate.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
diff --git a/test/lint/global-declarations.js b/test/lint/global-declarations.js
index 2629cc5e..07ba5570 100644
--- a/test/lint/global-declarations.js
+++ b/test/lint/global-declarations.js
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
+ * Author: Yomichan Authors
  *
  * 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
diff --git a/test/schema-validate.js b/test/schema-validate.js
index eb31aa8d..761f0a1c 100644
--- a/test/schema-validate.js
+++ b/test/schema-validate.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
diff --git a/test/test-database.js b/test/test-database.js
index bab15aa4..d27f92e1 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
diff --git a/test/test-dictionary.js b/test/test-dictionary.js
index 74f9e62b..27cc90df 100644
--- a/test/test-dictionary.js
+++ b/test/test-dictionary.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
diff --git a/test/test-document.js b/test/test-document.js
index 80b9719d..0d9026db 100644
--- a/test/test-document.js
+++ b/test/test-document.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
diff --git a/test/test-japanese.js b/test/test-japanese.js
index ca65dde2..f4b084ac 100644
--- a/test/test-japanese.js
+++ b/test/test-japanese.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
diff --git a/test/test-object-property-accessor.js b/test/test-object-property-accessor.js
index 47d2e451..0773ba6e 100644
--- a/test/test-object-property-accessor.js
+++ b/test/test-object-property-accessor.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
diff --git a/test/test-schema.js b/test/test-schema.js
index 5f9915fd..7620ab16 100644
--- a/test/test-schema.js
+++ b/test/test-schema.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
diff --git a/test/test-text-source-map.js b/test/test-text-source-map.js
index 25bd8fc2..f092de2c 100644
--- a/test/test-text-source-map.js
+++ b/test/test-text-source-map.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
diff --git a/test/yomichan-test.js b/test/yomichan-test.js
index 5fa7730b..3351ecdf 100644
--- a/test/yomichan-test.js
+++ b/test/yomichan-test.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
diff --git a/test/yomichan-vm.js b/test/yomichan-vm.js
index ff478844..97faa03e 100644
--- a/test/yomichan-vm.js
+++ b/test/yomichan-vm.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov 
- * Author: Alex Yatskov 
+ * Copyright (C) 2020  Yomichan Authors
  *
  * 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
-- 
cgit v1.2.3


From a296c758b95b428777548f5aada1be13429faf03 Mon Sep 17 00:00:00 2001
From: toasted-nutbread 
Date: Fri, 10 Apr 2020 20:00:18 -0400
Subject: apiBroadcast => apiBroadcastTab

---
 ext/bg/js/backend.js                | 4 ++--
 ext/fg/js/float.js                  | 6 +++---
 ext/fg/js/frame-offset-forwarder.js | 4 ++--
 ext/fg/js/frontend-initialize.js    | 4 ++--
 ext/fg/js/frontend.js               | 6 +++---
 ext/mixed/js/api.js                 | 4 ++--
 ext/mixed/js/display.js             | 4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'ext/fg/js/frontend.js')

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 35e75bbe..20e17836 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -94,7 +94,7 @@ class Backend {
             ['commandExec', {handler: this._onApiCommandExec.bind(this), async: false}],
             ['audioGetUri', {handler: this._onApiAudioGetUri.bind(this), async: true}],
             ['screenshotGet', {handler: this._onApiScreenshotGet.bind(this), async: true}],
-            ['broadcast', {handler: this._onApiBroadcast.bind(this), async: false}],
+            ['broadcastTab', {handler: this._onApiBroadcastTab.bind(this), async: false}],
             ['frameInformationGet', {handler: this._onApiFrameInformationGet.bind(this), async: true}],
             ['injectStylesheet', {handler: this._onApiInjectStylesheet.bind(this), async: true}],
             ['getEnvironmentInfo', {handler: this._onApiGetEnvironmentInfo.bind(this), async: true}],
@@ -566,7 +566,7 @@ class Backend {
         });
     }
 
-    _onApiBroadcast({action, params}, sender) {
+    _onApiBroadcastTab({action, params}, sender) {
         if (!(sender && sender.tab)) {
             return false;
         }
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 8c00d0a5..d0c0f419 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -18,7 +18,7 @@
 
 /* global
  * Display
- * apiBroadcast
+ * apiBroadcastTab
  * apiGetMessageToken
  * popupNestedInitialize
  */
@@ -80,7 +80,7 @@ class DisplayFloat extends Display {
 
         this.setContentScale(scale);
 
-        apiBroadcast('popupPrepareCompleted', {targetPopupId: this._popupId});
+        apiBroadcastTab('popupPrepareCompleted', {targetPopupId: this._popupId});
     }
 
     onError(error) {
@@ -181,7 +181,7 @@ class DisplayFloat extends Display {
                 },
                 2000
             );
-            apiBroadcast('requestDocumentInformationBroadcast', {uniqueId});
+            apiBroadcastTab('requestDocumentInformationBroadcast', {uniqueId});
 
             const {title} = await promise;
             return title;
diff --git a/ext/fg/js/frame-offset-forwarder.js b/ext/fg/js/frame-offset-forwarder.js
index 88c1b72c..609d0d77 100644
--- a/ext/fg/js/frame-offset-forwarder.js
+++ b/ext/fg/js/frame-offset-forwarder.js
@@ -17,7 +17,7 @@
  */
 
 /* global
- * apiBroadcast
+ * apiBroadcastTab
  */
 
 class FrameOffsetForwarder {
@@ -97,6 +97,6 @@ class FrameOffsetForwarder {
     }
 
     _forwardFrameOffsetOrigin(offset, uniqueId) {
-        apiBroadcast('frameOffset', {offset, uniqueId});
+        apiBroadcastTab('frameOffset', {offset, uniqueId});
     }
 }
diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/frontend-initialize.js
index d2572746..5c9ce7b1 100644
--- a/ext/fg/js/frontend-initialize.js
+++ b/ext/fg/js/frontend-initialize.js
@@ -21,7 +21,7 @@
  * Frontend
  * PopupProxy
  * PopupProxyHost
- * apiBroadcast
+ * apiBroadcastTab
  * apiOptionsGet
  */
 
@@ -44,7 +44,7 @@ async function main() {
                 }
             }
         );
-        apiBroadcast('rootPopupRequestInformationBroadcast');
+        apiBroadcastTab('rootPopupRequestInformationBroadcast');
         const {popupId, frameId} = await rootPopupInformationPromise;
 
         const frameOffsetForwarder = new FrameOffsetForwarder();
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index bcb0b84a..b380dbfd 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -18,7 +18,7 @@
 
 /* global
  * TextScanner
- * apiBroadcast
+ * apiBroadcastTab
  * apiGetZoom
  * apiKanjiFind
  * apiOptionsGet
@@ -261,12 +261,12 @@ class Frontend extends TextScanner {
 
     _broadcastRootPopupInformation() {
         if (!this.popup.isProxy() && this.popup.depth === 0) {
-            apiBroadcast('rootPopupInformation', {popupId: this.popup.id, frameId: this.popup.frameId});
+            apiBroadcastTab('rootPopupInformation', {popupId: this.popup.id, frameId: this.popup.frameId});
         }
     }
 
     _broadcastDocumentInformation(uniqueId) {
-        apiBroadcast('documentInformationBroadcast', {
+        apiBroadcastTab('documentInformationBroadcast', {
             uniqueId,
             frameId: this.popup.frameId,
             title: document.title
diff --git a/ext/mixed/js/api.js b/ext/mixed/js/api.js
index d28e3ab6..83a4a403 100644
--- a/ext/mixed/js/api.js
+++ b/ext/mixed/js/api.js
@@ -81,8 +81,8 @@ function apiScreenshotGet(options) {
     return _apiInvoke('screenshotGet', {options});
 }
 
-function apiBroadcast(action, params) {
-    return _apiInvoke('broadcast', {action, params});
+function apiBroadcastTab(action, params) {
+    return _apiInvoke('broadcastTab', {action, params});
 }
 
 function apiFrameInformationGet() {
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 710674b2..b691ae12 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -23,7 +23,7 @@
  * DisplayGenerator
  * WindowScroll
  * apiAudioGetUri
- * apiBroadcast
+ * apiBroadcastTab
  * apiDefinitionAdd
  * apiDefinitionsAddable
  * apiKanjiFind
@@ -855,7 +855,7 @@ class Display {
     }
 
     setPopupVisibleOverride(visible) {
-        return apiBroadcast('popupSetVisibleOverride', {visible});
+        return apiBroadcastTab('popupSetVisibleOverride', {visible});
     }
 
     setSpinnerVisible(visible) {
-- 
cgit v1.2.3


From 1df59d57b5dcbf9d3efedcb21a4d5e16524a67c1 Mon Sep 17 00:00:00 2001
From: siikamiika 
Date: Fri, 10 Apr 2020 02:48:41 +0300
Subject: limit popup depth live

---
 ext/fg/js/frontend.js        | 3 ++-
 ext/mixed/js/text-scanner.js | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'ext/fg/js/frontend.js')

diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 55d699e5..a6b24c76 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -30,7 +30,8 @@ class Frontend extends TextScanner {
         super(
             window,
             popup.isProxy() ? [] : [popup.getContainer()],
-            [(x, y) => this.popup.containsPoint(x, y)]
+            [(x, y) => this.popup.containsPoint(x, y)],
+            () => this.popup.depth <= this.options.scanning.popupNestingMaxDepth
         );
 
         this.popup = popup;
diff --git a/ext/mixed/js/text-scanner.js b/ext/mixed/js/text-scanner.js
index a1d96320..1d6e36e0 100644
--- a/ext/mixed/js/text-scanner.js
+++ b/ext/mixed/js/text-scanner.js
@@ -22,11 +22,13 @@
  */
 
 class TextScanner {
-    constructor(node, ignoreElements, ignorePoints) {
+    constructor(node, ignoreElements, ignorePoints, canEnable=null) {
         this.node = node;
         this.ignoreElements = ignoreElements;
         this.ignorePoints = ignorePoints;
 
+        this.canEnable = canEnable;
+
         this.ignoreNodes = null;
 
         this.scanTimerPromise = null;
@@ -225,6 +227,10 @@ class TextScanner {
     }
 
     setEnabled(enabled) {
+        if (this.canEnable !== null && !this.canEnable()) {
+            enabled = false;
+        }
+
         if (enabled) {
             if (!this.enabled) {
                 this.hookEvents();
-- 
cgit v1.2.3


From 92109bb5d25db99033b0bb9f7f3806883f79218d Mon Sep 17 00:00:00 2001
From: siikamiika 
Date: Fri, 10 Apr 2020 03:55:25 +0300
Subject: allow disabling scan on search page live

---
 ext/bg/js/search-frontend.js     |  2 +-
 ext/fg/js/frontend-initialize.js | 15 +++++++++++++--
 ext/fg/js/frontend.js            | 18 ++++++++++++++++--
 3 files changed, 30 insertions(+), 5 deletions(-)

(limited to 'ext/fg/js/frontend.js')

diff --git a/ext/bg/js/search-frontend.js b/ext/bg/js/search-frontend.js
index 18cb6060..e534e771 100644
--- a/ext/bg/js/search-frontend.js
+++ b/ext/bg/js/search-frontend.js
@@ -65,7 +65,7 @@ async function main() {
         if (!options.scanning.enableOnSearchPage || optionsApplied) { return; }
         optionsApplied = true;
 
-        window.frontendInitializationData = {depth: 1, proxy: false};
+        window.frontendInitializationData = {depth: 1, proxy: false, isSearchPage: true};
         injectSearchFrontend();
 
         yomichan.off('optionsUpdated', applyOptions);
diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/frontend-initialize.js
index 5af7fdf0..3fe5ac5b 100644
--- a/ext/fg/js/frontend-initialize.js
+++ b/ext/fg/js/frontend-initialize.js
@@ -28,7 +28,18 @@ async function main() {
     await yomichan.prepare();
 
     const data = window.frontendInitializationData || {};
-    const {id, depth=0, parentFrameId, url, proxy=false} = data;
+    const {id, depth=0, parentFrameId, url, proxy=false, isSearchPage=false} = data;
+
+    const initEventDispatcher = new EventDispatcher();
+
+    yomichan.on('optionsUpdated', async () => {
+        const optionsContext = {depth: isSearchPage ? 0 : depth, url};
+        const options = await apiOptionsGet(optionsContext);
+        if (isSearchPage) {
+            const disabled = !options.scanning.enableOnSearchPage;
+            initEventDispatcher.trigger('setDisabledOverride', {disabled});
+        }
+    });
 
     const optionsContext = {depth, url};
     const options = await apiOptionsGet(optionsContext);
@@ -65,7 +76,7 @@ async function main() {
         popup = popupHost.getOrCreatePopup(null, null, depth);
     }
 
-    const frontend = new Frontend(popup);
+    const frontend = new Frontend(popup, initEventDispatcher);
     await frontend.prepare();
 }
 
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index a6b24c76..a6df4b4c 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -26,15 +26,19 @@
  */
 
 class Frontend extends TextScanner {
-    constructor(popup) {
+    constructor(popup, initEventDispatcher) {
         super(
             window,
             popup.isProxy() ? [] : [popup.getContainer()],
             [(x, y) => this.popup.containsPoint(x, y)],
-            () => this.popup.depth <= this.options.scanning.popupNestingMaxDepth
+            () => this.popup.depth <= this.options.scanning.popupNestingMaxDepth && !this._disabledOverride
         );
 
         this.popup = popup;
+        this.initEventDispatcher = initEventDispatcher;
+
+        this._disabledOverride = false;
+
         this.options = null;
 
         this.optionsContext = {
@@ -73,6 +77,8 @@ class Frontend extends TextScanner {
                 window.visualViewport.addEventListener('resize', this.onVisualViewportResize.bind(this));
             }
 
+            this.initEventDispatcher.on('setDisabledOverride', this.onSetDisabledOverride.bind(this));
+
             yomichan.on('orphaned', this.onOrphaned.bind(this));
             yomichan.on('optionsUpdated', this.updateOptions.bind(this));
             yomichan.on('zoomChanged', this.onZoomChanged.bind(this));
@@ -228,6 +234,14 @@ class Frontend extends TextScanner {
         super.onSearchClear(changeFocus);
     }
 
+    onSetDisabledOverride({disabled}) {
+        this._disabledOverride = disabled;
+        // other cases handed by regular options update
+        if (disabled && this.enabled) {
+            this.setEnabled(false);
+        }
+    }
+
     getOptionsContext() {
         this.optionsContext.url = this.popup.url;
         return this.optionsContext;
-- 
cgit v1.2.3


From 565e3a8c6ad31afa0ddb171ac5a33b6b84e5c3dc Mon Sep 17 00:00:00 2001
From: siikamiika 
Date: Fri, 10 Apr 2020 15:49:56 +0300
Subject: change iframe popup live

---
 ext/fg/js/frontend-initialize.js | 13 +++++++++----
 ext/fg/js/frontend.js            | 11 +++++++++--
 ext/mixed/js/text-scanner.js     |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'ext/fg/js/frontend.js')

diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/frontend-initialize.js
index 2cfb6176..ce1a6bf6 100644
--- a/ext/fg/js/frontend-initialize.js
+++ b/ext/fg/js/frontend-initialize.js
@@ -86,10 +86,6 @@ async function main() {
     const applyOptions = async () => {
         const optionsContext = {depth: isSearchPage ? 0 : depth, url};
         const options = await apiOptionsGet(optionsContext);
-        if (isSearchPage) {
-            const disabled = !options.scanning.enableOnSearchPage;
-            initEventDispatcher.trigger('setDisabledOverride', {disabled});
-        }
 
         let popup;
         if (isIframe && options.general.showIframePopupsInRootFrame) {
@@ -103,6 +99,15 @@ async function main() {
             popups.normal = popup;
         }
 
+        if (isSearchPage) {
+            const disabled = !options.scanning.enableOnSearchPage;
+            initEventDispatcher.trigger('setDisabledOverride', {disabled});
+        }
+
+        if (isIframe) {
+            initEventDispatcher.trigger('popupChange', {popup});
+        }
+
         if (frontend === null) {
             frontend = new Frontend(popup, initEventDispatcher);
             await frontend.prepare();
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index a6df4b4c..f969df32 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -29,7 +29,7 @@ class Frontend extends TextScanner {
     constructor(popup, initEventDispatcher) {
         super(
             window,
-            popup.isProxy() ? [] : [popup.getContainer()],
+            () => this.popup.isProxy() ? [] : [this.popup.getContainer()],
             [(x, y) => this.popup.containsPoint(x, y)],
             () => this.popup.depth <= this.options.scanning.popupNestingMaxDepth && !this._disabledOverride
         );
@@ -78,6 +78,7 @@ class Frontend extends TextScanner {
             }
 
             this.initEventDispatcher.on('setDisabledOverride', this.onSetDisabledOverride.bind(this));
+            this.initEventDispatcher.on('popupChange', this.onPopupChange.bind(this));
 
             yomichan.on('orphaned', this.onOrphaned.bind(this));
             yomichan.on('optionsUpdated', this.updateOptions.bind(this));
@@ -242,6 +243,12 @@ class Frontend extends TextScanner {
         }
     }
 
+    async onPopupChange({popup}) {
+        this.onSearchClear(true);
+        this.popup = popup;
+        await popup.setOptions(this.options);
+    }
+
     getOptionsContext() {
         this.optionsContext.url = this.popup.url;
         return this.optionsContext;
@@ -274,7 +281,7 @@ class Frontend extends TextScanner {
     }
 
     _broadcastRootPopupInformation() {
-        if (!this.popup.isProxy() && this.popup.depth === 0) {
+        if (!this.popup.isProxy() && this.popup.depth === 0 && this.popup.frameId === 0) {
             apiBroadcastTab('rootPopupInformation', {popupId: this.popup.id, frameId: this.popup.frameId});
         }
     }
diff --git a/ext/mixed/js/text-scanner.js b/ext/mixed/js/text-scanner.js
index 1d6e36e0..85be7119 100644
--- a/ext/mixed/js/text-scanner.js
+++ b/ext/mixed/js/text-scanner.js
@@ -48,7 +48,7 @@ class TextScanner {
     }
 
     onMouseOver(e) {
-        if (this.ignoreElements.includes(e.target)) {
+        if (this.ignoreElements().includes(e.target)) {
             this.scanTimerClear();
         }
     }
-- 
cgit v1.2.3


From 275f455e73c48294aeefd6c02959b1ddd3cbf4e8 Mon Sep 17 00:00:00 2001
From: siikamiika 
Date: Fri, 10 Apr 2020 16:06:22 +0300
Subject: fix preview frame error

---
 ext/fg/js/frontend.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'ext/fg/js/frontend.js')

diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index f969df32..cd811115 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -26,7 +26,7 @@
  */
 
 class Frontend extends TextScanner {
-    constructor(popup, initEventDispatcher) {
+    constructor(popup, initEventDispatcher=null) {
         super(
             window,
             () => this.popup.isProxy() ? [] : [this.popup.getContainer()],
@@ -77,8 +77,10 @@ class Frontend extends TextScanner {
                 window.visualViewport.addEventListener('resize', this.onVisualViewportResize.bind(this));
             }
 
-            this.initEventDispatcher.on('setDisabledOverride', this.onSetDisabledOverride.bind(this));
-            this.initEventDispatcher.on('popupChange', this.onPopupChange.bind(this));
+            if (this.initEventDispatcher !== null) {
+                this.initEventDispatcher.on('setDisabledOverride', this.onSetDisabledOverride.bind(this));
+                this.initEventDispatcher.on('popupChange', this.onPopupChange.bind(this));
+            }
 
             yomichan.on('orphaned', this.onOrphaned.bind(this));
             yomichan.on('optionsUpdated', this.updateOptions.bind(this));
-- 
cgit v1.2.3


From d93e3e1a6727e23547c44d4fc3b82244f560c459 Mon Sep 17 00:00:00 2001
From: siikamiika 
Date: Sat, 11 Apr 2020 15:32:04 +0300
Subject: use setters instead of EventDispatcher

---
 ext/fg/js/frontend-initialize.js | 22 ++++++++++------------
 ext/fg/js/frontend.js            | 36 +++++++++++++++---------------------
 2 files changed, 25 insertions(+), 33 deletions(-)

(limited to 'ext/fg/js/frontend.js')

diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/frontend-initialize.js
index ce1a6bf6..34be6bc6 100644
--- a/ext/fg/js/frontend-initialize.js
+++ b/ext/fg/js/frontend-initialize.js
@@ -73,8 +73,6 @@ async function main() {
 
     const isIframe = !proxy && (window !== window.parent);
 
-    const initEventDispatcher = new EventDispatcher();
-
     const popups = {
         iframe: null,
         proxy: null,
@@ -99,18 +97,18 @@ async function main() {
             popups.normal = popup;
         }
 
-        if (isSearchPage) {
-            const disabled = !options.scanning.enableOnSearchPage;
-            initEventDispatcher.trigger('setDisabledOverride', {disabled});
-        }
-
-        if (isIframe) {
-            initEventDispatcher.trigger('popupChange', {popup});
-        }
-
         if (frontend === null) {
-            frontend = new Frontend(popup, initEventDispatcher);
+            frontend = new Frontend(popup);
             await frontend.prepare();
+        } else {
+            if (isSearchPage) {
+                const disabled = !options.scanning.enableOnSearchPage;
+                frontend.setDisabledOverride(disabled);
+            }
+
+            if (isIframe) {
+                await frontend.setPopup(popup);
+            }
         }
     };
 
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index cd811115..288d3589 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -26,7 +26,7 @@
  */
 
 class Frontend extends TextScanner {
-    constructor(popup, initEventDispatcher=null) {
+    constructor(popup) {
         super(
             window,
             () => this.popup.isProxy() ? [] : [this.popup.getContainer()],
@@ -35,7 +35,6 @@ class Frontend extends TextScanner {
         );
 
         this.popup = popup;
-        this.initEventDispatcher = initEventDispatcher;
 
         this._disabledOverride = false;
 
@@ -77,11 +76,6 @@ class Frontend extends TextScanner {
                 window.visualViewport.addEventListener('resize', this.onVisualViewportResize.bind(this));
             }
 
-            if (this.initEventDispatcher !== null) {
-                this.initEventDispatcher.on('setDisabledOverride', this.onSetDisabledOverride.bind(this));
-                this.initEventDispatcher.on('popupChange', this.onPopupChange.bind(this));
-            }
-
             yomichan.on('orphaned', this.onOrphaned.bind(this));
             yomichan.on('optionsUpdated', this.updateOptions.bind(this));
             yomichan.on('zoomChanged', this.onZoomChanged.bind(this));
@@ -142,6 +136,20 @@ class Frontend extends TextScanner {
         ];
     }
 
+    setDisabledOverride(disabled) {
+        this._disabledOverride = disabled;
+        // other cases handed by regular options update
+        if (disabled && this.enabled) {
+            this.setEnabled(false);
+        }
+    }
+
+    async setPopup(popup) {
+        this.onSearchClear(true);
+        this.popup = popup;
+        await popup.setOptions(this.options);
+    }
+
     async updateOptions() {
         this.setOptions(await apiOptionsGet(this.getOptionsContext()));
 
@@ -237,20 +245,6 @@ class Frontend extends TextScanner {
         super.onSearchClear(changeFocus);
     }
 
-    onSetDisabledOverride({disabled}) {
-        this._disabledOverride = disabled;
-        // other cases handed by regular options update
-        if (disabled && this.enabled) {
-            this.setEnabled(false);
-        }
-    }
-
-    async onPopupChange({popup}) {
-        this.onSearchClear(true);
-        this.popup = popup;
-        await popup.setOptions(this.options);
-    }
-
     getOptionsContext() {
         this.optionsContext.url = this.popup.url;
         return this.optionsContext;
-- 
cgit v1.2.3


From 5c3641eadb78144b7f6305ebbd574bbc6265a4c4 Mon Sep 17 00:00:00 2001
From: siikamiika 
Date: Sat, 11 Apr 2020 16:20:12 +0300
Subject: simplify frontend disable override

---
 ext/fg/js/frontend-initialize.js |  5 ++++-
 ext/fg/js/frontend.js            | 15 ++++++++-------
 ext/mixed/js/text-scanner.js     | 16 +++++-----------
 3 files changed, 17 insertions(+), 19 deletions(-)

(limited to 'ext/fg/js/frontend.js')

diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/frontend-initialize.js
index 34be6bc6..e794c7c0 100644
--- a/ext/fg/js/frontend-initialize.js
+++ b/ext/fg/js/frontend-initialize.js
@@ -80,6 +80,7 @@ async function main() {
     };
 
     let frontend = null;
+    let frontendPreparePromise = null;
 
     const applyOptions = async () => {
         const optionsContext = {depth: isSearchPage ? 0 : depth, url};
@@ -99,8 +100,10 @@ async function main() {
 
         if (frontend === null) {
             frontend = new Frontend(popup);
-            await frontend.prepare();
+            frontendPreparePromise = frontend.prepare();
+            await frontendPreparePromise;
         } else {
+            await frontendPreparePromise;
             if (isSearchPage) {
                 const disabled = !options.scanning.enableOnSearchPage;
                 frontend.setDisabledOverride(disabled);
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 288d3589..20bfc638 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -30,8 +30,7 @@ class Frontend extends TextScanner {
         super(
             window,
             () => this.popup.isProxy() ? [] : [this.popup.getContainer()],
-            [(x, y) => this.popup.containsPoint(x, y)],
-            () => this.popup.depth <= this.options.scanning.popupNestingMaxDepth && !this._disabledOverride
+            [(x, y) => this.popup.containsPoint(x, y)]
         );
 
         this.popup = popup;
@@ -138,10 +137,7 @@ class Frontend extends TextScanner {
 
     setDisabledOverride(disabled) {
         this._disabledOverride = disabled;
-        // other cases handed by regular options update
-        if (disabled && this.enabled) {
-            this.setEnabled(false);
-        }
+        this.setEnabled(this.options.general.enable, this._canEnable());
     }
 
     async setPopup(popup) {
@@ -151,7 +147,7 @@ class Frontend extends TextScanner {
     }
 
     async updateOptions() {
-        this.setOptions(await apiOptionsGet(this.getOptionsContext()));
+        this.setOptions(await apiOptionsGet(this.getOptionsContext()), this._canEnable());
 
         const ignoreNodes = ['.scan-disable', '.scan-disable *'];
         if (!this.options.scanning.enableOnPopupExpressions) {
@@ -290,6 +286,11 @@ class Frontend extends TextScanner {
         });
     }
 
+    _canEnable() {
+        if (this.options === null) { return true; } // called by updateOptions for the first time
+        return this.popup.depth <= this.options.scanning.popupNestingMaxDepth && !this._disabledOverride;
+    }
+
     async _updatePopupPosition() {
         const textSource = this.getCurrentTextSource();
         if (textSource !== null && await this.popup.isVisible()) {
diff --git a/ext/mixed/js/text-scanner.js b/ext/mixed/js/text-scanner.js
index 85be7119..bff9544f 100644
--- a/ext/mixed/js/text-scanner.js
+++ b/ext/mixed/js/text-scanner.js
@@ -22,13 +22,11 @@
  */
 
 class TextScanner {
-    constructor(node, ignoreElements, ignorePoints, canEnable=null) {
+    constructor(node, ignoreElements, ignorePoints) {
         this.node = node;
         this.ignoreElements = ignoreElements;
         this.ignorePoints = ignorePoints;
 
-        this.canEnable = canEnable;
-
         this.ignoreNodes = null;
 
         this.scanTimerPromise = null;
@@ -226,12 +224,8 @@ class TextScanner {
         }
     }
 
-    setEnabled(enabled) {
-        if (this.canEnable !== null && !this.canEnable()) {
-            enabled = false;
-        }
-
-        if (enabled) {
+    setEnabled(enabled, canEnable) {
+        if (enabled && canEnable) {
             if (!this.enabled) {
                 this.hookEvents();
                 this.enabled = true;
@@ -277,9 +271,9 @@ class TextScanner {
         ];
     }
 
-    setOptions(options) {
+    setOptions(options, canEnable=true) {
         this.options = options;
-        this.setEnabled(this.options.general.enable);
+        this.setEnabled(this.options.general.enable, canEnable);
     }
 
     async searchAt(x, y, cause) {
-- 
cgit v1.2.3


From bf4c1aef6a2fbe8c8a3ba36b9269fe7c9478983c Mon Sep 17 00:00:00 2001
From: toasted-nutbread 
Date: Sat, 11 Apr 2020 22:27:31 -0400
Subject: Fix default value of _orphaned

---
 ext/fg/js/frontend.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ext/fg/js/frontend.js')

diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 55d699e5..95427c4c 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -43,7 +43,7 @@ class Frontend extends TextScanner {
 
         this._pageZoomFactor = 1.0;
         this._contentScale = 1.0;
-        this._orphaned = true;
+        this._orphaned = false;
         this._lastShowPromise = Promise.resolve();
 
         this._windowMessageHandlers = new Map([
-- 
cgit v1.2.3


From 950f50ef94931b4dfe19585ba0d7cb80324524ed Mon Sep 17 00:00:00 2001
From: siikamiika 
Date: Tue, 14 Apr 2020 20:35:52 +0300
Subject: don't focus tab when changing settings

---
 ext/fg/js/frontend.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ext/fg/js/frontend.js')

diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 20bfc638..bf8cb9b4 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -141,7 +141,7 @@ class Frontend extends TextScanner {
     }
 
     async setPopup(popup) {
-        this.onSearchClear(true);
+        this.onSearchClear(false);
         this.popup = popup;
         await popup.setOptions(this.options);
     }
-- 
cgit v1.2.3


From b6f7f8c02637cef9cadd4ab2b9f253c42903aee6 Mon Sep 17 00:00:00 2001
From: siikamiika 
Date: Tue, 14 Apr 2020 20:59:42 +0300
Subject: fix _canEnable being used before setting options

---
 ext/fg/js/frontend.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ext/fg/js/frontend.js')

diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index bf8cb9b4..6d16cdd9 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -147,7 +147,8 @@ class Frontend extends TextScanner {
     }
 
     async updateOptions() {
-        this.setOptions(await apiOptionsGet(this.getOptionsContext()), this._canEnable());
+        this.options = await apiOptionsGet(this.getOptionsContext());
+        this.setOptions(this.options, this._canEnable());
 
         const ignoreNodes = ['.scan-disable', '.scan-disable *'];
         if (!this.options.scanning.enableOnPopupExpressions) {
@@ -287,7 +288,6 @@ class Frontend extends TextScanner {
     }
 
     _canEnable() {
-        if (this.options === null) { return true; } // called by updateOptions for the first time
         return this.popup.depth <= this.options.scanning.popupNestingMaxDepth && !this._disabledOverride;
     }
 
-- 
cgit v1.2.3