Browse Source

Cleaning up file browser.

Afshin Darian 8 years ago
parent
commit
4a8dc03384

+ 1 - 1
src/docmanager/manager.ts

@@ -20,7 +20,7 @@ import {
 
 import {
   IWidgetOpener
-} from '../filebrowser/interfaces';
+} from '../filebrowser';
 
 import {
   ContextManager

+ 10 - 4
src/filebrowser/browser.ts

@@ -37,10 +37,6 @@ import {
   BreadCrumbs
 } from './crumbs';
 
-import {
-  IWidgetOpener
-} from './interfaces';
-
 import {
   DirListing
 } from './listing';
@@ -75,6 +71,16 @@ const LISTING_CLASS = 'jp-FileBrowser-listing';
 const REFRESH_DURATION = 10000;
 
 
+/**
+ * An interface for a widget opener.
+ */
+export
+interface IWidgetOpener {
+  open(widget: Widget): void;
+}
+
+
+
 /**
  * A widget which hosts a file browser.
  *

+ 7 - 5
src/filebrowser/buttons.ts

@@ -38,12 +38,12 @@ import {
 } from '../docregistry';
 
 import {
-  FileBrowserModel
-} from './model';
+  IWidgetOpener
+} from './browser';
 
 import {
-  IWidgetOpener
-} from './interfaces';
+  FileBrowserModel
+} from './model';
 
 import * as utils
   from './utils';
@@ -197,7 +197,9 @@ class FileButtons extends Widget {
     }
 
     // Create a new dropdown menu and snap the button geometry.
-    let dropdown = Private.createDropdownMenu(this, this._commands);
+    let commands = this._commands;
+    let keymap = this._keymap;
+    let dropdown = Private.createDropdownMenu(this, commands, keymap);
     let rect = button.getBoundingClientRect();
 
     // Mark the button as active.

+ 0 - 14
src/filebrowser/interfaces.ts

@@ -1,14 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-import {
-  Widget
-} from 'phosphor/lib/ui/widget';
-
-/**
- * An interface for a widget opener.
- */
-export
-interface IWidgetOpener {
-  open(widget: Widget): void;
-}

+ 1 - 1
src/filebrowser/listing.ts

@@ -38,7 +38,7 @@ import {
 
 import {
   IWidgetOpener
-} from './interfaces';
+} from './browser';
 
 import {
   FileBrowserModel

+ 1 - 0
src/tsconfig.json

@@ -13,6 +13,7 @@
     "dialog/index",
     "docmanager/index",
     "docregistry/plugin",
+    "filebrowser/plugin",
     "index",
     "main/plugin",
     "mainmenu/plugin",