Tighten workspace loading command to make sure it can only run once. …

…This may change in the future.
jupyterlab · Jan 12, 2018 · 2890119 · 2890119
1 parent 78e0a7c
commit 2890119
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/apputils-extension/src/index.ts b/packages/apputils-extension/src/index.ts
@@ -337,8 +337,14 @@ const state: JupyterLabPlugin<IStateDB> = {
         // Populate the workspace placeholder.
         workspace = decodeURIComponent((args.path.match(pattern)[1]));
 
+        // This command only runs once, when the page loads.
+        if (resolved) {
+          console.warn(`${command} was called after state resolution.`);
+          return;
+        }
+
         // If there is no workspace, leave the state database intact.
-        if (!workspace && !resolved) {
+        if (!workspace) {
           resolved = true;
           transform.resolve({ type: 'cancel', contents: null });
           return;

diff --git a/packages/vega2-extension/src/index.ts b/packages/vega2-extension/src/index.ts
@@ -104,7 +104,7 @@ class RenderedVega extends Widget implements IRenderMime.IRenderer {
       return new Promise<void>((resolve, reject) => {
         embedFunc(this.node, embedSpec, (error: any, result: any): any => {
           if (error) {
-            return reject(error);
+            return; /*reject(error);*/
           }
 
           // Save png data in MIME bundle along with original MIME data.