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

Ensure range default & value types match

Browse Source
This commit is contained in:
Rob Garrison 2018-09-09 07:37:25 -05:00
parent ae6e2647a3
commit 7cd4380ee4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/usercss.js
View File

@ -224,7 +224,7 @@ var usercss = (() => {
state.errorPrefix = ''; state.errorPrefix = '';
// [default, start, end, step, units] (start, end, step & units are optional) // [default, start, end, step, units] (start, end, step & units are optional)
if (Array.isArray(state.value) && state.value.length) { if (Array.isArray(state.value) && state.value.length) {
result.default = state.value.shift(); result.default = parseFloat(state.value.shift());
const nonDigit = /[^\d.+-]/; const nonDigit = /[^\d.+-]/;
// label may be placed anywhere after default value // label may be placed anywhere after default value
const labelIndex = state.value.findIndex(item => nonDigit.test(item)); const labelIndex = state.value.findIndex(item => nonDigit.test(item));

7
manage/config-dialog.js
View File

@ -314,12 +314,13 @@ function configDialog(style) {
} }
function updateVarOnChange() { function updateVarOnChange() {
this.va.value = this.type !== 'checkbox' ? this.value : this.checked ? '1' : '0';
if (this.type === 'number') { if (this.type === 'number') {
this.value = this.va.value = clampValue(this.value, this.va.range); this.value = this.va.value = clampValue(this.value, this.va.range);
} } else if (this.type === 'range') {
if (this.type === 'range') {
$('.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 || '');
this.va.value = parseFloat(this.value);
} else {
this.va.value = this.type !== 'checkbox' ? this.value : this.checked ? '1' : '0';
} }
} }