fix: Unloading problem if unloaded too quickly

HEmile · Jan 15, 2022 · 3f2b1b1 · 3f2b1b1
1 parent 9a9db3a
commit 3f2b1b1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 109 deletions.
diff --git a/main.js b/main.js
diff --git a/src/main.ts b/src/main.ts
@@ -90,48 +90,6 @@ export default class JugglPlugin extends Plugin implements IJugglPlugin {
       this.settings.graphSettings = Object.assign({}, DefaultJugglSettings.graphSettings, this.settings.graphSettings);
       this.settings.embedSettings = Object.assign({}, DefaultJugglSettings.embedSettings, this.settings.embedSettings);
 
-      // this.statusBar = this.addStatusBarItem();
-      // this.statusBar.setText(STATUS_OFFLINE);
-      // this.neo4jStream = new Neo4jStream(this);
-      // this.addChild(this.neo4jStream);
-
-      // this.registerView(NV_VIEW_TYPE, (leaf: WorkspaceLeaf) => this.neovisView=new NeoVisView(leaf, this.app.workspace.activeLeaf?.getDisplayText(), this))
-
-      // this.addCommand({
-      //   id: 'restart-stream',
-      //   name: 'Restart Neo4j stream',
-      //   callback: () => {
-      //     console.log('Restarting stream');
-      //     this.neo4jStream.restart();
-      //   },
-      // });
-      // this.addCommand({
-      //   id: 'stop-stream',
-      //   name: 'Stop Neo4j stream',
-      //   callback: () => {
-      //     this.neo4jStream.shutdown();
-      //   },
-      // });
-
-      // this.addCommand({
-      //   id: 'open-bloom-link',
-      //   name: 'Open note in Neo4j Bloom',
-      //   callback: () => {
-      //       if (!this.stream_process) {
-      //           new Notice("Cannot open in Neo4j Bloom as neo4j stream is not active.")
-      //       }
-      //       let active_view = this.app.workspace.getActiveViewOfType(MarkdownView);
-      //       if (active_view == null) {
-      //           return;
-      //       }
-      //       let name = active_view.getDisplayText();
-      //       // active_view.getState().
-      //
-      //       console.log(encodeURI("neo4j://graphapps/neo4j-bloom?search=SMD_no_tags with name " + name));
-      //       open(encodeURI("neo4j://graphapps/neo4j-bloom?search=SMD_no_tags with name " + name));
-      //       // require("electron").shell.openExternal("www.google.com");
-      //   },
-      // });
 
       this.addCommand({
         id: 'open-vis',
@@ -150,18 +108,6 @@ export default class JugglPlugin extends Plugin implements IJugglPlugin {
         },
       });
 
-      // this.addCommand({
-      //   id: 'execute-query',
-      //   name: 'Execute Cypher query',
-      //   callback: () => {
-      //     if (!this.neo4jStream) {
-      //       new Notice('Cannot open local graph as neo4j stream is not active.');
-      //       return;
-      //     }
-      //     this.executeQuery();
-      //   },
-      // });
-
       this.addSettingTab(new JugglGraphSettingsTab(this.app, this));
 
       this.registerEvent(this.app.workspace.on('file-menu', (menu, file: TFile) => {

diff --git a/src/viz/visualization.ts b/src/viz/visualization.ts
@@ -133,6 +133,7 @@ export class Juggl extends Component implements IJuggl {
         });
       }
 
+
       this.viz.dblclick();
 
       if (this.settings.navigator) {
@@ -174,7 +175,6 @@ export class Juggl extends Component implements IJuggl {
         this.restartLayout();
       }
 
-      console.log('Visualization ready');
 
       const view = this;
       this.viz.on('tap boxselect', async (e) => {
@@ -305,6 +305,7 @@ export class Juggl extends Component implements IJuggl {
       }, DEBOUNCE_FOLLOW, true));
       this.vizReady = true;
       this.trigger('vizReady', this.viz);
+      console.log('Visualization ready');
     }
 
     async popover(mdContent: string, sourcePath: string, target: Singular, styleClass: string) {

diff --git a/src/viz/workspaces/workspace-mode.ts b/src/viz/workspaces/workspace-mode.ts
@@ -277,7 +277,9 @@ export class WorkspaceMode extends Component implements IAGMode {
     if (this.toolbar) {
       this.toolbar.$destroy();
     }
-    this.menu.destroy();
+    if (this.menu) {
+      this.menu.destroy();
+    }
   }
 
   getName(): string {