Immediately override the Ruler after extension to increase interoperability with other modules

This commit is contained in:
Manuel Vögele
2021-12-31 18:01:19 +01:00
parent 76cff06b66
commit c8a7c73ace
2 changed files with 154 additions and 150 deletions
+2 -2
View File
@@ -4,8 +4,8 @@ import {currentSpeedProvider, getColorForDistanceAndToken, getMovedDistanceFromT
import {checkDependencies, getHexSizeSupportTokenGridCenter, highlightMeasurementTerrainRuler} from "./compatibility.js"; import {checkDependencies, getHexSizeSupportTokenGridCenter, highlightMeasurementTerrainRuler} from "./compatibility.js";
import {moveEntities, onMouseMove} from "./foundry_imports.js" import {moveEntities, onMouseMove} from "./foundry_imports.js"
import {performMigrations} from "./migration.js" import {performMigrations} from "./migration.js"
import {DragRulerRuler} from "./ruler.js";
import {getMovementHistory, removeLastHistoryEntryIfAt, resetMovementHistory} from "./movement_tracking.js"; import {getMovementHistory, removeLastHistoryEntryIfAt, resetMovementHistory} from "./movement_tracking.js";
import {extendRuler} from "./ruler.js";
import {registerSettings, settingsKey} from "./settings.js" import {registerSettings, settingsKey} from "./settings.js"
import {recalculate} from "./socket.js"; import {recalculate} from "./socket.js";
import {SpeedProvider} from "./speed_provider.js" import {SpeedProvider} from "./speed_provider.js"
@@ -19,7 +19,7 @@ Hooks.once("init", () => {
hookKeyboardManagerFunctions() hookKeyboardManagerFunctions()
hookLayerFunctions(); hookLayerFunctions();
Ruler = DragRulerRuler; extendRuler();
window.dragRuler = { window.dragRuler = {
getColorForDistanceAndToken, getColorForDistanceAndToken,
+5 -1
View File
@@ -4,7 +4,8 @@ import {getMovementHistory} from "./movement_tracking.js";
import {settingsKey} from "./settings.js"; import {settingsKey} from "./settings.js";
import {getSnapPointForEntity, setSnapParameterOnOptions} from "./util.js"; import {getSnapPointForEntity, setSnapParameterOnOptions} from "./util.js";
export class DragRulerRuler extends Ruler { export function extendRuler() {
class DragRulerRuler extends Ruler {
// Functions below are overridden versions of functions in Ruler // Functions below are overridden versions of functions in Ruler
constructor(user, {color=null}={}) { constructor(user, {color=null}={}) {
super(user, {color}); super(user, {color});
@@ -172,3 +173,6 @@ export class DragRulerRuler extends Ruler {
return getColorForDistanceAndToken(distance, this.draggedEntity, this.dragRulerRanges) ?? this.color; return getColorForDistanceAndToken(distance, this.draggedEntity, this.dragRulerRanges) ?? this.color;
} }
} }
Ruler = DragRulerRuler;
}