scale.skip should use numeric non-date incrs, and range

leeoniya · Nov 8, 2019 · b14e153 · b14e153
1 parent 46d64d9
commit b14e153
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/dist/uPlot.cjs.js b/dist/uPlot.cjs.js
@@ -631,12 +631,14 @@ function Line(opts, data) {
 		if (axis.time == null)
 			{ axis.time = scales[axis.scale].time; }
 
+		var sc = scales[axis.scale];
+
 		// also set defaults for incrs & values based on axis type
 		var isTime = axis.time;
 
-		axis.incrs = axis.incrs || (isTime ? timeIncrs : numIncrs);
+		axis.incrs = axis.incrs || (isTime && !sc.skip ? timeIncrs : numIncrs);
 		axis.values = axis.values || (isTime ? timeAxisVals : numAxisVals);
-		axis.range = fnOrSelf(axis.range || (isTime ? snapMinDate : snapMinNum));
+		axis.range = fnOrSelf(axis.range || (isTime && !sc.skip ? snapMinDate : snapMinNum));
 		axis.space = fnOrSelf(axis.space);
 	});
 

diff --git a/dist/uPlot.iife.js b/dist/uPlot.iife.js
@@ -632,12 +632,14 @@ var uPlot = (function (exports) {
 			if (axis.time == null)
 				{ axis.time = scales[axis.scale].time; }
 
+			var sc = scales[axis.scale];
+
 			// also set defaults for incrs & values based on axis type
 			var isTime = axis.time;
 
-			axis.incrs = axis.incrs || (isTime ? timeIncrs : numIncrs);
+			axis.incrs = axis.incrs || (isTime && !sc.skip ? timeIncrs : numIncrs);
 			axis.values = axis.values || (isTime ? timeAxisVals : numAxisVals);
-			axis.range = fnOrSelf(axis.range || (isTime ? snapMinDate : snapMinNum));
+			axis.range = fnOrSelf(axis.range || (isTime && !sc.skip ? snapMinDate : snapMinNum));
 			axis.space = fnOrSelf(axis.space);
 		});