Rename NotebookToolbar to Toolbar.

src/inspector/inspector.ts

@@ -26,7 +26,7 @@ import {
 } from 'phosphor/lib/ui/widget';
 
 import {
-  NotebookToolbar, ToolbarButton
+  Toolbar, ToolbarButton
 } from '../toolbar';
 
 
@@ -518,8 +518,8 @@ class InspectorItem extends Panel {
   /**
    * Create a history toolbar.
    */
-  private _createToolbar(): NotebookToolbar {
-    let toolbar = new NotebookToolbar();
+  private _createToolbar(): Toolbar {
+    let toolbar = new Toolbar();
 
     if (this.toggleEnabled) {
       let toggle = new ToolbarButton({
@@ -577,7 +577,7 @@ class InspectorItem extends Panel {
   private _orientation: Inspector.Orientation = 'horizontal';
   private _rank: number = Infinity;
   private _remembers: boolean = false;
-  private _toolbar: NotebookToolbar = null;
+  private _toolbar: Toolbar = null;
 }
 
 

src/notebook/notebook/panel.ts

@@ -50,7 +50,7 @@ import {
 } from './model';
 
 import {
-  NotebookToolbar
+  Toolbar
 } from '../../toolbar';
 
 import {
@@ -132,8 +132,8 @@ class NotebookPanel extends Widget {
    * #### Notes
    * This is a read-only property.
    */
-  get toolbar(): NotebookToolbar {
-    return (this.layout as PanelLayout).widgets.at(0) as NotebookToolbar;
+  get toolbar(): Toolbar {
+    return (this.layout as PanelLayout).widgets.at(0) as Toolbar;
   }
 
   /**
@@ -448,7 +448,7 @@ export namespace NotebookPanel {
     /**
      * Create a new toolbar for the panel.
      */
-    createToolbar(): NotebookToolbar;
+    createToolbar(): Toolbar;
 
     /**
      * Create a new completion widget for the panel.
@@ -469,8 +469,8 @@ export namespace NotebookPanel {
     /**
      * Create a new toolbar for the panel.
      */
-    createToolbar(): NotebookToolbar {
-      return new NotebookToolbar();
+    createToolbar(): Toolbar {
+      return new Toolbar();
     }
 
     /**

src/toolbar/index.ts

@@ -42,7 +42,7 @@ const TOOLBAR_PRESSED = 'jp-mod-pressed';
  * A class which provides a toolbar widget.
  */
 export
-class NotebookToolbar extends Widget {
+class Toolbar extends Widget {
   /**
    * Construct a new toolbar widget.
    */

test/src/notebook/notebook/panel.spec.ts

@@ -32,7 +32,7 @@ import {
 } from '../../../../lib/notebook/notebook/panel';
 
 import {
-  NotebookToolbar
+  Toolbar
 } from '../../../../lib/toolbar';
 
 import {
@@ -169,7 +169,7 @@ describe('notebook/notebook/panel', () => {
 
       it('should be the toolbar used by the widget', () => {
         let panel = new NotebookPanel({ rendermime, clipboard, renderer });
-        expect(panel.toolbar).to.be.a(NotebookToolbar);
+        expect(panel.toolbar).to.be.a(Toolbar);
       });
 
       it('should be read-only', () => {
@@ -408,7 +408,7 @@ describe('notebook/notebook/panel', () => {
 
         it('should create a notebook toolbar', () => {
           let renderer = new CodeMirrorNotebookPanelRenderer();
-          expect(renderer.createToolbar()).to.be.a(NotebookToolbar);
+          expect(renderer.createToolbar()).to.be.a(Toolbar);
         });
 
       });

test/src/toolbar/toolbar.spec.ts

@@ -16,7 +16,7 @@ import {
 } from 'simulate-event';
 
 import {
-  NotebookToolbar, ToolbarButton
+  Toolbar, ToolbarButton
 } from '../../../lib/toolbar';
 
 
@@ -43,19 +43,19 @@ class LogToolbarButton extends ToolbarButton {
 }
 
 
-describe('notebook/notebook/toolbar', () => {
+describe('toolbar/toolbar', () => {
 
-  describe('NotebookToolbar', () => {
+  describe('Toolbar', () => {
 
     describe('#constructor()', () => {
 
       it('should construct a new toolbar widget', () => {
-        let widget = new NotebookToolbar();
-        expect(widget).to.be.a(NotebookToolbar);
+        let widget = new Toolbar();
+        expect(widget).to.be.a(Toolbar);
       });
 
       it('should add the `jp-Toolbar` class', () => {
-        let widget = new NotebookToolbar();
+        let widget = new Toolbar();
         expect(widget.hasClass('jp-Toolbar')).to.be(true);
       });
 
@@ -65,21 +65,21 @@ describe('notebook/notebook/toolbar', () => {
 
       it('should add an item to the toolbar', () => {
         let item = new Widget();
-        let widget = new NotebookToolbar();
+        let widget = new Toolbar();
         widget.add('test', item);
         expect(widget.list()).to.contain('test');
       });
 
       it('should add the `jp-Toolbar-item` class to the widget', () => {
         let item = new Widget();
-        let widget = new NotebookToolbar();
+        let widget = new Toolbar();
         widget.add('test', item);
         expect(item.hasClass('jp-Toolbar-item')).to.be(true);
       });
 
       it('should add the item after a named item', () => {
         let items = [new Widget(), new Widget(), new Widget()];
-        let widget = new NotebookToolbar();
+        let widget = new Toolbar();
         widget.add('foo', items[0]);
         widget.add('bar', items[1]);
         widget.add('baz', items[2], 'foo');
@@ -88,7 +88,7 @@ describe('notebook/notebook/toolbar', () => {
 
       it('should ignore an invalid `after`', () => {
         let items = [new Widget(), new Widget(), new Widget()];
-        let widget = new NotebookToolbar();
+        let widget = new Toolbar();
         widget.add('foo', items[0]);
         widget.add('bar', items[1]);
         widget.add('baz', items[2], 'fuzz');
@@ -96,7 +96,7 @@ describe('notebook/notebook/toolbar', () => {
       });
 
       it('should throw an error if the name is alreay used', () => {
-        let widget = new NotebookToolbar();
+        let widget = new Toolbar();
         widget.add('test', new Widget());
         expect(() => { widget.add('test', new Widget()); }).to.throwError();
       });
@@ -106,7 +106,7 @@ describe('notebook/notebook/toolbar', () => {
     describe('#list()', () => {
 
       it('should get an ordered list the toolbar item names', () => {
-        let widget = new NotebookToolbar();
+        let widget = new Toolbar();
         widget.add('foo', new Widget());
         widget.add('bar', new Widget());
         widget.add('baz', new Widget());

tutorial/notebook.md

@@ -50,7 +50,7 @@ After the NotebookModel is created, the NotebookWidgetFactory constructs a
 new NotebookPanel from the model. The NotebookPanel widget is added to
 the DockPanel. The **NotebookPanel** contains:
 
-- a [NotebookToolbar](http://jupyter.org/jupyterlab/classes/_notebook_notebook_toolbar_.notebooktoolbar.html)
+- a [Toolbar](http://jupyter.org/jupyterlab/modules/_toolbar_index_.html)
 - a [Notebook widget](http://jupyter.org/jupyterlab/classes/_notebook_notebook_widget_.notebook.html).
 
 The NotebookPanel also adds completion logic.