aboutsummaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2020-10-31 17:03:22 -0400
committerGitHub <noreply@github.com>2020-10-31 17:03:22 -0400
commit11c5dbac6459d2afaef98d2711e34f71dd55aeef (patch)
treeb958f9f7f6aa5bc683a10aab7c55e8585b8e1c24 /ext
parentf78e243853418abe2c741bd667bed75b7bd90b4c (diff)
Add an 'other' option for when there is no matching main scanning input (#978)
Diffstat (limited to 'ext')
-rw-r--r--ext/bg/js/settings/scan-inputs-simple-controller.js31
1 files changed, 27 insertions, 4 deletions
diff --git a/ext/bg/js/settings/scan-inputs-simple-controller.js b/ext/bg/js/settings/scan-inputs-simple-controller.js
index a20eecdc..73066ccf 100644
--- a/ext/bg/js/settings/scan-inputs-simple-controller.js
+++ b/ext/bg/js/settings/scan-inputs-simple-controller.js
@@ -26,6 +26,8 @@ class ScanInputsSimpleController {
this._settingsController = settingsController;
this._middleMouseButtonScan = null;
this._mainScanModifierKeyInput = null;
+ this._mainScanModifierKeyInputHasOther = false;
+ this._os = null;
}
async prepare() {
@@ -33,7 +35,10 @@ class ScanInputsSimpleController {
this._mainScanModifierKeyInput = document.querySelector('#main-scan-modifier-key');
const {platform: {os}} = await api.getEnvironmentInfo();
- this._populateSelect(this._mainScanModifierKeyInput, os);
+ this._os = os;
+
+ this._mainScanModifierKeyInputHasOther = false;
+ this._populateSelect(this._mainScanModifierKeyInput, this._mainScanModifierKeyInputHasOther);
const options = await this._settingsController.getOptions();
@@ -61,6 +66,7 @@ class ScanInputsSimpleController {
const {scanning: {inputs}} = options;
const middleMouseSupportedIndex = this._getIndexOfMiddleMouseButtonScanInput(inputs);
const mainScanInputIndex = this._getIndexOfMainScanInput(inputs);
+ const hasMainScanInput = (mainScanInputIndex >= 0);
let middleMouseSupported = false;
if (middleMouseSupportedIndex >= 0) {
@@ -71,13 +77,17 @@ class ScanInputsSimpleController {
}
let mainScanInput = 'none';
- if (mainScanInputIndex >= 0) {
+ if (hasMainScanInput) {
const includeValues = this._splitValue(inputs[mainScanInputIndex].include);
if (includeValues.length > 0) {
mainScanInput = includeValues[0];
}
+ } else {
+ mainScanInput = 'other';
}
+ this._setHasMainScanInput(hasMainScanInput);
+
this._middleMouseButtonScan.checked = middleMouseSupported;
this._mainScanModifierKeyInput.value = mainScanInput;
}
@@ -89,16 +99,21 @@ class ScanInputsSimpleController {
_onMainScanModifierKeyInputChange(e) {
const mainScanKey = e.currentTarget.value;
+ if (mainScanKey === 'other') { return; }
const mainScanInputs = (mainScanKey === 'none' ? [] : [mainScanKey]);
this._setMainScanInputs(mainScanInputs);
}
- _populateSelect(select, os) {
+ _populateSelect(select, hasOther) {
const modifierKeys = [
{value: 'none', name: 'None'},
- ...DocumentUtil.getModifierKeys(os).map(([value, name]) => ({value, name}))
+ ...DocumentUtil.getModifierKeys(this._os).map(([value, name]) => ({value, name}))
];
+ if (hasOther) {
+ modifierKeys.push({value: 'other', name: 'Other'});
+ }
+
const fragment = document.createDocumentFragment();
for (const {value, name} of modifierKeys) {
const option = document.createElement('option');
@@ -154,6 +169,8 @@ class ScanInputsSimpleController {
const {scanning: {inputs}} = options;
const index = this._getIndexOfMainScanInput(inputs);
+ this._setHasMainScanInput(true);
+
if (index < 0) {
// Add new
const input = ScanInputsController.createDefaultMouseInput(value, 'mouse0');
@@ -218,4 +235,10 @@ class ScanInputsSimpleController {
_isMouseInput(input) {
return /^mouse\d+$/.test(input);
}
+
+ _setHasMainScanInput(hasMainScanInput) {
+ if (this._mainScanModifierKeyInputHasOther !== hasMainScanInput) { return; }
+ this._mainScanModifierKeyInputHasOther = !hasMainScanInput;
+ this._populateSelect(this._mainScanModifierKeyInput, this._mainScanModifierKeyInputHasOther);
+ }
} \ No newline at end of file