From 1c8ce20a458c603a104408b8529fd918c563a512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Tue, 28 Dec 2021 16:16:16 +0100 Subject: [PATCH] Move fallback to default color to a location where it's accessible (fixes #137) --- src/api.js | 2 +- src/ruler.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api.js b/src/api.js index 6295122..0672964 100644 --- a/src/api.js +++ b/src/api.js @@ -121,7 +121,7 @@ export function getColorForDistanceAndToken(distance, token, ranges=null) { ranges = getRangesFromSpeedProvider(token); } if (ranges.length === 0) - return this.color; + return null; const currentRange = ranges.reduce((minRange, currentRange) => { if (distance <= currentRange.range && currentRange.range < minRange.range) return currentRange; diff --git a/src/ruler.js b/src/ruler.js index 6147d08..cd33994 100644 --- a/src/ruler.js +++ b/src/ruler.js @@ -169,6 +169,6 @@ export class DragRulerRuler extends Ruler { distance = Math.round(distance * 100) / 100; if (!this.dragRulerRanges) this.dragRulerRanges = getRangesFromSpeedProvider(this.draggedEntity); - return getColorForDistanceAndToken(distance, this.draggedEntity, this.dragRulerRanges); + return getColorForDistanceAndToken(distance, this.draggedEntity, this.dragRulerRanges) ?? this.color; } }