ソースを参照

More work on launcher.

Brian E. Granger 7 年 前
コミット
087b4aff55

+ 2 - 1
packages/console-extension/src/index.ts

@@ -171,7 +171,8 @@ function activateConsole(app: JupyterLab, manager: IServiceManager, mainMenu: IM
           name,
           iconClass: 'jp-ImageCodeConsole',
           callback,
-          rank
+          rank,
+          kernelIconUrl: specs.kernelspecs[name].resources["logo-64x64"]
         });
       }
     });

+ 1 - 2
packages/filebrowser-extension/src/index.ts

@@ -372,8 +372,7 @@ function addCommands(app: JupyterLab, tracker: InstanceTracker<FileBrowser>, mai
   app.restored.then(() => {
     if (app.shell.isEmpty('main')) {
       commands.execute('launcher:create', {
-        cwd: mainBrowser.model.path,
-        banner: true
+        cwd: mainBrowser.model.path
       });
     }
   });

+ 4 - 1
packages/launcher-extension/src/index.ts

@@ -18,7 +18,6 @@ import {
   ILauncher, LauncherModel, LauncherWidget
 } from '@jupyterlab/launcher';
 
-
 import {
   Widget
 } from '@phosphor/widgets';
@@ -100,4 +99,8 @@ namespace Private {
    */
   export
   let id = 0;
+<<<<<<< HEAD
+=======
+
+>>>>>>> More work on launcher.
 }

+ 1 - 11
packages/launcher/src/index.ts

@@ -229,7 +229,6 @@ class LauncherWidget extends VDomRenderer<LauncherModel> {
     super();
     this.cwd = options.cwd;
     this._callback = options.callback;
-    this._header = options.header;
     this.addClass(LAUNCHER_CLASS);
   }
 
@@ -277,16 +276,11 @@ class LauncherWidget extends VDomRenderer<LauncherModel> {
     });
 
     let children: VirtualNode[];
-    if (this._header) {
-      children = [this._header].concat(toArray(items));
-    } else {
-      children = toArray(items);
-    }
+    children = toArray(items);
     return h.div({ className: BODY_CLASS  }, children);
   }
 
   private _callback: (widget: Widget) => void;
-  private _header: VirtualNode;
 }
 
 
@@ -310,10 +304,6 @@ namespace LauncherWidget {
      */
     callback: (widget: Widget) => void;
 
-    /**
-     * An optional header virtual node.
-     */
-    header?: VirtualNode;
   }
 }
 

+ 4 - 0
packages/launcher/src/typings.d.ts

@@ -0,0 +1,4 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+/// <reference path="../typings/tsx/tsx.d.ts"/>

+ 3 - 1
packages/launcher/tsconfig.json

@@ -9,7 +9,9 @@
     "target": "ES5",
     "outDir": "./lib",
     "lib": ["ES5", "ES2015.Promise", "DOM", "ES2015.Collection"],
-    "types": []
+    "types": [],
+    "jsx": "react",
+    "jsxFactory": "h"
   },
   "include": ["src/*"]
 }