May 25, 2018 · Apr 23, 2018 · Apr 24, 2018 · Apr 25, 2018 · Apr 26, 2018 · Apr 27, 2018
diff --git a/packages/notebook/src/panel.ts b/packages/notebook/src/panel.ts
  IClientSession
 } from '@jupyterlab/apputils';

 import {
  IEditorMimeTypeService
 } from '@jupyterlab/codeeditor';

 import {
  IChangedArgs
 } from '@jupyterlab/coreutils';
 } from './model';

 import {
  Notebook, StaticNotebook
  Notebook
 } from './widget';


  /**
   * Construct a new notebook panel.
   */
  constructor(options:NotebookPanel.IOptions) {
  constructor(options:DocumentWidget.IOptions<Notebook, INotebookModel>) {
    // Set default options
    const notebookReady = new PromiseDelegate<void>();
    options.ready = Promise.all([options.ready, notebookReady.promise]).then(() => { return; });

    // Notebook
    if (!options.content) {
      let contentFactory = options.contentFactory = (
        options.contentFactory || NotebookPanel.defaultContentFactory
      );
      let nbOptions: Notebook.IOptions = {
        rendermime: options.rendermime,
        languagePreference: options.languagePreference,
        contentFactory: contentFactory,
        mimeTypeService: options.mimeTypeService,
        editorConfig: options.editorConfig,
      };
      options.content = contentFactory.createNotebook(nbOptions);
    }

    super(options);
    this._activated = new Signal<this, void>(this);

    // Set up CSS classes
    this.addClass(NOTEBOOK_PANEL_CLASS);
    this.rendermime = options.rendermime;

    // Toolbar
    this.toolbar.addClass(NOTEBOOK_PANEL_TOOLBAR_CLASS);

    // Notebook
    this.content.addClass(NOTEBOOK_PANEL_NOTEBOOK_CLASS);

    // Set up things related to the context
   * The client session used by the panel.
   */
  get session(): IClientSession {
    return this.context ? this.context.session : null;
    return this.context.session;
  }

  /**
  }

  /**
   * The factory used by the widget.
   * The content factory for the notebook.
   *
   * TODO: deprecate this in favor of the .content attribute
   *
   */
  readonly contentFactory: NotebookPanel.IContentFactory;
  get contentFactory(): Notebook.IContentFactory {
    return this.content.contentFactory;
  }

  /**
   * The Rendermime instance used by the widget.
   * The rendermime instance for the notebook.
   *
   * TODO: deprecate this in favor of the .content attribute
   *
   */
  readonly rendermime: RenderMimeRegistry;
  get rendermime(): RenderMimeRegistry {
    return this.content.rendermime;
  }

  /**
   * The notebook used by the widget.
 * A namespace for `NotebookPanel` statics.
 */
 export namespace NotebookPanel {
  /**
   * An options interface for NotebookPanels.
   */
  export
  interface IOptions extends DocumentWidget.IOptions<Notebook, INotebookModel> {
    /**
     * The rendermime instance used by the panel.
     */
    rendermime: RenderMimeRegistry;

    /**
     * The language preference for the model.
     */
    languagePreference?: string;

    /**
     * The content factory for the panel.
     */
    contentFactory?: IContentFactory;

    /**
     * The mimeType service.
     */
    mimeTypeService: IEditorMimeTypeService;

    /**
     * The notebook cell editor configuration.
     */
    editorConfig?: StaticNotebook.IEditorConfig;
  }

  /**
   * A content factory interface for NotebookPanel.
   */
diff --git a/packages/notebook/src/widgetfactory.ts b/packages/notebook/src/widgetfactory.ts
  constructor(options: NotebookWidgetFactory.IOptions) {
    super(options);
    this.rendermime = options.rendermime;
    this.contentFactory = options.contentFactory;
    this.contentFactory = options.contentFactory || NotebookPanel.defaultContentFactory;
    this.mimeTypeService = options.mimeTypeService;
    this._editorConfig = options.editorConfig
                         || StaticNotebook.defaultEditorConfig;
    this._editorConfig = options.editorConfig || StaticNotebook.defaultEditorConfig;
  }

  /*
  protected createNewWidget(context: DocumentRegistry.IContext<INotebookModel>): NotebookPanel {
    let rendermime = this.rendermime.clone({ resolver: context.urlResolver });

    letpanel =new NotebookPanel({
    letnbOptions = {
      rendermime,
      contentFactory: this.contentFactory,
      mimeTypeService: this.mimeTypeService,
      editorConfig: this._editorConfig,
  context,
  // TODO: passing in explicitly undefinedcontentis an awkward way to get the content made by the panel.
      content: undefined
    });
    ToolbarItems.populateDefaults(panel);
    returnpanel;
 };
 letcontent= this.contentFactory.createNotebook(nbOptions);

 let widget = new NotebookPanel({ context, content});
    ToolbarItems.populateDefaults(widget);
    returnwidget;
  }

  private _editorConfig: StaticNotebook.IEditorConfig;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,10 +26,6 @@ import {
		IClientSession
		} from '@jupyterlab/apputils';

		import {
		IEditorMimeTypeService
		} from '@jupyterlab/codeeditor';

		import {
		IChangedArgs
		} from '@jupyterlab/coreutils';
Expand All		@@ -47,7 +43,7 @@ import {
		} from './model';

		import {
		Notebook, StaticNotebook
		Notebook
		} from './widget';


Expand DownExpand Up		@@ -78,36 +74,16 @@ class NotebookPanel extends DocumentWidget<Notebook, INotebookModel> {
		/**
		* Construct a new notebook panel.
		*/
		constructor(options:NotebookPanel.IOptions) {
		constructor(options:DocumentWidget.IOptions<Notebook, INotebookModel>) {
		// Set default options
		const notebookReady = new PromiseDelegate<void>();
		options.ready = Promise.all([options.ready, notebookReady.promise]).then(() => { return; });

		// Notebook
		if (!options.content) {
		let contentFactory = options.contentFactory = (
		options.contentFactory \|\| NotebookPanel.defaultContentFactory
		);
		let nbOptions: Notebook.IOptions = {
		rendermime: options.rendermime,
		languagePreference: options.languagePreference,
		contentFactory: contentFactory,
		mimeTypeService: options.mimeTypeService,
		editorConfig: options.editorConfig,
		};
		options.content = contentFactory.createNotebook(nbOptions);
		}

		super(options);
		this._activated = new Signal<this, void>(this);
Copy link Member ian-r-roseMay 24, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Why not initialize this below in the private properties listing?

		// Set up CSS classes
		this.addClass(NOTEBOOK_PANEL_CLASS);
		this.rendermime = options.rendermime;

		// Toolbar
		this.toolbar.addClass(NOTEBOOK_PANEL_TOOLBAR_CLASS);

		// Notebook
		this.content.addClass(NOTEBOOK_PANEL_NOTEBOOK_CLASS);

		// Set up things related to the context
Expand DownExpand Up		@@ -157,7 +133,7 @@ class NotebookPanel extends DocumentWidget<Notebook, INotebookModel> {
		* The client session used by the panel.
		*/
		get session(): IClientSession {
		return this.context ? this.context.session : null;
		return this.context.session;
		}

		/**
Expand All		@@ -170,14 +146,24 @@ class NotebookPanel extends DocumentWidget<Notebook, INotebookModel> {
		}

		/**
		* The factory used by the widget.
		* The content factory for the notebook.
		*
		* TODO: deprecate this in favor of the .content attribute
		*
		*/
		readonly contentFactory: NotebookPanel.IContentFactory;
		get contentFactory(): Notebook.IContentFactory {
		return this.content.contentFactory;
		}

		/**
		* The Rendermime instance used by the widget.
		* The rendermime instance for the notebook.
		*
		* TODO: deprecate this in favor of the .content attribute
		*
		*/
		readonly rendermime: RenderMimeRegistry;
		get rendermime(): RenderMimeRegistry {
		return this.content.rendermime;
		}

		/**
		* The notebook used by the widget.
Expand DownExpand Up		@@ -279,37 +265,6 @@ class NotebookPanel extends DocumentWidget<Notebook, INotebookModel> {
		* A namespace for `NotebookPanel` statics.
		*/
		export namespace NotebookPanel {
		/**
		* An options interface for NotebookPanels.
		*/
		export
		interface IOptions extends DocumentWidget.IOptions<Notebook, INotebookModel> {
		/**
		* The rendermime instance used by the panel.
		*/
		rendermime: RenderMimeRegistry;

		/**
		* The language preference for the model.
		*/
		languagePreference?: string;

		/**
		* The content factory for the panel.
		*/
		contentFactory?: IContentFactory;

		/**
		* The mimeType service.
		*/
		mimeTypeService: IEditorMimeTypeService;

		/**
		* The notebook cell editor configuration.
		*/
		editorConfig?: StaticNotebook.IEditorConfig;
		}

		/**
		* A content factory interface for NotebookPanel.
		*/
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,10 +43,9 @@ class NotebookWidgetFactory extends ABCWidgetFactory<NotebookPanel, INotebookMod
		constructor(options: NotebookWidgetFactory.IOptions) {
		super(options);
		this.rendermime = options.rendermime;
		this.contentFactory = options.contentFactory;
		this.contentFactory = options.contentFactory \|\| NotebookPanel.defaultContentFactory;
		this.mimeTypeService = options.mimeTypeService;
		this._editorConfig = options.editorConfig
		\|\| StaticNotebook.defaultEditorConfig;
		this._editorConfig = options.editorConfig \|\| StaticNotebook.defaultEditorConfig;
		}

		/*
Expand DownExpand Up		@@ -84,17 +83,17 @@ class NotebookWidgetFactory extends ABCWidgetFactory<NotebookPanel, INotebookMod
		protected createNewWidget(context: DocumentRegistry.IContext<INotebookModel>): NotebookPanel {
		let rendermime = this.rendermime.clone({ resolver: context.urlResolver });

		letpanel =new NotebookPanel({
		letnbOptions = {
		rendermime,
		contentFactory: this.contentFactory,
		mimeTypeService: this.mimeTypeService,
		editorConfig: this._editorConfig,
		context,
		// TODO: passing in explicitly undefinedcontentis an awkward way to get the content made by the panel.
		content: undefined
		});
		ToolbarItems.populateDefaults(panel);
		returnpanel;
		};
		letcontent= this.contentFactory.createNotebook(nbOptions);

		let widget = new NotebookPanel({ context, content});
		ToolbarItems.populateDefaults(widget);
		returnwidget;
		}

		private _editorConfig: StaticNotebook.IEditorConfig;
Expand Down