alex/yomichan
1
Fork 0
Code Releases Activity

Use explicit dependency injection for ClipboardMonitor

Browse Source
This commit is contained in:
toasted-nutbread 2020-03-07 10:47:30 -05:00
parent 7822230b7f
commit 93aa275d82
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/bg/js/api.js
View File

@ -25,10 +25,6 @@ function apiAudioGetUrl(definition, source, optionsContext) {
return _apiInvoke('audioGetUrl', {definition, source, optionsContext}); return _apiInvoke('audioGetUrl', {definition, source, optionsContext});
} }
function apiClipboardGet() {
return _apiInvoke('clipboardGet');
}
function _apiInvoke(action, params={}) { function _apiInvoke(action, params={}) {
const data = {action, params}; const data = {action, params};
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

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

@ -30,7 +30,7 @@ class Backend {
this.translator = new Translator(); this.translator = new Translator();
this.anki = new AnkiNull(); this.anki = new AnkiNull();
this.mecab = new Mecab(); this.mecab = new Mecab();
this.clipboardMonitor = new ClipboardMonitor(); this.clipboardMonitor = new ClipboardMonitor({getClipboard: this._onApiClipboardGet.bind(this)});
this.options = null; this.options = null;
this.optionsSchema = null; this.optionsSchema = null;
this.defaultAnkiFieldTemplates = null; this.defaultAnkiFieldTemplates = null;

9
ext/bg/js/clipboard-monitor.js
View File

@ -16,22 +16,23 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
/*global apiClipboardGet, jpIsStringPartiallyJapanese*/ /*global jpIsStringPartiallyJapanese*/
class ClipboardMonitor extends EventDispatcher { class ClipboardMonitor extends EventDispatcher {
constructor() { constructor({getClipboard}) {
super(); super();
this.timerId = null; this.timerId = null;
this.timerToken = null; this.timerToken = null;
this.interval = 250; this.interval = 250;
this.previousText = null; this.previousText = null;
this.getClipboard = getClipboard;
} }
start() { start() {
this.stop(); this.stop();
// The token below is used as a unique identifier to ensure that a new clipboard monitor // The token below is used as a unique identifier to ensure that a new clipboard monitor
// hasn't been started during the await call. The check below the await apiClipboardGet() // hasn't been started during the await call. The check below the await this.getClipboard()
// call will exit early if the reference has changed. // call will exit early if the reference has changed.
const token = {}; const token = {};
const intervalCallback = async () => { const intervalCallback = async () => {
@ -39,7 +40,7 @@ class ClipboardMonitor extends EventDispatcher {
let text = null; let text = null;
try { try {
text = await apiClipboardGet(); text = await this.getClipboard();
} catch (e) { } catch (e) {
// NOP // NOP
} }

4
ext/bg/js/search.js
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
/*global apiOptionsSet, apiTermsFind, Display, QueryParser, ClipboardMonitor*/ /*global apiOptionsSet, apiTermsFind, apiClipboardGet, Display, QueryParser, ClipboardMonitor*/
class DisplaySearch extends Display { class DisplaySearch extends Display {
constructor() { constructor() {
@ -38,7 +38,7 @@ class DisplaySearch extends Display {
this.introVisible = true; this.introVisible = true;
this.introAnimationTimer = null; this.introAnimationTimer = null;
this.clipboardMonitor = new ClipboardMonitor(); this.clipboardMonitor = new ClipboardMonitor({getClipboard: apiClipboardGet});
this._onKeyDownIgnoreKeys = new Map([ this._onKeyDownIgnoreKeys = new Map([
['ANY_MOD', new Set([ ['ANY_MOD', new Set([