merged master

1 files changed, 27 insertions, 22 deletions

diff --git a/src/client/util/SnappingManager.ts b/src/client/util/SnappingManager.ts
index 057843c68..2c0a1da8b 100644
--- a/src/client/util/SnappingManager.ts
+++ b/src/client/util/SnappingManager.ts
@@ -1,9 +1,8 @@
-import { observable, action, runInAction } from "mobx";
-import { computedFn } from "mobx-utils";
-import { Doc } from "../../fields/Doc";
+import { observable, action, runInAction } from 'mobx';
+import { computedFn } from 'mobx-utils';
+import { Doc } from '../../fields/Doc';
 
 export namespace SnappingManager {
-
     class Manager {
         @observable IsDragging: boolean = false;
         @observable public horizSnapLines: number[] = [];
@@ -16,28 +15,34 @@ export namespace SnappingManager {
             this.horizSnapLines = horizLines;
             this.vertSnapLines = vertLines;
         }
-
-        @observable cachedGroups: string[] = [];
-        @action setCachedGroups(groups: string[]) { this.cachedGroups = groups; }
     }
 
     const manager = new Manager();
 
-    export function clearSnapLines() { manager.clearSnapLines(); }
-    export function setSnapLines(horizLines: number[], vertLines: number[]) { manager.setSnapLines(horizLines, vertLines); }
-    export function horizSnapLines() { return manager.horizSnapLines; }
-    export function vertSnapLines() { return manager.vertSnapLines; }
-
-    export function SetIsDragging(dragging: boolean) { runInAction(() => manager.IsDragging = dragging); }
-    export function GetIsDragging() { return manager.IsDragging; }
+    export function clearSnapLines() {
+        manager.clearSnapLines();
+    }
+    export function setSnapLines(horizLines: number[], vertLines: number[]) {
+        manager.setSnapLines(horizLines, vertLines);
+    }
+    export function horizSnapLines() {
+        return manager.horizSnapLines;
+    }
+    export function vertSnapLines() {
+        return manager.vertSnapLines;
+    }
 
-    export function SetShowSnapLines(show: boolean) { runInAction(() => Doc.UserDoc().showSnapLines = show); }
-    export function GetShowSnapLines() { return Doc.UserDoc().showSnapLines; }
+    export function SetIsDragging(dragging: boolean) {
+        runInAction(() => (manager.IsDragging = dragging));
+    }
+    export function GetIsDragging() {
+        return manager.IsDragging;
+    }
 
-    /// bcz; argh!! TODO;   These do not belong here, but there were include order problems with leaving them in util.ts
-    // need to investigate further what caused the mobx update problems and move to a better location.
-    const getCachedGroupByNameCache = computedFn(function (name: string) { return manager.cachedGroups.includes(name); }, true);
-    export function GetCachedGroupByName(name: string) { return getCachedGroupByNameCache(name); }
-    export function SetCachedGroups(groups: string[]) { manager.setCachedGroups(groups); }
+    export function SetShowSnapLines(show: boolean) {
+        runInAction(() => (Doc.UserDoc().showSnapLines = show));
+    }
+    export function GetShowSnapLines() {
+        return Doc.UserDoc().showSnapLines;
+    }
 }
-