Merge pull request #2658 from ian-r-rose/filebrowser_cleanup

Filebrowser cleanup

packages/docmanager/src/dialogs.ts

@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  ClientSession, Dialog, showDialog
+  Dialog, showDialog
 } from '@jupyterlab/apputils';
 
 import {
@@ -10,7 +10,7 @@ import {
 } from '@jupyterlab/coreutils';
 
 import {
-  Contents, Kernel
+  Contents
 } from '@jupyterlab/services';
 
 import {
@@ -31,11 +31,6 @@ import {
  */
 const FILE_DIALOG_CLASS = 'jp-FileDialog';
 
-/**
- * The class name added for a file conflict.
- */
-const FILE_CONFLICT_CLASS = 'jp-mod-conflict';
-
 /**
  * The class name added for the new name label in the rename dialog
  */
@@ -57,20 +52,6 @@ interface IFileContainer extends JSONObject {
 }
 
 
-/**
- * Create a file using a file creator.
- */
-export
-function createFromDialog(container: IFileContainer, manager: IDocumentManager, creatorName: string): Promise<Widget | null> {
-  let handler = new CreateFromHandler(container, manager, creatorName);
-  return manager.services.ready.then(() => {
-    return handler.populate();
-  }).then(() => {
-    return handler.showDialog();
-  });
-}
-
-
 /**
  * Rename a file with an optional dialog.
  */
@@ -180,188 +161,10 @@ class RenameHandler extends Widget {
 }
 
 
-/**
- * A widget used to create a file using a creator.
- */
-class CreateFromHandler extends Widget {
-  /**
-   * Construct a new "create from" dialog.
-   */
-  constructor(container: IFileContainer, manager: IDocumentManager, creatorName: string) {
-    super({ node: Private.createCreateFromNode() });
-    this.addClass(FILE_DIALOG_CLASS);
-    this._container = container;
-    this._manager = manager;
-    this._creatorName = creatorName;
-
-    // Check for name conflicts when the inputNode changes.
-    this.inputNode.addEventListener('input', () => {
-      const value = this.inputNode.value;
-      const orig = PathExt.basename(this._orig.name);
-
-      this.removeClass(FILE_CONFLICT_CLASS);
-      if (value === orig) {
-        return;
-      }
-
-      const { items } = this._container;
-      const conflict = items.some(item => PathExt.basename(item) === value);
-      if (conflict) {
-        this.addClass(FILE_CONFLICT_CLASS);
-      }
-    });
-  }
-
-  /**
-   * Dispose of the resources used by the widget.
-   */
-  dispose(): void {
-    this._container = null;
-    this._manager = null;
-    super.dispose();
-  }
-
-  /**
-   * Get the input text node.
-   */
-  get inputNode(): HTMLInputElement {
-    return this.node.getElementsByTagName('input')[0] as HTMLInputElement;
-  }
-
-  /**
-   * Get the kernel dropdown node.
-   */
-  get kernelDropdownNode(): HTMLSelectElement {
-    return this.node.getElementsByTagName('select')[0] as HTMLSelectElement;
-  }
-
-  /**
-   * Show the createNew dialog.
-   */
-  showDialog(): Promise<Widget | null> {
-    return showDialog({
-      title: `Create New ${this._creatorName}`,
-      body: this.node,
-      primaryElement: this.inputNode,
-      buttons: [Dialog.cancelButton(), Dialog.okButton({ label: 'CREATE' })]
-    }).then(result => {
-      if (!result.accept) {
-        this._manager.deleteFile('/' + this._orig.path);
-        return null;
-      }
-      return this._open().then(widget => {
-        if (!widget) {
-          return this.showDialog();
-        }
-        return widget;
-      });
-    });
-  }
-
-  /**
-   * Populate the create from widget.
-   */
-  populate(): Promise<void> {
-    let container = this._container;
-    let manager = this._manager;
-    let registry = manager.registry;
-    let creator = registry.getCreator(this._creatorName);
-    if (!creator) {
-      return Promise.reject(`Creator not registered: ${this._creatorName}`);
-    }
-    let { fileType, widgetName, kernelName } = creator;
-    let fType = registry.getFileType(fileType);
-    let ext = '.txt';
-    let type: Contents.ContentType = 'file';
-    if (fType) {
-      ext = fType.extension;
-      type = fType.contentType || 'file';
-    }
-    if (!widgetName || widgetName === 'default') {
-      this._widgetName = widgetName = registry.defaultWidgetFactory(ext).name;
-    }
-
-    // Handle the kernel preferences.
-    let preference = registry.getKernelPreference(
-      ext, widgetName, { name: kernelName }
-    );
-    if (!preference.canStart) {
-      this.node.removeChild(this.kernelDropdownNode.previousSibling);
-      this.node.removeChild(this.kernelDropdownNode);
-    } else {
-      let services = this._manager.services;
-      ClientSession.populateKernelSelect(this.kernelDropdownNode, {
-        specs: services.specs,
-        sessions: services.sessions.running(),
-        preference
-      });
-    }
-
-    let path = container.path;
-    return manager.newUntitled({ ext, path, type }).then(contents => {
-      let value = this.inputNode.value = contents.name;
-      this.inputNode.setSelectionRange(0, value.length - ext.length);
-      this._orig = contents;
-    });
-  }
-
-  /**
-   * Open the file and return the document widget.
-   */
-  private _open(): Promise<Widget> {
-    let oldPath = this._orig.name;
-    let file = this.inputNode.value;
-    let widgetName = this._widgetName;
-    let kernelValue = this.kernelDropdownNode ? this.kernelDropdownNode.value
-      : 'null';
-    let kernelId: Kernel.IModel;
-    if (kernelValue !== 'null') {
-      kernelId = JSON.parse(kernelValue) as Kernel.IModel;
-    }
-    if (file !== oldPath) {
-      let promise = renameFile(this._manager, oldPath, file);
-      return promise.then((contents: Contents.IModel) => {
-        if (!contents) {
-          return null;
-        }
-        return this._manager.open(contents.path, widgetName, kernelId);
-      });
-    }
-    let path = this._orig.path;
-    return Promise.resolve(this._manager.createNew(path, widgetName, kernelId));
-  }
-
-  private _container: IFileContainer = null;
-  private _creatorName: string;
-  private _manager: IDocumentManager;
-  private _orig: Contents.IModel = null;
-  private _widgetName: string;
-}
-
-
 /**
  * A namespace for private data.
  */
 namespace Private {
-  /**
-   * Create the node for a create from handler.
-   */
-  export
-  function createCreateFromNode(): HTMLElement {
-    let body = document.createElement('div');
-    let nameTitle = document.createElement('label');
-    nameTitle.textContent = 'File Name';
-    let name = document.createElement('input');
-    let kernelTitle = document.createElement('label');
-    kernelTitle.textContent = 'Kernel';
-    let kernelDropdownNode = document.createElement('select');
-    body.appendChild(nameTitle);
-    body.appendChild(name);
-    body.appendChild(kernelTitle);
-    body.appendChild(kernelDropdownNode);
-    return body;
-  }
-
   /**
    * Create the node for a rename handler.
    */

packages/filebrowser/src/listing.ts

@@ -1290,8 +1290,7 @@ class DirListing extends Widget {
     this._clipboard.length = 0;
     each(this.selectedItems(), item => {
       if (item.type !== 'directory') {
-        // Store the absolute path of the item.
-        this._clipboard.push('/' + item.path);
+        this._clipboard.push(item.path);
       }
     });
     this.update();