summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-03-05 16:20:01 -0800
committerAlex Yatskov <alex@foosoft.net>2017-03-05 16:20:01 -0800
commit0a75e14d93b6a5121b333fe0510d3f7aa34ffa5a (patch)
tree0f30036c7ebc0fa563cab86c7b4d2361ac73d6c3
parentefc5be4dacc69212a263eb48b79d2a729ca02958 (diff)
show yomichan updated message only when shift to scan is disabled
-rw-r--r--ext/bg/options.html4
-rw-r--r--ext/fg/js/driver.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/bg/options.html b/ext/bg/options.html
index 298a10f9..b2d4c3c6 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -51,11 +51,11 @@
<h3>Scanning Options</h3>
<div class="checkbox">
- <label><input type="checkbox" id="hold-shift-to-scan"> Hold <kbd>Shift</kbd> to scan</label>
+ <label><input type="checkbox" id="middle-mouse-button-scan"> Middle mouse button scanning</label>
</div>
<div class="checkbox">
- <label><input type="checkbox" id="middle-mouse-button-scan"> Middle mouse button scanning</label>
+ <label><input type="checkbox" id="hold-shift-to-scan"> Hold <kbd>Shift</kbd> to scan</label>
</div>
<div class="checkbox">
diff --git a/ext/fg/js/driver.js b/ext/fg/js/driver.js
index b37ae6bf..5de762ca 100644
--- a/ext/fg/js/driver.js
+++ b/ext/fg/js/driver.js
@@ -203,7 +203,7 @@ window.driver = new class {
handleError(error, textSource) {
if (window.orphaned) {
- if (textSource) {
+ if (textSource && this.options.scanning.requireShift) {
this.popup.showNextTo(textSource.getRect());
this.popup.showOrphaned();
}