Forráskód Böngészése

Fix opening of console

Steven Silvester 7 éve
szülő
commit
c234c3868b
2 módosított fájl, 6 hozzáadás és 12 törlés
  1. 4 1
      packages/console-extension/src/index.ts
  2. 2 11
      packages/console/src/panel.ts

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

@@ -197,8 +197,9 @@ function activateConsole(app: JupyterLab, mainMenu: IMainMenu, palette: ICommand
    * Create a console for a given path.
    */
   function createConsole(options: ICreateOptions): Promise<ConsolePanel> {
+    let panel: ConsolePanel;
     return manager.ready.then(() => {
-      let panel = new ConsolePanel({
+      panel = new ConsolePanel({
         manager,
         contentFactory,
         mimeTypeService: editorServices.mimeTypeService,
@@ -206,6 +207,8 @@ function activateConsole(app: JupyterLab, mainMenu: IMainMenu, palette: ICommand
         ...options as Partial<ConsolePanel.IOptions>
       });
 
+      return panel.session.ready;
+    }).then(() => {
       // Add the console panel to the tracker.
       tracker.add(panel);
       shell.addToMainArea(

+ 2 - 11
packages/console/src/panel.ts

@@ -87,12 +87,13 @@ class ConsolePanel extends Panel {
     });
     this.addWidget(this.console);
 
-    session.ready.then(() => {
+    session.initialize().then(() => {
       this._connected = new Date();
       this._updateTitle();
     });
 
     this.console.executed.connect(this._onExecuted, this);
+    this._updateTitle();
     session.kernelChanged.connect(this._updateTitle, this);
     session.propertyChanged.connect(this._updateTitle, this);
 
@@ -126,16 +127,6 @@ class ConsolePanel extends Panel {
     super.dispose();
   }
 
-  /**
-   * Handle `'after-attach'` messages.
-   */
-  protected onAfterAttach(msg: Message): void {
-    this._session.initialize();
-    let prompt = this.console.promptCell;
-    if (prompt) {
-      prompt.editor.focus();
-    }
-  }
 
   /**
    * Handle `'activate-request'` messages.