From 405e487a7347181f6f49f01839c807c84fc93e41 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Fri, 31 Mar 2017 21:48:10 -0700
Subject: ctrl + c to copy

---
 ext/mixed/js/display.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ext/mixed/js/display.js')

diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 9738319a..f950f0f0 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -301,7 +301,10 @@ class Display {
         const handler = handlers[e.keyCode];
         if (handler && handler()) {
             e.preventDefault();
+            return true;
         }
+
+        return false;
     }
 
     sourceBack() {
-- 
cgit v1.2.3


From f556c95038e2ef9e4d97b4168ce417ba0d74282f Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 1 Apr 2017 11:20:58 -0700
Subject: improve ctrl + c behavior

---
 ext/fg/js/display-frame.js | 11 +++--------
 ext/mixed/js/display.js    |  3 ---
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'ext/mixed/js/display.js')

diff --git a/ext/fg/js/display-frame.js b/ext/fg/js/display-frame.js
index f6f7683e..9fd09e74 100644
--- a/ext/fg/js/display-frame.js
+++ b/ext/fg/js/display-frame.js
@@ -83,13 +83,9 @@ window.displayFrame = new class extends Display {
     }
 
     onKeyDown(e) {
-        if (super.onKeyDown(e)) {
-            return true;
-        }
-
         const handlers = {
             67: /* c */ () => {
-                if (e.ctrlKey) {
+                if (e.ctrlKey && window.getSelection().toString() === '') {
                     this.selectionCopy();
                     return true;
                 }
@@ -99,9 +95,8 @@ window.displayFrame = new class extends Display {
         const handler = handlers[e.keyCode];
         if (handler && handler()) {
             e.preventDefault();
-            return true;
+        } else {
+            super.onKeyDown(e);
         }
-
-        return false;
     }
 };
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index f950f0f0..9738319a 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -301,10 +301,7 @@ class Display {
         const handler = handlers[e.keyCode];
         if (handler && handler()) {
             e.preventDefault();
-            return true;
         }
-
-        return false;
     }
 
     sourceBack() {
-- 
cgit v1.2.3


From 4de9e5e9e06031e163bfeb27f83a8614f912d454 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 1 Apr 2017 12:01:34 -0700
Subject: support for audio volume adjustment (fixes #39)

---
 ext/bg/js/options.js    |  2 ++
 ext/bg/js/util.js       |  1 +
 ext/bg/options.html     | 13 +++++++++----
 ext/mixed/js/display.js |  2 ++
 4 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'ext/mixed/js/display.js')

diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 2089cc53..75f39d24 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -26,6 +26,7 @@ function formRead() {
         const optionsNew = $.extend(true, {}, optionsOld);
 
         optionsNew.general.audioPlayback = $('#audio-playback-buttons').prop('checked');
+        optionsNew.general.audioVolume = $('#audio-playback-volume').val();
         optionsNew.general.groupResults = $('#group-terms-results').prop('checked');
         optionsNew.general.softKatakana = $('#soft-katakana-search').prop('checked');
         optionsNew.general.showAdvanced = $('#show-advanced-options').prop('checked');
@@ -111,6 +112,7 @@ $(document).ready(() => {
 
     optionsLoad().then(options => {
         $('#audio-playback-buttons').prop('checked', options.general.audioPlayback);
+        $('#audio-playback-volume').val(options.general.audioVolume);
         $('#group-terms-results').prop('checked', options.general.groupResults);
         $('#soft-katakana-search').prop('checked', options.general.softKatakana);
         $('#show-advanced-options').prop('checked', options.general.showAdvanced);
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index b3e4feec..78258c97 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -85,6 +85,7 @@ function optionsSetDefaults(options) {
         general: {
             enable: true,
             audioPlayback: true,
+            audioVolume: 100,
             groupResults: true,
             softKatakana: true,
             maxResults: 32,
diff --git a/ext/bg/options.html b/ext/bg/options.html
index 3e457d2d..c483c656 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -25,10 +25,6 @@
             <div>
                 <h3>General Options</h3>
 
-                <div class="checkbox">
-                    <label><input type="checkbox" id="audio-playback-buttons"> Audio playback buttons</label>
-                </div>
-
                 <div class="checkbox">
                     <label><input type="checkbox" id="group-terms-results"> Group term results</label>
                 </div>
@@ -41,6 +37,15 @@
                     <label><input type="checkbox" id="soft-katakana-search"> Soft Katakana search</label>
                 </div>
 
+                <div class="checkbox">
+                    <label><input type="checkbox" id="audio-playback-buttons"> Audio playback buttons</label>
+                </div>
+
+                <div class="form-group options-advanced">
+                    <label for="audio-playback-volume">Audio playback volume (percent)</label>
+                    <input type="number" min="0" max="100" id="audio-playback-volume" class="form-control">
+                </div>
+
                 <div class="form-group options-advanced">
                     <label for="max-displayed-results">Maximum displayed results</label>
                     <input type="number" min="1" id="max-displayed-results" class="form-control">
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 9738319a..36609525 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -343,6 +343,7 @@ class Display {
             let audio = this.audioCache[url];
             if (audio) {
                 audio.currentTime = 0;
+                audio.volume = this.options.general.audioVolume / 100.0;
                 audio.play();
             } else {
                 audio = new Audio(url);
@@ -352,6 +353,7 @@ class Display {
                     }
 
                     this.audioCache[url] = audio;
+                    audio.volume = this.options.general.audioVolume / 100.0;
                     audio.play();
                 };
             }
-- 
cgit v1.2.3