From 18815523481077f4643f01c30b1805929e90013b Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Sun, 16 Sep 2018 18:22:50 -0500
Subject: [PATCH] Remove va.range & add min/max/step to va directly

---
 js/usercss.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/usercss.js b/js/usercss.js
index edaff43b..45a7c762 100644
--- a/js/usercss.js
+++ b/js/usercss.js
@@ -232,10 +232,13 @@ var usercss = (() => {
         state.errorPrefix = '';
         // [default, start, end, step, units] (start, end, step & units are optional)
         if (Array.isArray(state.value) && state.value.length) {
-          result.default = state.value.shift();
-          // label may be placed anywhere after default value
+          // label may be placed anywhere
           result.units = (state.value.find(i => typeof i === 'string') || '').replace(/[\d.+-]/g, '');
-          result.range = state.value.filter(i => typeof i === 'number');
+          const range = state.value.filter(i => typeof i === 'number');
+          result.default = range[0];
+          result.min = range[1];
+          result.max = range[2];
+          result.step = range[3];
         }
         break;
       }
@@ -618,10 +621,7 @@ var usercss = (() => {
       throw new Error(chrome.i18n.getMessage('styleMetaErrorCheckbox'));
     } else if (va.type === 'color') {
       va[value] = colorConverter.format(colorConverter.parse(va[value]), 'rgb');
-    } else if (
-      (va.type === 'number' || va.type === 'range') &&
-      (typeof va[value] !== 'number' || !Array.isArray(va.range))
-    ) {
+    } else if ((va.type === 'number' || va.type === 'range') && typeof va[value] !== 'number') {
       throw new Error(chrome.i18n.getMessage('styleMetaErrorRangeOrNumber', va.type));
     }
   }