Merge pull request #5390 from ian-r-rose/use_current_filebrowser

Use the current filebrowser for several commands.
jupyterlab · Sep 28, 2018 · 22e643c · 22e643c
2 parents 98b4e6a + 0a872b6
commit 22e643c
Showing 1 changed file with 20 additions and 7 deletions.
diff --git a/packages/filebrowser-extension/src/index.ts b/packages/filebrowser-extension/src/index.ts
@@ -312,7 +312,8 @@ function addCommands(
 
   commands.addCommand(CommandIDs.hideBrowser, {
     execute: () => {
-      if (!browser.isHidden) {
+      const widget = tracker.currentWidget;
+      if (widget && !widget.isHidden) {
         app.shell.collapseLeft();
       }
     }
@@ -401,8 +402,8 @@ function addCommands(
         return;
       }
 
-      return browser.model.manager.services.contents
-        .getDownloadUrl(browser.selectedItems().next().path)
+      return widget.model.manager.services.contents
+        .getDownloadUrl(widget.selectedItems().next().path)
         .then(url => {
           Clipboard.copyToSystem(url);
         });
@@ -440,26 +441,38 @@ function addCommands(
 
   commands.addCommand(CommandIDs.share, {
     execute: () => {
-      const path = encodeURI(browser.selectedItems().next().path);
+      const widget = tracker.currentWidget;
+      if (!widget) {
+        return;
+      }
+      const path = encodeURI(widget.selectedItems().next().path);
       const tree = PageConfig.getTreeUrl({ workspace: true });
 
       Clipboard.copyToSystem(URLExt.join(tree, path));
     },
-    isVisible: () => toArray(browser.selectedItems()).length === 1,
+    isVisible: () =>
+      tracker.currentWidget &&
+      toArray(tracker.currentWidget.selectedItems()).length === 1,
     iconClass: 'jp-MaterialIcon jp-LinkIcon',
     label: 'Copy Shareable Link'
   });
 
   commands.addCommand(CommandIDs.copyPath, {
     execute: () => {
-      const item = browser.selectedItems().next();
+      const widget = tracker.currentWidget;
+      if (!widget) {
+        return;
+      }
+      const item = widget.selectedItems().next();
       if (!item) {
         return;
       }
 
       Clipboard.copyToSystem(item.path);
     },
-    isVisible: () => browser.selectedItems().next !== undefined,
+    isVisible: () =>
+      tracker.currentWidget &&
+      tracker.currentWidget.selectedItems().next !== undefined,
     iconClass: 'jp-MaterialIcon jp-FileIcon',
     label: 'Copy Path'
   });