From efc5be4dacc69212a263eb48b79d2a729ca02958 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sun, 5 Mar 2017 16:03:14 -0800 Subject: [PATCH] middle mouse button scanning --- ext/bg/js/options.js | 2 ++ ext/bg/js/util.js | 1 + ext/bg/options.html | 4 ++++ ext/fg/js/driver.js | 2 +- ext/manifest.json | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index 3eadb779..4a7b88c1 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -32,6 +32,7 @@ function formRead() { optionsNew.general.maxResults = parseInt($('#max-displayed-results').val(), 10); optionsNew.scanning.requireShift = $('#hold-shift-to-scan').prop('checked'); + optionsNew.scanning.middleMouse = $('#middle-mouse-button-scan').prop('checked'); optionsNew.scanning.selectText = $('#select-matched-text').prop('checked'); optionsNew.scanning.imposter = $('#search-form-text-fields').prop('checked'); optionsNew.scanning.delay = parseInt($('#scan-delay').val(), 10); @@ -113,6 +114,7 @@ $(document).ready(() => { $('#max-displayed-results').val(options.general.maxResults); $('#hold-shift-to-scan').prop('checked', options.scanning.requireShift); + $('#middle-mouse-button-scan').prop('checked', options.scanning.middleMouse); $('#select-matched-text').prop('checked', options.scanning.selectText); $('#search-form-text-fields').prop('checked', options.scanning.imposter); $('#scan-delay').val(options.scanning.delay); diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js index 2fd77130..e847090f 100644 --- a/ext/bg/js/util.js +++ b/ext/bg/js/util.js @@ -84,6 +84,7 @@ function optionsSetDefaults(options) { scanning: { requireShift: true, + middleMouse: true, selectText: true, imposter: true, delay: 15, diff --git a/ext/bg/options.html b/ext/bg/options.html index 2a6928cf..298a10f9 100644 --- a/ext/bg/options.html +++ b/ext/bg/options.html @@ -54,6 +54,10 @@ +
+ +
+
diff --git a/ext/fg/js/driver.js b/ext/fg/js/driver.js index a74c1507..b37ae6bf 100644 --- a/ext/fg/js/driver.js +++ b/ext/fg/js/driver.js @@ -69,7 +69,7 @@ window.driver = new class { return; } - if (this.options.scanning.requireShift && !e.shiftKey && !this.mouseDownMiddle) { + if (this.options.scanning.requireShift && !e.shiftKey && !(this.mouseDownMiddle && this.options.scanning.middleMouse)) { return; } diff --git a/ext/manifest.json b/ext/manifest.json index d7dd5f9d..25c13321 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Yomichan", - "version": "1.0.18", + "version": "1.1.0", "description": "Japanese dictionary with Anki integration", "icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"},