Cleaning up output management in code and menus.

IPython/html/static/notebook/js/codecell.js

@@ -418,26 +418,30 b' var IPython = (function (IPython) {'
     };
 
 
-    CodeCell.prototype.collapse = function () {
+    CodeCell.prototype.collapse_output = function () {
         this.collapsed = true;
         this.output_area.collapse();
     };
 
 
-    CodeCell.prototype.expand = function () {
+    CodeCell.prototype.expand_output = function () {
         this.collapsed = false;
         this.output_area.expand();
+        this.output_area.unscroll_area();
     };
 
+    CodeCell.prototype.scroll_output = function () {
+        this.output_area.expand();
+        this.output_area.scroll_if_long();
+    };
 
     CodeCell.prototype.toggle_output = function () {
         this.collapsed = Boolean(1 - this.collapsed);
         this.output_area.toggle_output();
     };
 
-
     CodeCell.prototype.toggle_output_scroll = function () {
-    this.output_area.toggle_scroll();
+        this.output_area.toggle_scroll();
     };
 
 
@@ -510,6 +514,7 b' var IPython = (function (IPython) {'
 
     CodeCell.prototype.clear_output = function (wait) {
         this.output_area.clear_output(wait);
+        this.set_input_prompt();
     };
 
 
@@ -533,9 +538,9 b' var IPython = (function (IPython) {'
             this.output_area.fromJSON(data.outputs);
             if (data.collapsed !== undefined) {
                 if (data.collapsed) {
-                    this.collapse();
+                    this.collapse_output();
                 } else {
-                    this.expand();
+                    this.expand_output();
                 }
             }
         }

IPython/html/static/notebook/js/menubar.js

@@ -225,35 +225,17 b' var IPython = (function (IPython) {'
         this.element.find('#run_all_cells_below').click(function () {
             IPython.notebook.execute_cells_below();
         });
-        this.element.find('#to_code').click(function () {
-            IPython.notebook.to_code();
+        this.element.find('#collapse_current_output').click(function () {
+            IPython.notebook.collapse_output();
         });
-        this.element.find('#to_markdown').click(function () {
-            IPython.notebook.to_markdown();
+        this.element.find('#scroll_current_output').click(function () {
+            IPython.notebook.scroll_output();
         });
-        this.element.find('#to_raw').click(function () {
-            IPython.notebook.to_raw();
+        this.element.find('#expand_current_output').click(function () {
+            IPython.notebook.expand_output();
         });
-        this.element.find('#to_heading1').click(function () {
-            IPython.notebook.to_heading(undefined, 1);
-        });
-        this.element.find('#to_heading2').click(function () {
-            IPython.notebook.to_heading(undefined, 2);
-        });
-        this.element.find('#to_heading3').click(function () {
-            IPython.notebook.to_heading(undefined, 3);
-        });
-        this.element.find('#to_heading4').click(function () {
-            IPython.notebook.to_heading(undefined, 4);
-        });
-        this.element.find('#to_heading5').click(function () {
-            IPython.notebook.to_heading(undefined, 5);
-        });
-        this.element.find('#to_heading6').click(function () {
-            IPython.notebook.to_heading(undefined, 6);
-        });
-        this.element.find('#toggle_output').click(function () {
-            IPython.notebook.toggle_output();
+        this.element.find('#clear_current_output').click(function () {
+            IPython.notebook.clear_output();
         });
         this.element.find('#collapse_all_output').click(function () {
             IPython.notebook.collapse_all_output();

IPython/html/static/notebook/js/notebook.js

@@ -1165,67 +1165,114 b' var IPython = (function (IPython) {'
     /**
      * Hide a cell's output.
      * 
-     * @method collapse
+     * @method collapse_output
      * @param {Number} index A cell's numeric index
      */
-    Notebook.prototype.collapse = function (index) {
+    Notebook.prototype.collapse_output = function (index) {
         var i = this.index_or_selected(index);
-        this.get_cell(i).collapse();
+        var cell = this.get_cell(i);
+        if (cell !== null && (cell instanceof IPython.CodeCell)) {
+            cell.collapse_output();
+            this.set_dirty(true);
+        }
+    };
+
+    /**
+     * Hide each code cell's output area.
+     * 
+     * @method collapse_all_output
+     */
+    Notebook.prototype.collapse_all_output = function () {
+        var ncells = this.ncells();
+        var cells = this.get_cells();
+        for (var i=0; i<ncells; i++) {
+            if (cells[i] instanceof IPython.CodeCell) {
+                cells[i].collapse_output();
+            }
+        };
+        // this should not be set if the `collapse` key is removed from nbformat
         this.set_dirty(true);
     };
 
     /**
      * Show a cell's output.
      * 
-     * @method expand
+     * @method expand_output
      * @param {Number} index A cell's numeric index
      */
-    Notebook.prototype.expand = function (index) {
+    Notebook.prototype.expand_output = function (index) {
         var i = this.index_or_selected(index);
-        this.get_cell(i).expand();
-        this.set_dirty(true);
+        var cell = this.get_cell(i);
+        if (cell !== null && (cell instanceof IPython.CodeCell)) {
+            cell.expand_output();
+            this.set_dirty(true);
+        }
     };
 
-    /** Toggle whether a cell's output is collapsed or expanded.
+    /**
+     * Expand each code cell's output area, and remove scrollbars.
      * 
-     * @method toggle_output
-     * @param {Number} index A cell's numeric index
+     * @method expand_all_output
      */
-    Notebook.prototype.toggle_output = function (index) {
-        var i = this.index_or_selected(index);
-        this.get_cell(i).toggle_output();
+    Notebook.prototype.expand_all_output = function () {
+        var ncells = this.ncells();
+        var cells = this.get_cells();
+        for (var i=0; i<ncells; i++) {
+            if (cells[i] instanceof IPython.CodeCell) {
+                cells[i].expand_output();
+            }
+        };
+        // this should not be set if the `collapse` key is removed from nbformat
         this.set_dirty(true);
     };
 
     /**
-     * Toggle a scrollbar for long cell outputs.
+     * Clear the selected CodeCell's output area.
      * 
-     * @method toggle_output_scroll
+     * @method clear_output
      * @param {Number} index A cell's numeric index
      */
-    Notebook.prototype.toggle_output_scroll = function (index) {
+    Notebook.prototype.clear_output = function (index) {
         var i = this.index_or_selected(index);
-        this.get_cell(i).toggle_output_scroll();
+        var cell = this.get_cell(i);
+        if (cell !== null && (cell instanceof IPython.CodeCell)) {
+            cell.clear_output();
+            this.set_dirty(true);
+        }
     };
 
     /**
-     * Hide each code cell's output area.
+     * Clear each code cell's output area.
      * 
-     * @method collapse_all_output
+     * @method clear_all_output
      */
-    Notebook.prototype.collapse_all_output = function () {
+    Notebook.prototype.clear_all_output = function () {
         var ncells = this.ncells();
         var cells = this.get_cells();
         for (var i=0; i<ncells; i++) {
             if (cells[i] instanceof IPython.CodeCell) {
-                cells[i].output_area.collapse();
+                cells[i].clear_output();
             }
         };
-        // this should not be set if the `collapse` key is removed from nbformat
         this.set_dirty(true);
     };
 
     /**
+     * Scroll the selected CodeCell's output area.
+     * 
+     * @method scroll_output
+     * @param {Number} index A cell's numeric index
+     */
+    Notebook.prototype.scroll_output = function (index) {
+        var i = this.index_or_selected(index);
+        var cell = this.get_cell(i);
+        if (cell !== null && (cell instanceof IPython.CodeCell)) {
+            cell.scroll_output();
+            this.set_dirty(true);
+        }
+    };
+
+    /**
      * Expand each code cell's output area, and add a scrollbar for long output.
      * 
      * @method scroll_all_output
@@ -1235,49 +1282,40 b' var IPython = (function (IPython) {'
         var cells = this.get_cells();
         for (var i=0; i<ncells; i++) {
             if (cells[i] instanceof IPython.CodeCell) {
-                cells[i].output_area.expand();
-                cells[i].output_area.scroll_if_long();
+                cells[i].scroll_output();
             }
         };
         // this should not be set if the `collapse` key is removed from nbformat
         this.set_dirty(true);
     };
 
-    /**
-     * Expand each code cell's output area, and remove scrollbars.
+    /** Toggle whether a cell's output is collapsed or expanded.
      * 
-     * @method expand_all_output
+     * @method toggle_output
+     * @param {Number} index A cell's numeric index
      */
-    Notebook.prototype.expand_all_output = function () {
-        var ncells = this.ncells();
-        var cells = this.get_cells();
-        for (var i=0; i<ncells; i++) {
-            if (cells[i] instanceof IPython.CodeCell) {
-                cells[i].output_area.expand();
-                cells[i].output_area.unscroll_area();
-            }
-        };
-        // this should not be set if the `collapse` key is removed from nbformat
-        this.set_dirty(true);
+    Notebook.prototype.toggle_output = function (index) {
+        var i = this.index_or_selected(index);
+        var cell = this.get_cell(i);
+        if (cell !== null && (cell instanceof IPython.CodeCell)) {
+            cell.toggle_output();
+            this.set_dirty(true);
+        }
     };
 
     /**
-     * Clear each code cell's output area.
+     * Toggle a scrollbar for long cell outputs.
      * 
-     * @method clear_all_output
+     * @method toggle_output_scroll
+     * @param {Number} index A cell's numeric index
      */
-    Notebook.prototype.clear_all_output = function () {
-        var ncells = this.ncells();
-        var cells = this.get_cells();
-        for (var i=0; i<ncells; i++) {
-            if (cells[i] instanceof IPython.CodeCell) {
-                cells[i].clear_output();
-                // Make all In[] prompts blank, as well
-                // TODO: make this configurable (via checkbox?)
-                cells[i].set_input_prompt();
-            }
-        };
-        this.set_dirty(true);
+    Notebook.prototype.toggle_output_scroll = function (index) {
+        var i = this.index_or_selected(index);
+        var cell = this.get_cell(i);
+        if (cell !== null && (cell instanceof IPython.CodeCell)) {
+            cell.toggle_output_scroll();
+            this.set_dirty(true);
+        }
     };
 
 

IPython/html/templates/notebook.html

@@ -151,39 +151,26 b' class="notebook_app"'
                 <li id="run_all_cells_below" title="Run this cell and all cells below it">
                     <a href="#">Run All Below</a></li>
                 <li class="divider"></li>
-                <li id="change_cell_type" class="dropdown-submenu"
-                    title="All cells in the notebook have a cell type. By default, new cells are created as 'Code' cells">
-                    <a href="#">Cell Type</a>
+                <li id="current_outputs" class="dropdown-submenu"><a href="#">Current Output</a>
                     <ul class="dropdown-menu">
-                      <li id="to_code"
-                          title="Contents will be sent to the kernel for execution, and output will display in the footer of cell">
-                          <a href="#">Code</a></li>
-                      <li id="to_markdown"
-                          title="Contents will be rendered as HTML and serve as explanatory text">
-                          <a href="#">Markdown</a></li>
-                      <li id="to_raw"
-                          title="Contents will pass through nbconvert unmodified">
-                          <a href="#">Raw NBConvert</a></li>
-                      <li id="to_heading1"><a href="#">Heading 1</a></li>
-                      <li id="to_heading2"><a href="#">Heading 2</a></li>
-                      <li id="to_heading3"><a href="#">Heading 3</a></li>
-                      <li id="to_heading4"><a href="#">Heading 4</a></li>
-                      <li id="to_heading5"><a href="#">Heading 5</a></li>
-                      <li id="to_heading6"><a href="#">Heading 6</a></li>
+                        <li id="collapse_current_output"><a href="#">Collapse</a></li>
+                        <li id="expand_current_output"><a href="#">Expand</a></li>
+                        <li id="clear_current_output"
+                            title="Clear the output portion of the current cell">
+                            <a href="#">Clear</a>
+                        </li>
+                        <li id="scroll_current_output"><a href="#">Scroll Long</a></li>
                     </ul>
                 </li>
-                <li class="divider"></li>
-                <li id="toggle_output"
-                    title="Show/Hide the output portion of a Code cell">
-                    <a href="#">Toggle Current Output</a></li>
                 <li id="all_outputs" class="dropdown-submenu"><a href="#">All Output</a>
                     <ul class="dropdown-menu">
-                        <li id="expand_all_output"><a href="#">Expand</a></li>
-                        <li id="scroll_all_output"><a href="#">Scroll Long</a></li>
                         <li id="collapse_all_output"><a href="#">Collapse</a></li>
+                        <li id="expand_all_output"><a href="#">Expand</a></li>
                         <li id="clear_all_output"
-                            title="Remove the output portion of all Code cells">
-                            <a href="#">Clear</a></li>
+                            title="Clear the output portion of all Code cells">
+                            <a href="#">Clear</a>
+                        </li>
+                        <li id="scroll_all_output"><a href="#">Scroll Long</a></li>
                     </ul>
                 </li>
             </ul>