From 314ec99e5cf5f45cdc85082e5e203e99408f24bb Mon Sep 17 00:00:00 2001 From: Rob Garrison Date: Mon, 17 Sep 2018 23:08:16 -0500 Subject: [PATCH] More suggested changes --- manage/config-dialog.js | 53 +++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/manage/config-dialog.js b/manage/config-dialog.js index 4bfe4669..9c9910fd 100644 --- a/manage/config-dialog.js +++ b/manage/config-dialog.js @@ -197,8 +197,12 @@ function configDialog(style) { renderValues(); } + function isNullOrUndefined(value) { + return value === null || value === undefined; + } + function isDefault(va) { - return va.value === null || va.value === undefined || va.value === va.default; + return isNullOrUndefined(va.value) || va.value === va.default; } function buildConfigForm() { @@ -259,34 +263,41 @@ function configDialog(style) { break; case 'range': - case 'number': - children = [ - va.type === 'range' && $create('span.current-value', {textContent: va.value + va.units}), - va.input = $create('input.config-value', { - va, - type: va.type, - value: va.default, - min: va.min, - max: va.max, - step: va.step, - onchange: updateVarOnChange - }) - ]; - break; - - default: { + case 'number': { const options = { va, type: va.type, + onfocus: va.type === 'number' ? selectAllOnFocus : null, onchange: updateVarOnChange, - oninput: updateVarOnInput, - onfocus: selectAllOnFocus, + oninput: updateVarOnInput }; + if (!isNullOrUndefined(va.min)) { + options.min = va.min; + } + if (!isNullOrUndefined(va.max)) { + options.max = va.max; + } + if (!isNullOrUndefined(va.step)) { + options.step = va.step; + } children = [ - va.input = $create('input.config-value', options), + va.type === 'range' && $create('span.current-value'), + va.input = $create('input.config-value', options) ]; + break; } + default: + children = [ + va.input = $create('input.config-value', { + va, + type: va.type, + onchange: updateVarOnChange, + oninput: updateVarOnInput, + onfocus: selectAllOnFocus, + }), + ]; + } resetter = resetter.cloneNode(true); @@ -308,7 +319,7 @@ function configDialog(style) { if (this.type === 'number') { this.value = this.va.value = clampValue(this.value, this.va); } else if (this.type === 'range') { - this.va.value = parseFloat(this.value); + this.va.value = Number(this.value); $('.current-value', this.closest('.config-range')).textContent = this.va.value + (this.va.units || ''); } else { this.va.value = this.type !== 'checkbox' ? this.value : this.checked ? '1' : '0';