merged with master

1 files changed, 20 insertions, 13 deletions

diff --git a/src/client/util/SelectionManager.ts b/src/client/util/SelectionManager.ts
index 1354e32e1..5ddaafc72 100644
--- a/src/client/util/SelectionManager.ts
+++ b/src/client/util/SelectionManager.ts
@@ -1,6 +1,7 @@
 import { observable, action } from "mobx";
 import { DocumentView } from "../views/nodes/DocumentView";
-import { Document } from "../../fields/Document"
+import { Document } from "../../fields/Document";
+import { Main } from "../views/Main";
 
 export namespace SelectionManager {
     class Manager {
@@ -11,19 +12,26 @@ export namespace SelectionManager {
         SelectDoc(doc: DocumentView, ctrlPressed: boolean): void {
             // if doc is not in SelectedDocuments, add it
             if (!ctrlPressed) {
-                manager.SelectedDocuments = [];
+                this.DeselectAll();
             }
 
             if (manager.SelectedDocuments.indexOf(doc) === -1) {
-                manager.SelectedDocuments.push(doc)
+                manager.SelectedDocuments.push(doc);
+                doc.props.onActiveChanged(true);
             }
         }
+
+        @action
+        DeselectAll(): void {
+            manager.SelectedDocuments.map(dv => dv.props.onActiveChanged(false));
+            manager.SelectedDocuments = [];
+        }
     }
 
-    const manager = new Manager;
+    const manager = new Manager();
 
     export function SelectDoc(doc: DocumentView, ctrlPressed: boolean): void {
-        manager.SelectDoc(doc, ctrlPressed)
+        manager.SelectDoc(doc, ctrlPressed);
     }
 
     export function IsSelected(doc: DocumentView): boolean {
@@ -33,18 +41,17 @@ export namespace SelectionManager {
     export function DeselectAll(except?: Document): void {
         let found: DocumentView | undefined = undefined;
         if (except) {
-            for (let i = 0; i < manager.SelectedDocuments.length; i++) {
-                let view = manager.SelectedDocuments[i];
-                if (view.props.Document == except)
-                    found = view;
+            for (const view of manager.SelectedDocuments) {
+                if (view.props.Document === except) found = view;
             }
         }
-        manager.SelectedDocuments.length = 0;
-        if (found)
-            manager.SelectedDocuments.push(found);
+
+        manager.DeselectAll();
+        if (found) manager.SelectDoc(found, false);
+        Main.Instance.SetTextDoc(undefined, undefined);
     }
 
     export function SelectedDocuments(): Array<DocumentView> {
         return manager.SelectedDocuments;
     }
-}
\ No newline at end of file
+}