open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change clamp function order & only call onblur

Browse Source
This commit is contained in:
Rob Garrison 2018-09-19 07:09:10 -05:00
parent a4d2e3dd9c
commit d00e5f4ddb
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manage/config-dialog.js
View File

@ -268,6 +268,7 @@ function configDialog(style) {
va, va,
type: va.type, type: va.type,
onfocus: va.type === 'number' ? selectAllOnFocus : null, onfocus: va.type === 'number' ? selectAllOnFocus : null,
onblur: va.type === 'number' ? updateVarOnBlur : null,
onchange: updateVarOnChange, onchange: updateVarOnChange,
oninput: updateVarOnInput oninput: updateVarOnInput
}; };
@ -316,9 +317,7 @@ function configDialog(style) {
} }
function updateVarOnChange() { function updateVarOnChange() {
if (this.type === 'number') { if (this.type === 'range') {
this.value = this.va.value = clampValue(this.value, this.va);
} else if (this.type === 'range') {
this.va.value = Number(this.value); this.va.value = Number(this.value);
$('.current-value', this.closest('.config-range')).textContent = this.va.value + (this.va.units || ''); $('.current-value', this.closest('.config-range')).textContent = this.va.value + (this.va.units || '');
} else { } else {
@ -326,24 +325,27 @@ function configDialog(style) {
} }
} }
// Applied to input[type=number]
function updateVarOnBlur() {
this.value = this.va.value = clampValue(this.value, this.va);
}
// Clamp input[type=number] to a valid range // Clamp input[type=number] to a valid range
function clampValue(value, va, break = false) { function clampValue(value, va) {
// Don't restrict to integer values if step is undefined.
if (isNumber(va.step)) {
const step = va.step || 1;
const scale = 10 ** (step.toString().split('.')[1] || '').length;
value = Math.round((value * scale) / (step * scale)) * (step * scale) / scale;
}
if (isNumber(va.min) && value < va.min) { if (isNumber(va.min) && value < va.min) {
return va.min; return va.min;
} }
if (isNumber(va.max) && value > va.max) { if (isNumber(va.max) && value > va.max) {
return va.max; return va.max;
} }
// Don't restrict to integer values if step is undefined.
if (!isNumber(va.step) || break) {
return value; return value;
} }
const step = va.step || 1;
const scale = 10 ** (step.toString().split('.')[1] || '').length;
value = Math.round((value * scale) / (step * scale)) * (step * scale) / scale;
// clamp modified value; skip step check
return clampValue(value, va, true);
}
function updateVarOnInput(event, debounced = false) { function updateVarOnInput(event, debounced = false) {
if (debounced) { if (debounced) {