summaryrefslogtreecommitdiff
path: root/ext/bg/js
diff options
context:
space:
mode:
authorAlex Yatskov <FooSoft@users.noreply.github.com>2019-07-10 17:38:38 -0700
committerGitHub <noreply@github.com>2019-07-10 17:38:38 -0700
commit7cfcfb3bf34bb128dc4f5a47e7846fe4cc4c8c81 (patch)
tree7a16f525c2cc7a3ac2d1241544100f40091102fa /ext/bg/js
parent8b8482d2555342ee3e28b33f018b4246348e0702 (diff)
parentad897713e6acbcbd56962e8514ac866926da3cdd (diff)
Merge pull request #166 from toasted-nutbread/custom-popup-css
Add support for custom popup CSS
Diffstat (limited to 'ext/bg/js')
-rw-r--r--ext/bg/js/options.js3
-rw-r--r--ext/bg/js/settings.js2
2 files changed, 4 insertions, 1 deletions
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index bad56db6..f1fc2cf8 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -198,7 +198,8 @@ function optionsSetDefaults(options) {
showGuide: true,
compactTags: false,
compactGlossaries: false,
- mainDictionary: ''
+ mainDictionary: '',
+ customPopupCss: ''
},
scanning: {
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 60a1886b..953120da 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -36,6 +36,7 @@ async function formRead() {
optionsNew.general.popupHeight = parseInt($('#popup-height').val(), 10);
optionsNew.general.popupHorizontalOffset = parseInt($('#popup-horizontal-offset').val(), 0);
optionsNew.general.popupVerticalOffset = parseInt($('#popup-vertical-offset').val(), 10);
+ optionsNew.general.customPopupCss = $('#custom-popup-css').val();
optionsNew.scanning.middleMouse = $('#middle-mouse-button-scan').prop('checked');
optionsNew.scanning.touchInputEnabled = $('#touch-input-enabled').prop('checked');
@@ -169,6 +170,7 @@ async function onReady() {
$('#popup-height').val(options.general.popupHeight);
$('#popup-horizontal-offset').val(options.general.popupHorizontalOffset);
$('#popup-vertical-offset').val(options.general.popupVerticalOffset);
+ $('#custom-popup-css').val(options.general.customPopupCss);
$('#middle-mouse-button-scan').prop('checked', options.scanning.middleMouse);
$('#touch-input-enabled').prop('checked', options.scanning.touchInputEnabled);