Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web

2 files changed, 5 insertions, 4 deletions

diff --git a/src/client/util/TooltipTextMenu.tsx b/src/client/util/TooltipTextMenu.tsx
index d287ff9b1..0d3adef2e 100644
--- a/src/client/util/TooltipTextMenu.tsx
+++ b/src/client/util/TooltipTextMenu.tsx
@@ -123,7 +123,7 @@ export class TooltipTextMenu {
         this.listTypeToIcon.set(schema.nodes.ordered_list, "1)");
         this.listTypes = Array.from(this.listTypeToIcon.keys());
 
-        this.tooltip.appendChild(this.createLink().render(this.view).dom);
+        // this.tooltip.appendChild(this.createLink().render(this.view).dom);
 
         this.tooltip.appendChild(this.createStar().render(this.view).dom);
 
@@ -252,7 +252,7 @@ export class TooltipTextMenu {
             this.linkEditor.appendChild(this.linkDrag);
             // this.linkEditor.appendChild(this.linkText);
             // this.linkEditor.appendChild(linkBtn);
-            // this.tooltip.appendChild(this.linkEditor);
+            this.tooltip.appendChild(this.linkEditor);
         }
 
         let node = this.view.state.selection.$from.nodeAfter;
diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx
index 971658473..589542806 100644
--- a/src/client/views/Main.tsx
+++ b/src/client/views/Main.tsx
@@ -16,13 +16,14 @@ let swapDocs = async () => {
         if (links && links.length) {
             let data = await DocListCastAsync(Docs.Prototypes.MainLinkDocument().allLinks);
             if (data) {
-                data.push(...links);
+                data.push(...links.filter(i => data!.indexOf(i) === -1));
+                Docs.Prototypes.MainLinkDocument().allLinks = new List<Doc>(data.filter((i, idx) => data!.indexOf(i) === idx));
             }
             else {
                 Docs.Prototypes.MainLinkDocument().allLinks = new List<Doc>(links);
             }
         }
-        CurrentUserUtils.UserDocument.LinkManagerDoc = undefined;
+        CurrentUserUtils.UserDocument.linkManagerDoc = undefined;
     }
 }