From 06ad682d68fe3f21155a28ec8a0a4fa598e83bc6 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Mon, 12 May 2014 14:04:39 -0700
Subject: [PATCH 01/17] Add scrollmanager

---
 .../static/notebook/js/keyboardmanager.js     | 715 +++++++++---------
 IPython/html/static/notebook/js/main.js       |   6 +-
 .../html/static/notebook/js/scrollmanager.js  |  78 ++
 3 files changed, 448 insertions(+), 351 deletions(-)
 create mode 100644 IPython/html/static/notebook/js/scrollmanager.js

diff --git a/IPython/html/static/notebook/js/keyboardmanager.js b/IPython/html/static/notebook/js/keyboardmanager.js
index bf35e0f2d..c5d213ec3 100644
--- a/IPython/html/static/notebook/js/keyboardmanager.js
+++ b/IPython/html/static/notebook/js/keyboardmanager.js
@@ -1,14 +1,17 @@
-// Copyright (c) IPython Development Team.
-// Distributed under the terms of the Modified BSD License.
+//----------------------------------------------------------------------------
+//  Copyright (C) 2011  The IPython Development Team
+//
+//  Distributed under the terms of the BSD License.  The full license is in
+//  the file COPYING, distributed as part of this software.
+//----------------------------------------------------------------------------
 
-define([
-    'base/js/namespace',
-    'jquery',
-    'base/js/utils',
-    'base/js/keyboard',
-], function(IPython, $, utils, keyboard) {
+//============================================================================
+// Keyboard management
+//============================================================================
+
+var IPython = (function (IPython) {
     "use strict";
-    
+
     var browser = utils.browser[0];
     var platform = utils.platform;
 
@@ -40,437 +43,449 @@ define([
     KeyboardManager.prototype.get_default_common_shortcuts = function() {
         var that = this;
         var shortcuts = {
-            'shift' : {
-                help    : '',
-                help_index : '',
-                handler : function (event) {
-                    // ignore shift keydown
-                    return true;
-                }
-            },
-            'shift-enter' : {
-                help    : 'run cell, select below',
-                help_index : 'ba',
-                handler : function (event) {
+        'shift' : {
+            help    : '',
+            help_index : '',
+            handler : function (event) {
+                // ignore shift keydown
+                return true;
+            }
+        },
+        'shift-enter' : {
+            help    : 'run cell, select below',
+            help_index : 'ba',
+            handler : function (event) {
                     that.notebook.execute_cell_and_select_below();
-                    return false;
-                }
-            },
-            'ctrl-enter' : {
-                help    : 'run cell',
-                help_index : 'bb',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'ctrl-enter' : {
+            help    : 'run cell',
+            help_index : 'bb',
+            handler : function (event) {
                     that.notebook.execute_cell();
-                    return false;
-                }
-            },
-            'alt-enter' : {
-                help    : 'run cell, insert below',
-                help_index : 'bc',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'alt-enter' : {
+            help    : 'run cell, insert below',
+            help_index : 'bc',
+            handler : function (event) {
                     that.notebook.execute_cell_and_insert_below();
-                    return false;
-                }
+                return false;
             }
-        };
+        }
+    };
 
-        if (platform === 'MacOS') {
+    if (platform === 'MacOS') {
             shortcuts['cmd-s'] =
-                {
-                    help    : 'save notebook',
-                    help_index : 'fb',
-                    handler : function (event) {
+            {
+                help    : 'save notebook',
+                help_index : 'fb',
+                handler : function (event) {
                         that.notebook.save_checkpoint();
-                        event.preventDefault();
-                        return false;
-                    }
-                };
-        } else {
+                    event.preventDefault();
+                    return false;
+                }
+            };
+    } else {
             shortcuts['ctrl-s'] =
-                {
-                    help    : 'save notebook',
-                    help_index : 'fb',
-                    handler : function (event) {
+            {
+                help    : 'save notebook',
+                help_index : 'fb',
+                handler : function (event) {
                         that.notebook.save_checkpoint();
-                        event.preventDefault();
-                        return false;
-                    }
-                };
-        }
+                    event.preventDefault();
+                    return false;
+                }
+            };
+    }
         return shortcuts;
     };
 
     KeyboardManager.prototype.get_default_edit_shortcuts = function() {
         var that = this;
         return {
-            'esc' : {
-                help    : 'command mode',
-                help_index : 'aa',
-                handler : function (event) {
+        'esc' : {
+            help    : 'command mode',
+            help_index : 'aa',
+            handler : function (event) {
                     that.notebook.command_mode();
-                    return false;
-                }
-            },
-            'ctrl-m' : {
-                help    : 'command mode',
-                help_index : 'ab',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'ctrl-m' : {
+            help    : 'command mode',
+            help_index : 'ab',
+            handler : function (event) {
                     that.notebook.command_mode();
-                    return false;
-                }
-            },
-            'up' : {
-                help    : '',
-                help_index : '',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'up' : {
+            help    : '',
+            help_index : '',
+            handler : function (event) {
                     var index = that.notebook.get_selected_index();
                     var cell = that.notebook.get_cell(index);
-                    if (cell && cell.at_top() && index !== 0) {
-                        event.preventDefault();
+                if (cell && cell.at_top() && index !== 0) {
+                    event.preventDefault();
                         that.notebook.command_mode();
                         that.notebook.select_prev();
                         that.notebook.edit_mode();
                         var cm = that.notebook.get_selected_cell().code_mirror;
-                        cm.setCursor(cm.lastLine(), 0);
-                        return false;
-                    } else if (cell) {
-                        var cm = cell.code_mirror;
-                        cm.execCommand('goLineUp');
-                        return false;
-                    }
+                    cm.setCursor(cm.lastLine(), 0);
+                    return false;
+                } else if (cell) {
+                    var cm = cell.code_mirror;
+                    cm.execCommand('goLineUp');
+                    return false;
                 }
-            },
-            'down' : {
-                help    : '',
-                help_index : '',
-                handler : function (event) {
+            }
+        },
+        'down' : {
+            help    : '',
+            help_index : '',
+            handler : function (event) {
                     var index = that.notebook.get_selected_index();
                     var cell = that.notebook.get_cell(index);
                     if (cell.at_bottom() && index !== (that.notebook.ncells()-1)) {
-                        event.preventDefault();
+                    event.preventDefault();
                         that.notebook.command_mode();
                         that.notebook.select_next();
                         that.notebook.edit_mode();
                         var cm = that.notebook.get_selected_cell().code_mirror;
-                        cm.setCursor(0, 0);
-                        return false;
-                    } else {
-                        var cm = cell.code_mirror;
-                        cm.execCommand('goLineDown');
-                        return false;
-                    }
-                }
-            },
-            'ctrl-shift--' : {
-                help    : 'split cell',
-                help_index : 'ea',
-                handler : function (event) {
-                    that.notebook.split_cell();
+                    cm.setCursor(0, 0);
                     return false;
-                }
-            },
-            'ctrl-shift-subtract' : {
-                help    : '',
-                help_index : 'eb',
-                handler : function (event) {
-                    that.notebook.split_cell();
+                } else {
+                    var cm = cell.code_mirror;
+                    cm.execCommand('goLineDown');
                     return false;
                 }
-            },
-        };
+            }
+        },
+        'ctrl-shift--' : {
+            help    : 'split cell',
+            help_index : 'ea',
+            handler : function (event) {
+                    that.notebook.split_cell();
+                return false;
+            }
+        },
+        'ctrl-shift-subtract' : {
+            help    : '',
+            help_index : 'eb',
+            handler : function (event) {
+                    that.notebook.split_cell();
+                return false;
+            }
+        },
+    };
     };
 
     KeyboardManager.prototype.get_default_command_shortcuts = function() {
         var that = this;
         return {
-            'enter' : {
-                help    : 'edit mode',
-                help_index : 'aa',
-                handler : function (event) {
+        'space': {
+            help: "Scroll down to next H1 cell",
+            handler: function(event) {
+                return that.notebook.scrollmanager.scroll(1);
+            },
+        },
+        'shift-space': {
+            help: "Scroll up to previous H1 cell",
+            handler: function(event) {
+                return that.notebook.scrollmanager.scroll(-1);
+            },
+        },
+        'enter' : {
+            help    : 'edit mode',
+            help_index : 'aa',
+            handler : function (event) {
                     that.notebook.edit_mode();
-                    return false;
-                }
-            },
-            'up' : {
-                help    : 'select previous cell',
-                help_index : 'da',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'up' : {
+            help    : 'select previous cell',
+            help_index : 'da',
+            handler : function (event) {
                     var index = that.notebook.get_selected_index();
-                    if (index !== 0 && index !== null) {
+                if (index !== 0 && index !== null) {
                         that.notebook.select_prev();
                         that.notebook.focus_cell();
-                    }
-                    return false;
                 }
-            },
-            'down' : {
-                help    : 'select next cell',
-                help_index : 'db',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'down' : {
+            help    : 'select next cell',
+            help_index : 'db',
+            handler : function (event) {
                     var index = that.notebook.get_selected_index();
                     if (index !== (that.notebook.ncells()-1) && index !== null) {
                         that.notebook.select_next();
                         that.notebook.focus_cell();
-                    }
-                    return false;
                 }
-            },
-            'k' : {
-                help    : 'select previous cell',
-                help_index : 'dc',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'k' : {
+            help    : 'select previous cell',
+            help_index : 'dc',
+            handler : function (event) {
                     var index = that.notebook.get_selected_index();
-                    if (index !== 0 && index !== null) {
+                if (index !== 0 && index !== null) {
                         that.notebook.select_prev();
                         that.notebook.focus_cell();
-                    }
-                    return false;
                 }
-            },
-            'j' : {
-                help    : 'select next cell',
-                help_index : 'dd',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'j' : {
+            help    : 'select next cell',
+            help_index : 'dd',
+            handler : function (event) {
                     var index = that.notebook.get_selected_index();
                     if (index !== (that.notebook.ncells()-1) && index !== null) {
                         that.notebook.select_next();
                         that.notebook.focus_cell();
-                    }
-                    return false;
                 }
-            },
-            'x' : {
-                help    : 'cut cell',
-                help_index : 'ee',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'x' : {
+            help    : 'cut cell',
+            help_index : 'ee',
+            handler : function (event) {
                     that.notebook.cut_cell();
-                    return false;
-                }
-            },
-            'c' : {
-                help    : 'copy cell',
-                help_index : 'ef',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'c' : {
+            help    : 'copy cell',
+            help_index : 'ef',
+            handler : function (event) {
                     that.notebook.copy_cell();
-                    return false;
-                }
-            },
-            'shift-v' : {
-                help    : 'paste cell above',
-                help_index : 'eg',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'shift-v' : {
+            help    : 'paste cell above',
+            help_index : 'eg',
+            handler : function (event) {
                     that.notebook.paste_cell_above();
-                    return false;
-                }
-            },
-            'v' : {
-                help    : 'paste cell below',
-                help_index : 'eh',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'v' : {
+            help    : 'paste cell below',
+            help_index : 'eh',
+            handler : function (event) {
                     that.notebook.paste_cell_below();
-                    return false;
-                }
-            },
-            'd' : {
-                help    : 'delete cell (press twice)',
-                help_index : 'ej',
-                count: 2,
-                handler : function (event) {
+                return false;
+            }
+        },
+        'd' : {
+            help    : 'delete cell (press twice)',
+            help_index : 'ej',
+            count: 2,
+            handler : function (event) {
                     that.notebook.delete_cell();
-                    return false;
-                }
-            },
-            'a' : {
-                help    : 'insert cell above',
-                help_index : 'ec',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'a' : {
+            help    : 'insert cell above',
+            help_index : 'ec',
+            handler : function (event) {
                     that.notebook.insert_cell_above();
                     that.notebook.select_prev();
                     that.notebook.focus_cell();
-                    return false;
-                }
-            },
-            'b' : {
-                help    : 'insert cell below',
-                help_index : 'ed',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'b' : {
+            help    : 'insert cell below',
+            help_index : 'ed',
+            handler : function (event) {
                     that.notebook.insert_cell_below();
                     that.notebook.select_next();
                     that.notebook.focus_cell();
-                    return false;
-                }
-            },
-            'y' : {
-                help    : 'to code',
-                help_index : 'ca',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'y' : {
+            help    : 'to code',
+            help_index : 'ca',
+            handler : function (event) {
                     that.notebook.to_code();
-                    return false;
-                }
-            },
-            'm' : {
-                help    : 'to markdown',
-                help_index : 'cb',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'm' : {
+            help    : 'to markdown',
+            help_index : 'cb',
+            handler : function (event) {
                     that.notebook.to_markdown();
-                    return false;
-                }
-            },
-            'r' : {
-                help    : 'to raw',
-                help_index : 'cc',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'r' : {
+            help    : 'to raw',
+            help_index : 'cc',
+            handler : function (event) {
                     that.notebook.to_raw();
-                    return false;
-                }
-            },
-            '1' : {
-                help    : 'to heading 1',
-                help_index : 'cd',
-                handler : function (event) {
+                return false;
+            }
+        },
+        '1' : {
+            help    : 'to heading 1',
+            help_index : 'cd',
+            handler : function (event) {
                     that.notebook.to_heading(undefined, 1);
-                    return false;
-                }
-            },
-            '2' : {
-                help    : 'to heading 2',
-                help_index : 'ce',
-                handler : function (event) {
+                return false;
+            }
+        },
+        '2' : {
+            help    : 'to heading 2',
+            help_index : 'ce',
+            handler : function (event) {
                     that.notebook.to_heading(undefined, 2);
-                    return false;
-                }
-            },
-            '3' : {
-                help    : 'to heading 3',
-                help_index : 'cf',
-                handler : function (event) {
+                return false;
+            }
+        },
+        '3' : {
+            help    : 'to heading 3',
+            help_index : 'cf',
+            handler : function (event) {
                     that.notebook.to_heading(undefined, 3);
-                    return false;
-                }
-            },
-            '4' : {
-                help    : 'to heading 4',
-                help_index : 'cg',
-                handler : function (event) {
+                return false;
+            }
+        },
+        '4' : {
+            help    : 'to heading 4',
+            help_index : 'cg',
+            handler : function (event) {
                     that.notebook.to_heading(undefined, 4);
-                    return false;
-                }
-            },
-            '5' : {
-                help    : 'to heading 5',
-                help_index : 'ch',
-                handler : function (event) {
+                return false;
+            }
+        },
+        '5' : {
+            help    : 'to heading 5',
+            help_index : 'ch',
+            handler : function (event) {
                     that.notebook.to_heading(undefined, 5);
-                    return false;
-                }
-            },
-            '6' : {
-                help    : 'to heading 6',
-                help_index : 'ci',
-                handler : function (event) {
+                return false;
+            }
+        },
+        '6' : {
+            help    : 'to heading 6',
+            help_index : 'ci',
+            handler : function (event) {
                     that.notebook.to_heading(undefined, 6);
-                    return false;
-                }
-            },
-            'o' : {
-                help    : 'toggle output',
-                help_index : 'gb',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'o' : {
+            help    : 'toggle output',
+            help_index : 'gb',
+            handler : function (event) {
                     that.notebook.toggle_output();
-                    return false;
-                }
-            },
-            'shift-o' : {
-                help    : 'toggle output scrolling',
-                help_index : 'gc',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'shift-o' : {
+            help    : 'toggle output scrolling',
+            help_index : 'gc',
+            handler : function (event) {
                     that.notebook.toggle_output_scroll();
-                    return false;
-                }
-            },
-            's' : {
-                help    : 'save notebook',
-                help_index : 'fa',
-                handler : function (event) {
+                return false;
+            }
+        },
+        's' : {
+            help    : 'save notebook',
+            help_index : 'fa',
+            handler : function (event) {
                     that.notebook.save_checkpoint();
-                    return false;
-                }
-            },
-            'ctrl-j' : {
-                help    : 'move cell down',
-                help_index : 'eb',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'ctrl-j' : {
+            help    : 'move cell down',
+            help_index : 'eb',
+            handler : function (event) {
                     that.notebook.move_cell_down();
-                    return false;
-                }
-            },
-            'ctrl-k' : {
-                help    : 'move cell up',
-                help_index : 'ea',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'ctrl-k' : {
+            help    : 'move cell up',
+            help_index : 'ea',
+            handler : function (event) {
                     that.notebook.move_cell_up();
-                    return false;
-                }
-            },
-            'l' : {
-                help    : 'toggle line numbers',
-                help_index : 'ga',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'l' : {
+            help    : 'toggle line numbers',
+            help_index : 'ga',
+            handler : function (event) {
                     that.notebook.cell_toggle_line_numbers();
-                    return false;
-                }
-            },
-            'i' : {
-                help    : 'interrupt kernel (press twice)',
-                help_index : 'ha',
-                count: 2,
-                handler : function (event) {
+                return false;
+            }
+        },
+        'i' : {
+            help    : 'interrupt kernel (press twice)',
+            help_index : 'ha',
+            count: 2,
+            handler : function (event) {
                     that.notebook.kernel.interrupt();
-                    return false;
-                }
-            },
-            '0' : {
-                help    : 'restart kernel (press twice)',
-                help_index : 'hb',
-                count: 2,
-                handler : function (event) {
+                return false;
+            }
+        },
+        '0' : {
+            help    : 'restart kernel (press twice)',
+            help_index : 'hb',
+            count: 2,
+            handler : function (event) {
                     that.notebook.restart_kernel();
-                    return false;
-                }
-            },
-            'h' : {
-                help    : 'keyboard shortcuts',
-                help_index : 'ge',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'h' : {
+            help    : 'keyboard shortcuts',
+            help_index : 'ge',
+            handler : function (event) {
                     that.quick_help.show_keyboard_shortcuts();
-                    return false;
-                }
-            },
-            'z' : {
-                help    : 'undo last delete',
-                help_index : 'ei',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'z' : {
+            help    : 'undo last delete',
+            help_index : 'ei',
+            handler : function (event) {
                     that.notebook.undelete_cell();
-                    return false;
-                }
-            },
-            'shift-m' : {
-                help    : 'merge cell below',
-                help_index : 'ek',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'shift-m' : {
+            help    : 'merge cell below',
+            help_index : 'ek',
+            handler : function (event) {
                     that.notebook.merge_cell_below();
-                    return false;
-                }
-            },
-            'q' : {
-                help    : 'close pager',
-                help_index : 'gd',
-                handler : function (event) {
+                return false;
+            }
+        },
+        'q' : {
+            help    : 'close pager',
+            help_index : 'gd',
+            handler : function (event) {
                     that.pager.collapse();
-                    return false;
-                }
-            },
-        };
+                return false;
+            }
+        },
+    };
     };
 
     KeyboardManager.prototype.bind_events = function () {
diff --git a/IPython/html/static/notebook/js/main.js b/IPython/html/static/notebook/js/main.js
index 4ddee4b8e..acfa4d531 100644
--- a/IPython/html/static/notebook/js/main.js
+++ b/IPython/html/static/notebook/js/main.js
@@ -19,6 +19,7 @@ require([
     'notebook/js/keyboardmanager',
     'notebook/js/config',
     'notebook/js/kernelselector',
+    'notebook/js/scrollmanager'
     // only loaded, not used:
     'custom/custom',
 ], function(
@@ -38,7 +39,8 @@ require([
     savewidget, 
     keyboardmanager,
     config,
-    kernelselector
+    kernelselector,
+    scrollmanager
     ) {
     "use strict";
 
@@ -67,6 +69,7 @@ require([
         save_widget: save_widget,
         config: user_config},
         common_options));
+    var scrollmanager = new scrollmanager.ScrollManager(notebook);
     var login_widget = new loginwidget.LoginWidget('span#login_widget', common_options);
     var toolbar = new maintoolbar.MainToolBar('#maintoolbar-container', {
         notebook: notebook, 
@@ -132,6 +135,7 @@ require([
     IPython.save_widget = save_widget;
     IPython.config = user_config;
     IPython.tooltip = notebook.tooltip;
+    IPython.scrollmanager = scrollmanager;
 
     events.trigger('app_initialized.NotebookApp');
     notebook.load_notebook(common_options.notebook_name, common_options.notebook_path);
diff --git a/IPython/html/static/notebook/js/scrollmanager.js b/IPython/html/static/notebook/js/scrollmanager.js
new file mode 100644
index 000000000..bd3465ad2
--- /dev/null
+++ b/IPython/html/static/notebook/js/scrollmanager.js
@@ -0,0 +1,78 @@
+// Copyright (c) IPython Development Team.
+// Distributed under the terms of the Modified BSD License.
+define([], function(){
+    "use strict";
+
+    var ScrollManager = function (notebook) {
+        // Public constructor.
+        this.notebook = notebook;
+    };
+
+    ScrollManager.prototype.scroll = function (delta) {
+        // Scroll the document.
+        //
+        // Parameters
+        // ----------
+        // delta: integer
+        //  direction to scroll the document.  Positive is downwards.
+
+        // If one or more slides exist, scroll to the slide.
+        var $slide_cells = $('.slideshow-slide');
+        if ($slide_cells.length > 0) {
+            var i, cell;
+
+            // Get the active slide cell index.
+            var selected_index = this.notebook.find_cell_index(this.notebook.get_selected_cell());
+            var active_slide = -1;
+            var cells = this.notebook.get_cells();
+            for (i = selected_index; i >= 0; i--) {
+                cell = cells[i];
+                var ns = cell.metadata.slideshow;
+                if (ns && ns.slide_type == 'slide') {
+                    active_slide = i;
+                    break;
+                }
+            }
+            
+            // Translate cell index into slide cell index.
+            if (active_slide != -1) {
+                for (i = 0; i < $slide_cells.length; i++) {
+                    if (cells[active_slide].element[0] == $slide_cells[i]) {
+                        active_slide = i;
+                        break;
+                    }
+                } 
+            }
+        
+            // Scroll.
+            if (active_slide != -1 || delta > 0) {
+                active_slide += delta;
+                active_slide = Math.max(0, Math.min($slide_cells.length-1, active_slide));
+                
+                var cell_element = $slide_cells[active_slide];
+                cell = $(cell_element).data('cell');
+                this.notebook.select(this.notebook.find_cell_index(cell));
+                
+                this.scroll_to(cell_element);
+                //cell_element.scrollIntoView(true);
+            }
+
+            // Cancel browser keyboard scroll.
+            return false;
+        
+        // No slides exist, default browser scroll
+        } else {
+            return true;
+        }
+    };
+
+    ScrollManager.prototype.scroll_to = function(destination) {
+        $('html, body').animate({'scrollTop': element.offset().top}, 'slow', 'swing');
+    };
+
+    // For convinience, add the ScrollManager class to the global namespace
+    IPython.ScrollManager = ScrollManager;
+    // Return naemspace for require.js loads
+    return ScrollManager;
+
+});

From 617f078165f258f1bf8415d3bd3a90b2b2adbf1c Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Mon, 12 May 2014 14:33:24 -0700
Subject: [PATCH 02/17] Make slideshow toolbar add classes to modified cells.

---
 .../js/celltoolbarpresets/slideshow.js        | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js b/IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js
index 6b2b35e87..1baffcb9a 100644
--- a/IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js
+++ b/IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js
@@ -11,6 +11,24 @@ define([
     var CellToolbar = celltoolbar.CellToolbar;
     var slideshow_preset = [];
 
+    var _update_cell = function(cell, old_slide_class) {
+        // Remove the old slide DOM class if set.
+        if (old_slide_class && old_slide_class != '-') {
+            cell.element.removeClass('slideshow-'+old_slide_class);
+        }
+        // add a DOM class to the cell
+        var value = _get_cell_type(cell);
+        if (value != '-') { cell.element.addClass('slideshow-'+value); }
+    };
+
+    var _get_cell_type = function(cell) {
+        var ns = cell.metadata.slideshow;
+        // if the slideshow namespace does not exist return `undefined`
+        // (will be interpreted as `false` by checkbox) otherwise
+        // return the value
+        return (ns === undefined)? undefined: ns.slide_type;
+    };
+
     var select_type = CellToolbar.utils.select_ui_generator([
             ["-"            ,"-"            ],
             ["Slide"        ,"slide"        ],
@@ -24,15 +42,13 @@ define([
                 // we check that the slideshow namespace exist and create it if needed
                 if (cell.metadata.slideshow === undefined){cell.metadata.slideshow = {};}
                 // set the value
+                var old = cell.metadata.slideshow.slide_type;
                 cell.metadata.slideshow.slide_type = value;
+                // update the slideshow class set on the cell 
+                _update_cell(cell, old);
                 },
             //geter
-            function(cell){ var ns = cell.metadata.slideshow;
-                // if the slideshow namespace does not exist return `undefined`
-                // (will be interpreted as `false` by checkbox) otherwise
-                // return the value
-                return (ns === undefined)? undefined: ns.slide_type;
-                },
+            _get_cell_type,
             "Slide Type");
 
     var register = function (notebook) {

From c2d72353a2a4c7f5d9074bbcdde2b6aea05db917 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Mon, 12 May 2014 14:50:07 -0700
Subject: [PATCH 03/17] Fixed bug

---
 IPython/html/static/notebook/js/keyboardmanager.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/IPython/html/static/notebook/js/keyboardmanager.js b/IPython/html/static/notebook/js/keyboardmanager.js
index c5d213ec3..fba065336 100644
--- a/IPython/html/static/notebook/js/keyboardmanager.js
+++ b/IPython/html/static/notebook/js/keyboardmanager.js
@@ -1,13 +1,5 @@
-//----------------------------------------------------------------------------
-//  Copyright (C) 2011  The IPython Development Team
-//
-//  Distributed under the terms of the BSD License.  The full license is in
-//  the file COPYING, distributed as part of this software.
-//----------------------------------------------------------------------------
-
-//============================================================================
-// Keyboard management
-//============================================================================
+// Copyright (c) IPython Development Team.
+// Distributed under the terms of the Modified BSD License.
 
 var IPython = (function (IPython) {
     "use strict";

From 5c5025f3b623ca7205f229307fd94674016e6c02 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Mon, 12 May 2014 14:50:19 -0700
Subject: [PATCH 04/17] Added smooth scroll to replace std browser behavior.

---
 IPython/html/static/notebook/js/scrollmanager.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/IPython/html/static/notebook/js/scrollmanager.js b/IPython/html/static/notebook/js/scrollmanager.js
index bd3465ad2..912d3aad5 100644
--- a/IPython/html/static/notebook/js/scrollmanager.js
+++ b/IPython/html/static/notebook/js/scrollmanager.js
@@ -6,6 +6,7 @@ define([], function(){
     var ScrollManager = function (notebook) {
         // Public constructor.
         this.notebook = notebook;
+        this.animation_speed = 250; //ms
     };
 
     ScrollManager.prototype.scroll = function (delta) {
@@ -60,14 +61,22 @@ define([], function(){
             // Cancel browser keyboard scroll.
             return false;
         
-        // No slides exist, default browser scroll
+        // No slides exist, scroll up or down one page height.  Instead of using
+        // the browser's built in method to do this, animate it using jQuery.
         } else {
-            return true;
+            this.scroll_some(delta);
+            return false;
         }
     };
 
     ScrollManager.prototype.scroll_to = function(destination) {
-        $('html, body').animate({'scrollTop': element.offset().top}, 'slow', 'swing');
+        // Scroll to an element in the notebook.
+        $('#notebook').animate({'scrollTop': $(destination).offset().top + $('#notebook').scrollTop() - $('#notebook').offset().top}, this.animation_speed);
+    };
+
+    ScrollManager.prototype.scroll_some = function(pages) {
+        // Scroll up or down a given number of pages.
+        $('#notebook').animate({'scrollTop': $('#notebook').scrollTop() + pages * $('#notebook').height()}, this.animation_speed);
     };
 
     // For convinience, add the ScrollManager class to the global namespace

From 62a21b0e6f3d2d7a9214e4d17503cc9242cbb6b5 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Mon, 2 Jun 2014 14:02:44 -0700
Subject: [PATCH 05/17] Add ScrollManager to global ipy namespace in main.js
 instead of, in the bottom of the scroll manager js file.

---
 IPython/html/static/notebook/js/scrollmanager.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/IPython/html/static/notebook/js/scrollmanager.js b/IPython/html/static/notebook/js/scrollmanager.js
index 912d3aad5..cbc7d4b8e 100644
--- a/IPython/html/static/notebook/js/scrollmanager.js
+++ b/IPython/html/static/notebook/js/scrollmanager.js
@@ -79,9 +79,6 @@ define([], function(){
         $('#notebook').animate({'scrollTop': $('#notebook').scrollTop() + pages * $('#notebook').height()}, this.animation_speed);
     };
 
-    // For convinience, add the ScrollManager class to the global namespace
-    IPython.ScrollManager = ScrollManager;
     // Return naemspace for require.js loads
     return ScrollManager;
-
 });

From 7e7683a587904ae077f1d4bdc4c56a10bf22ae7e Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Fri, 25 Jul 2014 17:14:21 -0700
Subject: [PATCH 06/17] Added scroll mode selector, fixed rebase conflicts.

---
 .../static/notebook/js/keyboardmanager.js     | 723 +++++++++---------
 IPython/html/static/notebook/js/main.js       |   6 +-
 .../html/static/notebook/js/maintoolbar.js    |   9 +-
 IPython/html/static/notebook/js/notebook.js   |   9 +-
 .../html/static/notebook/js/scrollmanager.js  | 122 ++-
 5 files changed, 487 insertions(+), 382 deletions(-)

diff --git a/IPython/html/static/notebook/js/keyboardmanager.js b/IPython/html/static/notebook/js/keyboardmanager.js
index fba065336..ccf2198d7 100644
--- a/IPython/html/static/notebook/js/keyboardmanager.js
+++ b/IPython/html/static/notebook/js/keyboardmanager.js
@@ -1,7 +1,12 @@
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-var IPython = (function (IPython) {
+define([
+    'base/js/namespace',
+    'jquery',
+    'base/js/utils',
+    'base/js/keyboard',
+], function(IPython, $, utils, keyboard) {
     "use strict";
 
     var browser = utils.browser[0];
@@ -98,386 +103,386 @@ var IPython = (function (IPython) {
     KeyboardManager.prototype.get_default_edit_shortcuts = function() {
         var that = this;
         return {
-        'esc' : {
-            help    : 'command mode',
-            help_index : 'aa',
-            handler : function (event) {
-                    that.notebook.command_mode();
-                return false;
-            }
-        },
-        'ctrl-m' : {
-            help    : 'command mode',
-            help_index : 'ab',
-            handler : function (event) {
-                    that.notebook.command_mode();
-                return false;
-            }
-        },
-        'up' : {
-            help    : '',
-            help_index : '',
-            handler : function (event) {
-                    var index = that.notebook.get_selected_index();
-                    var cell = that.notebook.get_cell(index);
-                if (cell && cell.at_top() && index !== 0) {
-                    event.preventDefault();
+            'esc' : {
+                help    : 'command mode',
+                help_index : 'aa',
+                handler : function (event) {
                         that.notebook.command_mode();
-                        that.notebook.select_prev();
-                        that.notebook.edit_mode();
-                        var cm = that.notebook.get_selected_cell().code_mirror;
-                    cm.setCursor(cm.lastLine(), 0);
-                    return false;
-                } else if (cell) {
-                    var cm = cell.code_mirror;
-                    cm.execCommand('goLineUp');
                     return false;
                 }
-            }
-        },
-        'down' : {
-            help    : '',
-            help_index : '',
-            handler : function (event) {
-                    var index = that.notebook.get_selected_index();
-                    var cell = that.notebook.get_cell(index);
-                    if (cell.at_bottom() && index !== (that.notebook.ncells()-1)) {
-                    event.preventDefault();
+            },
+            'ctrl-m' : {
+                help    : 'command mode',
+                help_index : 'ab',
+                handler : function (event) {
                         that.notebook.command_mode();
-                        that.notebook.select_next();
-                        that.notebook.edit_mode();
-                        var cm = that.notebook.get_selected_cell().code_mirror;
-                    cm.setCursor(0, 0);
                     return false;
-                } else {
-                    var cm = cell.code_mirror;
-                    cm.execCommand('goLineDown');
+                }
+            },
+            'up' : {
+                help    : '',
+                help_index : '',
+                handler : function (event) {
+                        var index = that.notebook.get_selected_index();
+                        var cell = that.notebook.get_cell(index);
+                    if (cell && cell.at_top() && index !== 0) {
+                        event.preventDefault();
+                            that.notebook.command_mode();
+                            that.notebook.select_prev();
+                            that.notebook.edit_mode();
+                            var cm = that.notebook.get_selected_cell().code_mirror;
+                        cm.setCursor(cm.lastLine(), 0);
+                        return false;
+                    } else if (cell) {
+                        var cm = cell.code_mirror;
+                        cm.execCommand('goLineUp');
+                        return false;
+                    }
+                }
+            },
+            'down' : {
+                help    : '',
+                help_index : '',
+                handler : function (event) {
+                        var index = that.notebook.get_selected_index();
+                        var cell = that.notebook.get_cell(index);
+                        if (cell.at_bottom() && index !== (that.notebook.ncells()-1)) {
+                        event.preventDefault();
+                            that.notebook.command_mode();
+                            that.notebook.select_next();
+                            that.notebook.edit_mode();
+                            var cm = that.notebook.get_selected_cell().code_mirror;
+                        cm.setCursor(0, 0);
+                        return false;
+                    } else {
+                        var cm = cell.code_mirror;
+                        cm.execCommand('goLineDown');
+                        return false;
+                    }
+                }
+            },
+            'ctrl-shift--' : {
+                help    : 'split cell',
+                help_index : 'ea',
+                handler : function (event) {
+                        that.notebook.split_cell();
                     return false;
                 }
-            }
-        },
-        'ctrl-shift--' : {
-            help    : 'split cell',
-            help_index : 'ea',
-            handler : function (event) {
-                    that.notebook.split_cell();
-                return false;
-            }
-        },
-        'ctrl-shift-subtract' : {
-            help    : '',
-            help_index : 'eb',
-            handler : function (event) {
-                    that.notebook.split_cell();
-                return false;
-            }
-        },
-    };
+            },
+            'ctrl-shift-subtract' : {
+                help    : '',
+                help_index : 'eb',
+                handler : function (event) {
+                        that.notebook.split_cell();
+                    return false;
+                }
+            },
+        };
     };
 
     KeyboardManager.prototype.get_default_command_shortcuts = function() {
         var that = this;
         return {
-        'space': {
-            help: "Scroll down to next H1 cell",
-            handler: function(event) {
-                return that.notebook.scrollmanager.scroll(1);
+            'space': {
+                help: "Scroll down to next H1 cell",
+                handler: function(event) {
+                    return that.notebook.scrollmanager.scroll(1);
+                },
             },
-        },
-        'shift-space': {
-            help: "Scroll up to previous H1 cell",
-            handler: function(event) {
-                return that.notebook.scrollmanager.scroll(-1);
+            'shift-space': {
+                help: "Scroll up to previous H1 cell",
+                handler: function(event) {
+                    return that.notebook.scrollmanager.scroll(-1);
+                },
             },
-        },
-        'enter' : {
-            help    : 'edit mode',
-            help_index : 'aa',
-            handler : function (event) {
-                    that.notebook.edit_mode();
-                return false;
-            }
-        },
-        'up' : {
-            help    : 'select previous cell',
-            help_index : 'da',
-            handler : function (event) {
-                    var index = that.notebook.get_selected_index();
-                if (index !== 0 && index !== null) {
-                        that.notebook.select_prev();
-                        that.notebook.focus_cell();
+            'enter' : {
+                help    : 'edit mode',
+                help_index : 'aa',
+                handler : function (event) {
+                        that.notebook.edit_mode();
+                    return false;
                 }
-                return false;
-            }
-        },
-        'down' : {
-            help    : 'select next cell',
-            help_index : 'db',
-            handler : function (event) {
-                    var index = that.notebook.get_selected_index();
-                    if (index !== (that.notebook.ncells()-1) && index !== null) {
-                        that.notebook.select_next();
-                        that.notebook.focus_cell();
+            },
+            'up' : {
+                help    : 'select previous cell',
+                help_index : 'da',
+                handler : function (event) {
+                        var index = that.notebook.get_selected_index();
+                    if (index !== 0 && index !== null) {
+                            that.notebook.select_prev();
+                            that.notebook.focus_cell();
+                    }
+                    return false;
                 }
-                return false;
-            }
-        },
-        'k' : {
-            help    : 'select previous cell',
-            help_index : 'dc',
-            handler : function (event) {
-                    var index = that.notebook.get_selected_index();
-                if (index !== 0 && index !== null) {
+            },
+            'down' : {
+                help    : 'select next cell',
+                help_index : 'db',
+                handler : function (event) {
+                        var index = that.notebook.get_selected_index();
+                        if (index !== (that.notebook.ncells()-1) && index !== null) {
+                            that.notebook.select_next();
+                            that.notebook.focus_cell();
+                    }
+                    return false;
+                }
+            },
+            'k' : {
+                help    : 'select previous cell',
+                help_index : 'dc',
+                handler : function (event) {
+                        var index = that.notebook.get_selected_index();
+                    if (index !== 0 && index !== null) {
+                            that.notebook.select_prev();
+                            that.notebook.focus_cell();
+                    }
+                    return false;
+                }
+            },
+            'j' : {
+                help    : 'select next cell',
+                help_index : 'dd',
+                handler : function (event) {
+                        var index = that.notebook.get_selected_index();
+                        if (index !== (that.notebook.ncells()-1) && index !== null) {
+                            that.notebook.select_next();
+                            that.notebook.focus_cell();
+                    }
+                    return false;
+                }
+            },
+            'x' : {
+                help    : 'cut cell',
+                help_index : 'ee',
+                handler : function (event) {
+                        that.notebook.cut_cell();
+                    return false;
+                }
+            },
+            'c' : {
+                help    : 'copy cell',
+                help_index : 'ef',
+                handler : function (event) {
+                        that.notebook.copy_cell();
+                    return false;
+                }
+            },
+            'shift-v' : {
+                help    : 'paste cell above',
+                help_index : 'eg',
+                handler : function (event) {
+                        that.notebook.paste_cell_above();
+                    return false;
+                }
+            },
+            'v' : {
+                help    : 'paste cell below',
+                help_index : 'eh',
+                handler : function (event) {
+                        that.notebook.paste_cell_below();
+                    return false;
+                }
+            },
+            'd' : {
+                help    : 'delete cell (press twice)',
+                help_index : 'ej',
+                count: 2,
+                handler : function (event) {
+                        that.notebook.delete_cell();
+                    return false;
+                }
+            },
+            'a' : {
+                help    : 'insert cell above',
+                help_index : 'ec',
+                handler : function (event) {
+                        that.notebook.insert_cell_above();
                         that.notebook.select_prev();
                         that.notebook.focus_cell();
+                    return false;
                 }
-                return false;
-            }
-        },
-        'j' : {
-            help    : 'select next cell',
-            help_index : 'dd',
-            handler : function (event) {
-                    var index = that.notebook.get_selected_index();
-                    if (index !== (that.notebook.ncells()-1) && index !== null) {
+            },
+            'b' : {
+                help    : 'insert cell below',
+                help_index : 'ed',
+                handler : function (event) {
+                        that.notebook.insert_cell_below();
                         that.notebook.select_next();
                         that.notebook.focus_cell();
+                    return false;
                 }
-                return false;
-            }
-        },
-        'x' : {
-            help    : 'cut cell',
-            help_index : 'ee',
-            handler : function (event) {
-                    that.notebook.cut_cell();
-                return false;
-            }
-        },
-        'c' : {
-            help    : 'copy cell',
-            help_index : 'ef',
-            handler : function (event) {
-                    that.notebook.copy_cell();
-                return false;
-            }
-        },
-        'shift-v' : {
-            help    : 'paste cell above',
-            help_index : 'eg',
-            handler : function (event) {
-                    that.notebook.paste_cell_above();
-                return false;
-            }
-        },
-        'v' : {
-            help    : 'paste cell below',
-            help_index : 'eh',
-            handler : function (event) {
-                    that.notebook.paste_cell_below();
-                return false;
-            }
-        },
-        'd' : {
-            help    : 'delete cell (press twice)',
-            help_index : 'ej',
-            count: 2,
-            handler : function (event) {
-                    that.notebook.delete_cell();
-                return false;
-            }
-        },
-        'a' : {
-            help    : 'insert cell above',
-            help_index : 'ec',
-            handler : function (event) {
-                    that.notebook.insert_cell_above();
-                    that.notebook.select_prev();
-                    that.notebook.focus_cell();
-                return false;
-            }
-        },
-        'b' : {
-            help    : 'insert cell below',
-            help_index : 'ed',
-            handler : function (event) {
-                    that.notebook.insert_cell_below();
-                    that.notebook.select_next();
-                    that.notebook.focus_cell();
-                return false;
-            }
-        },
-        'y' : {
-            help    : 'to code',
-            help_index : 'ca',
-            handler : function (event) {
-                    that.notebook.to_code();
-                return false;
-            }
-        },
-        'm' : {
-            help    : 'to markdown',
-            help_index : 'cb',
-            handler : function (event) {
-                    that.notebook.to_markdown();
-                return false;
-            }
-        },
-        'r' : {
-            help    : 'to raw',
-            help_index : 'cc',
-            handler : function (event) {
-                    that.notebook.to_raw();
-                return false;
-            }
-        },
-        '1' : {
-            help    : 'to heading 1',
-            help_index : 'cd',
-            handler : function (event) {
-                    that.notebook.to_heading(undefined, 1);
-                return false;
-            }
-        },
-        '2' : {
-            help    : 'to heading 2',
-            help_index : 'ce',
-            handler : function (event) {
-                    that.notebook.to_heading(undefined, 2);
-                return false;
-            }
-        },
-        '3' : {
-            help    : 'to heading 3',
-            help_index : 'cf',
-            handler : function (event) {
-                    that.notebook.to_heading(undefined, 3);
-                return false;
-            }
-        },
-        '4' : {
-            help    : 'to heading 4',
-            help_index : 'cg',
-            handler : function (event) {
-                    that.notebook.to_heading(undefined, 4);
-                return false;
-            }
-        },
-        '5' : {
-            help    : 'to heading 5',
-            help_index : 'ch',
-            handler : function (event) {
-                    that.notebook.to_heading(undefined, 5);
-                return false;
-            }
-        },
-        '6' : {
-            help    : 'to heading 6',
-            help_index : 'ci',
-            handler : function (event) {
-                    that.notebook.to_heading(undefined, 6);
-                return false;
-            }
-        },
-        'o' : {
-            help    : 'toggle output',
-            help_index : 'gb',
-            handler : function (event) {
-                    that.notebook.toggle_output();
-                return false;
-            }
-        },
-        'shift-o' : {
-            help    : 'toggle output scrolling',
-            help_index : 'gc',
-            handler : function (event) {
-                    that.notebook.toggle_output_scroll();
-                return false;
-            }
-        },
-        's' : {
-            help    : 'save notebook',
-            help_index : 'fa',
-            handler : function (event) {
-                    that.notebook.save_checkpoint();
-                return false;
-            }
-        },
-        'ctrl-j' : {
-            help    : 'move cell down',
-            help_index : 'eb',
-            handler : function (event) {
-                    that.notebook.move_cell_down();
-                return false;
-            }
-        },
-        'ctrl-k' : {
-            help    : 'move cell up',
-            help_index : 'ea',
-            handler : function (event) {
-                    that.notebook.move_cell_up();
-                return false;
-            }
-        },
-        'l' : {
-            help    : 'toggle line numbers',
-            help_index : 'ga',
-            handler : function (event) {
-                    that.notebook.cell_toggle_line_numbers();
-                return false;
-            }
-        },
-        'i' : {
-            help    : 'interrupt kernel (press twice)',
-            help_index : 'ha',
-            count: 2,
-            handler : function (event) {
-                    that.notebook.kernel.interrupt();
-                return false;
-            }
-        },
-        '0' : {
-            help    : 'restart kernel (press twice)',
-            help_index : 'hb',
-            count: 2,
-            handler : function (event) {
-                    that.notebook.restart_kernel();
-                return false;
-            }
-        },
-        'h' : {
-            help    : 'keyboard shortcuts',
-            help_index : 'ge',
-            handler : function (event) {
-                    that.quick_help.show_keyboard_shortcuts();
-                return false;
-            }
-        },
-        'z' : {
-            help    : 'undo last delete',
-            help_index : 'ei',
-            handler : function (event) {
-                    that.notebook.undelete_cell();
-                return false;
-            }
-        },
-        'shift-m' : {
-            help    : 'merge cell below',
-            help_index : 'ek',
-            handler : function (event) {
-                    that.notebook.merge_cell_below();
-                return false;
-            }
-        },
-        'q' : {
-            help    : 'close pager',
-            help_index : 'gd',
-            handler : function (event) {
-                    that.pager.collapse();
-                return false;
-            }
-        },
-    };
+            },
+            'y' : {
+                help    : 'to code',
+                help_index : 'ca',
+                handler : function (event) {
+                        that.notebook.to_code();
+                    return false;
+                }
+            },
+            'm' : {
+                help    : 'to markdown',
+                help_index : 'cb',
+                handler : function (event) {
+                        that.notebook.to_markdown();
+                    return false;
+                }
+            },
+            'r' : {
+                help    : 'to raw',
+                help_index : 'cc',
+                handler : function (event) {
+                        that.notebook.to_raw();
+                    return false;
+                }
+            },
+            '1' : {
+                help    : 'to heading 1',
+                help_index : 'cd',
+                handler : function (event) {
+                        that.notebook.to_heading(undefined, 1);
+                    return false;
+                }
+            },
+            '2' : {
+                help    : 'to heading 2',
+                help_index : 'ce',
+                handler : function (event) {
+                        that.notebook.to_heading(undefined, 2);
+                    return false;
+                }
+            },
+            '3' : {
+                help    : 'to heading 3',
+                help_index : 'cf',
+                handler : function (event) {
+                        that.notebook.to_heading(undefined, 3);
+                    return false;
+                }
+            },
+            '4' : {
+                help    : 'to heading 4',
+                help_index : 'cg',
+                handler : function (event) {
+                        that.notebook.to_heading(undefined, 4);
+                    return false;
+                }
+            },
+            '5' : {
+                help    : 'to heading 5',
+                help_index : 'ch',
+                handler : function (event) {
+                        that.notebook.to_heading(undefined, 5);
+                    return false;
+                }
+            },
+            '6' : {
+                help    : 'to heading 6',
+                help_index : 'ci',
+                handler : function (event) {
+                        that.notebook.to_heading(undefined, 6);
+                    return false;
+                }
+            },
+            'o' : {
+                help    : 'toggle output',
+                help_index : 'gb',
+                handler : function (event) {
+                        that.notebook.toggle_output();
+                    return false;
+                }
+            },
+            'shift-o' : {
+                help    : 'toggle output scrolling',
+                help_index : 'gc',
+                handler : function (event) {
+                        that.notebook.toggle_output_scroll();
+                    return false;
+                }
+            },
+            's' : {
+                help    : 'save notebook',
+                help_index : 'fa',
+                handler : function (event) {
+                        that.notebook.save_checkpoint();
+                    return false;
+                }
+            },
+            'ctrl-j' : {
+                help    : 'move cell down',
+                help_index : 'eb',
+                handler : function (event) {
+                        that.notebook.move_cell_down();
+                    return false;
+                }
+            },
+            'ctrl-k' : {
+                help    : 'move cell up',
+                help_index : 'ea',
+                handler : function (event) {
+                        that.notebook.move_cell_up();
+                    return false;
+                }
+            },
+            'l' : {
+                help    : 'toggle line numbers',
+                help_index : 'ga',
+                handler : function (event) {
+                        that.notebook.cell_toggle_line_numbers();
+                    return false;
+                }
+            },
+            'i' : {
+                help    : 'interrupt kernel (press twice)',
+                help_index : 'ha',
+                count: 2,
+                handler : function (event) {
+                        that.notebook.kernel.interrupt();
+                    return false;
+                }
+            },
+            '0' : {
+                help    : 'restart kernel (press twice)',
+                help_index : 'hb',
+                count: 2,
+                handler : function (event) {
+                        that.notebook.restart_kernel();
+                    return false;
+                }
+            },
+            'h' : {
+                help    : 'keyboard shortcuts',
+                help_index : 'ge',
+                handler : function (event) {
+                        that.quick_help.show_keyboard_shortcuts();
+                    return false;
+                }
+            },
+            'z' : {
+                help    : 'undo last delete',
+                help_index : 'ei',
+                handler : function (event) {
+                        that.notebook.undelete_cell();
+                    return false;
+                }
+            },
+            'shift-m' : {
+                help    : 'merge cell below',
+                help_index : 'ek',
+                handler : function (event) {
+                        that.notebook.merge_cell_below();
+                    return false;
+                }
+            },
+            'q' : {
+                help    : 'close pager',
+                help_index : 'gd',
+                handler : function (event) {
+                        that.pager.collapse();
+                    return false;
+                }
+            },
+        };
     };
 
     KeyboardManager.prototype.bind_events = function () {
diff --git a/IPython/html/static/notebook/js/main.js b/IPython/html/static/notebook/js/main.js
index acfa4d531..4ddee4b8e 100644
--- a/IPython/html/static/notebook/js/main.js
+++ b/IPython/html/static/notebook/js/main.js
@@ -19,7 +19,6 @@ require([
     'notebook/js/keyboardmanager',
     'notebook/js/config',
     'notebook/js/kernelselector',
-    'notebook/js/scrollmanager'
     // only loaded, not used:
     'custom/custom',
 ], function(
@@ -39,8 +38,7 @@ require([
     savewidget, 
     keyboardmanager,
     config,
-    kernelselector,
-    scrollmanager
+    kernelselector
     ) {
     "use strict";
 
@@ -69,7 +67,6 @@ require([
         save_widget: save_widget,
         config: user_config},
         common_options));
-    var scrollmanager = new scrollmanager.ScrollManager(notebook);
     var login_widget = new loginwidget.LoginWidget('span#login_widget', common_options);
     var toolbar = new maintoolbar.MainToolBar('#maintoolbar-container', {
         notebook: notebook, 
@@ -135,7 +132,6 @@ require([
     IPython.save_widget = save_widget;
     IPython.config = user_config;
     IPython.tooltip = notebook.tooltip;
-    IPython.scrollmanager = scrollmanager;
 
     events.trigger('app_initialized.NotebookApp');
     notebook.load_notebook(common_options.notebook_name, common_options.notebook_path);
diff --git a/IPython/html/static/notebook/js/maintoolbar.js b/IPython/html/static/notebook/js/maintoolbar.js
index 593704a60..54d8e3105 100644
--- a/IPython/html/static/notebook/js/maintoolbar.js
+++ b/IPython/html/static/notebook/js/maintoolbar.js
@@ -6,7 +6,8 @@ define([
     'jquery',
     'notebook/js/toolbar',
     'notebook/js/celltoolbar',
-], function(IPython, $, toolbar, celltoolbar) {
+    'notebook/js/scrollmanager'
+], function(IPython, $, toolbar, celltoolbar, scrollmanager) {
     "use strict";
 
     var MainToolBar = function (selector, options) {
@@ -24,6 +25,7 @@ define([
         this.construct();
         this.add_celltype_list();
         this.add_celltoolbar_list();
+        this.add_scrollmanager_list();
         this.bind_events();
     };
 
@@ -187,6 +189,11 @@ define([
     };
 
 
+    MainToolBar.prototype.add_scrollmanager_list = function () {
+        this._scrollselector = new scrollmanager.ScrollSelector(this.element, this.notebook);
+    };
+
+
     MainToolBar.prototype.bind_events = function () {
         var that = this;
         
diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index 98d6e9a88..776f8914e 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -18,6 +18,7 @@ define([
     'notebook/js/celltoolbarpresets/default',
     'notebook/js/celltoolbarpresets/rawcell',
     'notebook/js/celltoolbarpresets/slideshow',
+    'notebook/js/scrollmanager'
 ], function (
     IPython, 
     $, 
@@ -34,7 +35,8 @@ define([
     tooltip,
     default_celltoolbar,
     rawcell_celltoolbar,
-    slideshow_celltoolbar
+    slideshow_celltoolbar,
+    scrollmanager
     ) {
 
     var Notebook = function (selector, options) {
@@ -64,6 +66,9 @@ define([
         this.ws_url = options.ws_url;
         this._session_starting = false;
         this.default_cell_type = this.config.default_cell_type || 'code';
+
+        //  Create and register scroll managers.
+        this.scrollmanager = new scrollmanager.ScrollManager(this);
         // default_kernel_name is a temporary measure while we implement proper
         // kernel selection and delayed start. Do not rely on it.
         this.default_kernel_name = 'python';
@@ -135,7 +140,7 @@ define([
         rawcell_celltoolbar.register(this);
         slideshow_celltoolbar.register(this);
     };
-    
+
     Notebook.options_default = {
         // can be any cell type, or the special values of
         // 'above', 'below', or 'selected' to get the value from another cell.
diff --git a/IPython/html/static/notebook/js/scrollmanager.js b/IPython/html/static/notebook/js/scrollmanager.js
index cbc7d4b8e..2b8242698 100644
--- a/IPython/html/static/notebook/js/scrollmanager.js
+++ b/IPython/html/static/notebook/js/scrollmanager.js
@@ -1,9 +1,51 @@
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
-define([], function(){
+define(['jquery'], function($){
     "use strict";
 
-    var ScrollManager = function (notebook) {
+    var ScrollSelector = function(element, notebook) {
+        // Public constructor.
+        this.notebook = notebook;
+        $('<span />')
+            .addClass('nabar-text')
+            .text('Scrolling Mode:')
+            .appendTo(element);
+        this._combo = $('<select />')
+            .addClass('form-control select-xs')
+            .appendTo(element);
+
+        // Redirect class level manager registration to this instance.
+        this._registered = {};
+        ScrollSelector.register = $.proxy(this.register, this);
+
+        // Register cached managers.
+        for (var i =0; i < ScrollSelector.registered.length; i++) {
+            this.register.apply(this, ScrollSelector.registered[i]);
+        }
+
+        // Listen for scroll manager change, apply it to the notebook.
+        var that = this;
+        this._combo.change(function(){
+            var manager = that._registered[$(this).find("option:selected").val()];
+            that.notebook.ScrollSelector = manager;
+        });
+    };
+
+    // Cache scroll managers registered before the construction of a scroll 
+    // manager.
+    ScrollSelector.registered = [];
+    ScrollSelector.register = function(name, manager) {
+        ScrollSelector.registered.push(arguments);
+    };
+    ScrollSelector.prototype.register = function(name, manager) {
+        this._registered[name] = manager;
+        this._combo.append($('<option />')
+            .val(name)
+            .text(name));
+    };
+
+
+    var ScrollManager = function(notebook) {
         // Public constructor.
         this.notebook = notebook;
         this.animation_speed = 250; //ms
@@ -16,6 +58,62 @@ define([], function(){
         // ----------
         // delta: integer
         //  direction to scroll the document.  Positive is downwards.
+        this.scroll_some(delta);
+        return false;
+    };
+
+    ScrollManager.prototype.scroll_to = function(destination) {
+        // Scroll to an element in the notebook.
+        $('#notebook').animate({'scrollTop': $(destination).offset().top + $('#notebook').scrollTop() - $('#notebook').offset().top}, this.animation_speed);
+    };
+
+    ScrollManager.prototype.scroll_some = function(pages) {
+        // Scroll up or down a given number of pages.
+        $('#notebook').animate({'scrollTop': $('#notebook').scrollTop() + pages * $('#notebook').height()}, this.animation_speed);
+    };
+
+    ScrollManager.prototype.get_first_visible_cell = function() {
+        // Gets the index of the first visible cell in the document.
+
+        // First, attempt to be smart by guessing the index of the cell we are
+        // scrolled to.  Then, walk from there up or down until the right cell 
+        // is found.  To guess the index, get the top of the last cell, and
+        // divide that by the number of cells to get an average cell height.  
+        // Then divide the scroll height by the average cell height.
+        var cell_count = that.notebook.ncells();
+        var first_cell_top = that.notebook.get_cell(0).element.offset.top();
+        var last_cell_top = that.notebook.get_cell(cell_count-1).element.offset.top();
+        var avg_cell_height = (last_cell_top - first_cell_top) / cell_count;
+        var $notebook = $('#notebook').scrollTop();
+        var i = Math.ceil($notebook.scrollTop() / avg_cell_height);
+        i = min(max(i , 0), cell_count - 1);
+
+        while (that.notebook.get_cell(i).element.offset.top() - first_cell_top < $notebook.scrollTop() && i < cell_count - 1) {
+            i += 1;
+        } 
+
+        while (that.notebook.get_cell(i).element.offset.top() - first_cell_top > $notebook.scrollTop() && i >= 0) {
+            i -= 1;
+        } 
+        return min(i + 1, cell_count - 1);
+    };
+
+
+    var HeadingScrollManager = function(notebook, heading_level) {
+        // Public constructor.
+    };
+
+
+    var SlideScrollManager = function(notebook) {
+        // Public constructor.
+    };
+
+/*// Scroll the document.
+        //
+        // Parameters
+        // ----------
+        // delta: integer
+        //  direction to scroll the document.  Positive is downwards.
 
         // If one or more slides exist, scroll to the slide.
         var $slide_cells = $('.slideshow-slide');
@@ -66,19 +164,13 @@ define([], function(){
         } else {
             this.scroll_some(delta);
             return false;
-        }
-    };
-
-    ScrollManager.prototype.scroll_to = function(destination) {
-        // Scroll to an element in the notebook.
-        $('#notebook').animate({'scrollTop': $(destination).offset().top + $('#notebook').scrollTop() - $('#notebook').offset().top}, this.animation_speed);
-    };
-
-    ScrollManager.prototype.scroll_some = function(pages) {
-        // Scroll up or down a given number of pages.
-        $('#notebook').animate({'scrollTop': $('#notebook').scrollTop() + pages * $('#notebook').height()}, this.animation_speed);
-    };
+        }*/
 
     // Return naemspace for require.js loads
-    return ScrollManager;
+    return {
+        'ScrollSelector': ScrollSelector,
+        'ScrollManager': ScrollManager,
+        'SlideScrollManager': SlideScrollManager,
+        'HeadingScrollManager': HeadingScrollManager
+    };
 });

From 8617696c5b18f909bcf7f4479dccfb583d8a6adf Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Fri, 25 Jul 2014 19:24:31 -0700
Subject: [PATCH 07/17] Added heading and slideshow scroll managers

---
 .../js/celltoolbarpresets/slideshow.js        |  28 +---
 IPython/html/static/notebook/js/notebook.js   |   2 +-
 .../html/static/notebook/js/scrollmanager.js  | 123 +++++++++---------
 3 files changed, 67 insertions(+), 86 deletions(-)

diff --git a/IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js b/IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js
index 1baffcb9a..6b2b35e87 100644
--- a/IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js
+++ b/IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js
@@ -11,24 +11,6 @@ define([
     var CellToolbar = celltoolbar.CellToolbar;
     var slideshow_preset = [];
 
-    var _update_cell = function(cell, old_slide_class) {
-        // Remove the old slide DOM class if set.
-        if (old_slide_class && old_slide_class != '-') {
-            cell.element.removeClass('slideshow-'+old_slide_class);
-        }
-        // add a DOM class to the cell
-        var value = _get_cell_type(cell);
-        if (value != '-') { cell.element.addClass('slideshow-'+value); }
-    };
-
-    var _get_cell_type = function(cell) {
-        var ns = cell.metadata.slideshow;
-        // if the slideshow namespace does not exist return `undefined`
-        // (will be interpreted as `false` by checkbox) otherwise
-        // return the value
-        return (ns === undefined)? undefined: ns.slide_type;
-    };
-
     var select_type = CellToolbar.utils.select_ui_generator([
             ["-"            ,"-"            ],
             ["Slide"        ,"slide"        ],
@@ -42,13 +24,15 @@ define([
                 // we check that the slideshow namespace exist and create it if needed
                 if (cell.metadata.slideshow === undefined){cell.metadata.slideshow = {};}
                 // set the value
-                var old = cell.metadata.slideshow.slide_type;
                 cell.metadata.slideshow.slide_type = value;
-                // update the slideshow class set on the cell 
-                _update_cell(cell, old);
                 },
             //geter
-            _get_cell_type,
+            function(cell){ var ns = cell.metadata.slideshow;
+                // if the slideshow namespace does not exist return `undefined`
+                // (will be interpreted as `false` by checkbox) otherwise
+                // return the value
+                return (ns === undefined)? undefined: ns.slide_type;
+                },
             "Slide Type");
 
     var register = function (notebook) {
diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index 776f8914e..fe88317d5 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -1625,7 +1625,7 @@ define([
         this._session_starting = false;
         utils.log_ajax_error(jqxhr, status, error);
     };
-
+    
     /**
      * Prompt the user to restart the IPython kernel.
      * 
diff --git a/IPython/html/static/notebook/js/scrollmanager.js b/IPython/html/static/notebook/js/scrollmanager.js
index 2b8242698..a4a2b1bce 100644
--- a/IPython/html/static/notebook/js/scrollmanager.js
+++ b/IPython/html/static/notebook/js/scrollmanager.js
@@ -27,7 +27,7 @@ define(['jquery'], function($){
         var that = this;
         this._combo.change(function(){
             var manager = that._registered[$(this).find("option:selected").val()];
-            that.notebook.ScrollSelector = manager;
+            that.notebook.scrollmanager = manager;
         });
     };
 
@@ -80,97 +80,94 @@ define(['jquery'], function($){
         // is found.  To guess the index, get the top of the last cell, and
         // divide that by the number of cells to get an average cell height.  
         // Then divide the scroll height by the average cell height.
-        var cell_count = that.notebook.ncells();
-        var first_cell_top = that.notebook.get_cell(0).element.offset.top();
-        var last_cell_top = that.notebook.get_cell(cell_count-1).element.offset.top();
+        var cell_count = this.notebook.ncells();
+        var first_cell_top = this.notebook.get_cell(0).element.offset().top;
+        var last_cell_top = this.notebook.get_cell(cell_count-1).element.offset().top;
         var avg_cell_height = (last_cell_top - first_cell_top) / cell_count;
-        var $notebook = $('#notebook').scrollTop();
-        var i = Math.ceil($notebook.scrollTop() / avg_cell_height);
-        i = min(max(i , 0), cell_count - 1);
+        var notebook = $('#notebook');
+        var i = Math.ceil(notebook.scrollTop() / avg_cell_height);
+        i = Math.min(Math.max(i , 0), cell_count - 1);
 
-        while (that.notebook.get_cell(i).element.offset.top() - first_cell_top < $notebook.scrollTop() && i < cell_count - 1) {
+        while (this.notebook.get_cell(i).element.offset().top - first_cell_top < notebook.scrollTop() && i < cell_count - 1) {
             i += 1;
         } 
 
-        while (that.notebook.get_cell(i).element.offset.top() - first_cell_top > $notebook.scrollTop() && i >= 0) {
+        while (this.notebook.get_cell(i).element.offset().top - first_cell_top > notebook.scrollTop() - 50 && i >= 0) {
             i -= 1;
         } 
-        return min(i + 1, cell_count - 1);
+        return Math.min(i + 1, cell_count - 1);
     };
 
 
-    var HeadingScrollManager = function(notebook, heading_level) {
+    var TargetScrollManager = function(notebook) {
         // Public constructor.
+        ScrollManager.apply(this, [notebook]);
     };
+    TargetScrollManager.prototype = new ScrollManager();
 
-
-    var SlideScrollManager = function(notebook) {
-        // Public constructor.
+    TargetScrollManager.prototype.is_target = function (index) {
+        return false;
     };
 
-/*// Scroll the document.
+    TargetScrollManager.prototype.scroll = function (delta) {
+        // Scroll the document.
         //
         // Parameters
         // ----------
         // delta: integer
         //  direction to scroll the document.  Positive is downwards.
 
-        // If one or more slides exist, scroll to the slide.
-        var $slide_cells = $('.slideshow-slide');
-        if ($slide_cells.length > 0) {
-            var i, cell;
-
-            // Get the active slide cell index.
-            var selected_index = this.notebook.find_cell_index(this.notebook.get_selected_cell());
-            var active_slide = -1;
-            var cells = this.notebook.get_cells();
-            for (i = selected_index; i >= 0; i--) {
-                cell = cells[i];
-                var ns = cell.metadata.slideshow;
-                if (ns && ns.slide_type == 'slide') {
-                    active_slide = i;
-                    break;
-                }
-            }
-            
-            // Translate cell index into slide cell index.
-            if (active_slide != -1) {
-                for (i = 0; i < $slide_cells.length; i++) {
-                    if (cells[active_slide].element[0] == $slide_cells[i]) {
-                        active_slide = i;
-                        break;
-                    }
-                } 
-            }
-        
-            // Scroll.
-            if (active_slide != -1 || delta > 0) {
-                active_slide += delta;
-                active_slide = Math.max(0, Math.min($slide_cells.length-1, active_slide));
-                
-                var cell_element = $slide_cells[active_slide];
-                cell = $(cell_element).data('cell');
-                this.notebook.select(this.notebook.find_cell_index(cell));
-                
-                this.scroll_to(cell_element);
-                //cell_element.scrollIntoView(true);
-            }
+        // Try to scroll to the next slide.
+        var cell_count = this.notebook.ncells();
+        var selected_index = this.get_first_visible_cell() + delta;
+        while (0 <= selected_index && selected_index < cell_count && !this.is_target(selected_index)) {
+            selected_index += delta;
+        }
 
-            // Cancel browser keyboard scroll.
-            return false;
-        
-        // No slides exist, scroll up or down one page height.  Instead of using
-        // the browser's built in method to do this, animate it using jQuery.
+        if (selected_index < 0 || cell_count <= selected_index) {
+            return ScrollManager.prototype.scroll.apply(this, [delta]);
         } else {
-            this.scroll_some(delta);
+            this.scroll_to(this.notebook.get_cell(selected_index).element);
+            
+            // Cancel browser keyboard scroll.
             return false;
-        }*/
+        }
+    };
+
+
+    var SlideScrollManager = function(notebook) {
+        // Public constructor.
+        TargetScrollManager.apply(this, [notebook]);
+    };
+    SlideScrollManager.prototype = new TargetScrollManager();
+
+    SlideScrollManager.prototype.is_target = function (index) {
+        var cell = this.notebook.get_cell(index);
+        return cell.metadata && cell.metadata.slideshow && 
+            cell.metadata.slideshow.slide_type && 
+            cell.metadata.slideshow.slide_type === "slide";
+    };
+
+
+    var HeadingScrollManager = function(notebook, heading_level) {
+        // Public constructor.
+        TargetScrollManager.apply(this, [notebook]);
+        this._level = heading_level;
+    };
+    HeadingScrollManager.prototype = new TargetScrollManager();
+
+    HeadingScrollManager.prototype.is_target = function (index) {
+        var cell = this.notebook.get_cell(index);
+        return cell.cell_type === "heading" && cell.level == this._level;
+    };
+
 
     // Return naemspace for require.js loads
     return {
         'ScrollSelector': ScrollSelector,
         'ScrollManager': ScrollManager,
         'SlideScrollManager': SlideScrollManager,
-        'HeadingScrollManager': HeadingScrollManager
+        'HeadingScrollManager': HeadingScrollManager,
+        'TargetScrollManager': TargetScrollManager
     };
 });

From e843a3d0e4fb1e5b995d5ee1badef58c5b47b2a8 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Fri, 25 Jul 2014 19:28:43 -0700
Subject: [PATCH 08/17] Fixed rebase indents

---
 .../static/notebook/js/keyboardmanager.js     | 230 +++++++++---------
 .../html/static/notebook/js/maintoolbar.js    |   3 -
 2 files changed, 115 insertions(+), 118 deletions(-)

diff --git a/IPython/html/static/notebook/js/keyboardmanager.js b/IPython/html/static/notebook/js/keyboardmanager.js
index ccf2198d7..de21797e8 100644
--- a/IPython/html/static/notebook/js/keyboardmanager.js
+++ b/IPython/html/static/notebook/js/keyboardmanager.js
@@ -8,7 +8,7 @@ define([
     'base/js/keyboard',
 ], function(IPython, $, utils, keyboard) {
     "use strict";
-
+    
     var browser = utils.browser[0];
     var platform = utils.platform;
 
@@ -40,63 +40,63 @@ define([
     KeyboardManager.prototype.get_default_common_shortcuts = function() {
         var that = this;
         var shortcuts = {
-        'shift' : {
-            help    : '',
-            help_index : '',
-            handler : function (event) {
-                // ignore shift keydown
-                return true;
-            }
-        },
-        'shift-enter' : {
-            help    : 'run cell, select below',
-            help_index : 'ba',
-            handler : function (event) {
+            'shift' : {
+                help    : '',
+                help_index : '',
+                handler : function (event) {
+                    // ignore shift keydown
+                    return true;
+                }
+            },
+            'shift-enter' : {
+                help    : 'run cell, select below',
+                help_index : 'ba',
+                handler : function (event) {
                     that.notebook.execute_cell_and_select_below();
-                return false;
-            }
-        },
-        'ctrl-enter' : {
-            help    : 'run cell',
-            help_index : 'bb',
-            handler : function (event) {
+                    return false;
+                }
+            },
+            'ctrl-enter' : {
+                help    : 'run cell',
+                help_index : 'bb',
+                handler : function (event) {
                     that.notebook.execute_cell();
-                return false;
-            }
-        },
-        'alt-enter' : {
-            help    : 'run cell, insert below',
-            help_index : 'bc',
-            handler : function (event) {
+                    return false;
+                }
+            },
+            'alt-enter' : {
+                help    : 'run cell, insert below',
+                help_index : 'bc',
+                handler : function (event) {
                     that.notebook.execute_cell_and_insert_below();
-                return false;
+                    return false;
+                }
             }
-        }
-    };
+        };
 
-    if (platform === 'MacOS') {
+        if (platform === 'MacOS') {
             shortcuts['cmd-s'] =
-            {
-                help    : 'save notebook',
-                help_index : 'fb',
-                handler : function (event) {
+                {
+                    help    : 'save notebook',
+                    help_index : 'fb',
+                    handler : function (event) {
                         that.notebook.save_checkpoint();
-                    event.preventDefault();
-                    return false;
-                }
-            };
-    } else {
+                        event.preventDefault();
+                        return false;
+                    }
+                };
+        } else {
             shortcuts['ctrl-s'] =
-            {
-                help    : 'save notebook',
-                help_index : 'fb',
-                handler : function (event) {
+                {
+                    help    : 'save notebook',
+                    help_index : 'fb',
+                    handler : function (event) {
                         that.notebook.save_checkpoint();
-                    event.preventDefault();
-                    return false;
-                }
-            };
-    }
+                        event.preventDefault();
+                        return false;
+                    }
+                };
+        }
         return shortcuts;
     };
 
@@ -107,7 +107,7 @@ define([
                 help    : 'command mode',
                 help_index : 'aa',
                 handler : function (event) {
-                        that.notebook.command_mode();
+                    that.notebook.command_mode();
                     return false;
                 }
             },
@@ -115,7 +115,7 @@ define([
                 help    : 'command mode',
                 help_index : 'ab',
                 handler : function (event) {
-                        that.notebook.command_mode();
+                    that.notebook.command_mode();
                     return false;
                 }
             },
@@ -123,14 +123,14 @@ define([
                 help    : '',
                 help_index : '',
                 handler : function (event) {
-                        var index = that.notebook.get_selected_index();
-                        var cell = that.notebook.get_cell(index);
+                    var index = that.notebook.get_selected_index();
+                    var cell = that.notebook.get_cell(index);
                     if (cell && cell.at_top() && index !== 0) {
                         event.preventDefault();
-                            that.notebook.command_mode();
-                            that.notebook.select_prev();
-                            that.notebook.edit_mode();
-                            var cm = that.notebook.get_selected_cell().code_mirror;
+                        that.notebook.command_mode();
+                        that.notebook.select_prev();
+                        that.notebook.edit_mode();
+                        var cm = that.notebook.get_selected_cell().code_mirror;
                         cm.setCursor(cm.lastLine(), 0);
                         return false;
                     } else if (cell) {
@@ -144,14 +144,14 @@ define([
                 help    : '',
                 help_index : '',
                 handler : function (event) {
-                        var index = that.notebook.get_selected_index();
-                        var cell = that.notebook.get_cell(index);
-                        if (cell.at_bottom() && index !== (that.notebook.ncells()-1)) {
+                    var index = that.notebook.get_selected_index();
+                    var cell = that.notebook.get_cell(index);
+                    if (cell.at_bottom() && index !== (that.notebook.ncells()-1)) {
                         event.preventDefault();
-                            that.notebook.command_mode();
-                            that.notebook.select_next();
-                            that.notebook.edit_mode();
-                            var cm = that.notebook.get_selected_cell().code_mirror;
+                        that.notebook.command_mode();
+                        that.notebook.select_next();
+                        that.notebook.edit_mode();
+                        var cm = that.notebook.get_selected_cell().code_mirror;
                         cm.setCursor(0, 0);
                         return false;
                     } else {
@@ -165,7 +165,7 @@ define([
                 help    : 'split cell',
                 help_index : 'ea',
                 handler : function (event) {
-                        that.notebook.split_cell();
+                    that.notebook.split_cell();
                     return false;
                 }
             },
@@ -173,7 +173,7 @@ define([
                 help    : '',
                 help_index : 'eb',
                 handler : function (event) {
-                        that.notebook.split_cell();
+                    that.notebook.split_cell();
                     return false;
                 }
             },
@@ -184,13 +184,13 @@ define([
         var that = this;
         return {
             'space': {
-                help: "Scroll down to next H1 cell",
+                help: "Scroll down",
                 handler: function(event) {
                     return that.notebook.scrollmanager.scroll(1);
                 },
             },
             'shift-space': {
-                help: "Scroll up to previous H1 cell",
+                help: "Scroll up",
                 handler: function(event) {
                     return that.notebook.scrollmanager.scroll(-1);
                 },
@@ -199,7 +199,7 @@ define([
                 help    : 'edit mode',
                 help_index : 'aa',
                 handler : function (event) {
-                        that.notebook.edit_mode();
+                    that.notebook.edit_mode();
                     return false;
                 }
             },
@@ -207,10 +207,10 @@ define([
                 help    : 'select previous cell',
                 help_index : 'da',
                 handler : function (event) {
-                        var index = that.notebook.get_selected_index();
+                    var index = that.notebook.get_selected_index();
                     if (index !== 0 && index !== null) {
-                            that.notebook.select_prev();
-                            that.notebook.focus_cell();
+                        that.notebook.select_prev();
+                        that.notebook.focus_cell();
                     }
                     return false;
                 }
@@ -219,10 +219,10 @@ define([
                 help    : 'select next cell',
                 help_index : 'db',
                 handler : function (event) {
-                        var index = that.notebook.get_selected_index();
-                        if (index !== (that.notebook.ncells()-1) && index !== null) {
-                            that.notebook.select_next();
-                            that.notebook.focus_cell();
+                    var index = that.notebook.get_selected_index();
+                    if (index !== (that.notebook.ncells()-1) && index !== null) {
+                        that.notebook.select_next();
+                        that.notebook.focus_cell();
                     }
                     return false;
                 }
@@ -231,10 +231,10 @@ define([
                 help    : 'select previous cell',
                 help_index : 'dc',
                 handler : function (event) {
-                        var index = that.notebook.get_selected_index();
+                    var index = that.notebook.get_selected_index();
                     if (index !== 0 && index !== null) {
-                            that.notebook.select_prev();
-                            that.notebook.focus_cell();
+                        that.notebook.select_prev();
+                        that.notebook.focus_cell();
                     }
                     return false;
                 }
@@ -243,10 +243,10 @@ define([
                 help    : 'select next cell',
                 help_index : 'dd',
                 handler : function (event) {
-                        var index = that.notebook.get_selected_index();
-                        if (index !== (that.notebook.ncells()-1) && index !== null) {
-                            that.notebook.select_next();
-                            that.notebook.focus_cell();
+                    var index = that.notebook.get_selected_index();
+                    if (index !== (that.notebook.ncells()-1) && index !== null) {
+                        that.notebook.select_next();
+                        that.notebook.focus_cell();
                     }
                     return false;
                 }
@@ -255,7 +255,7 @@ define([
                 help    : 'cut cell',
                 help_index : 'ee',
                 handler : function (event) {
-                        that.notebook.cut_cell();
+                    that.notebook.cut_cell();
                     return false;
                 }
             },
@@ -263,7 +263,7 @@ define([
                 help    : 'copy cell',
                 help_index : 'ef',
                 handler : function (event) {
-                        that.notebook.copy_cell();
+                    that.notebook.copy_cell();
                     return false;
                 }
             },
@@ -271,7 +271,7 @@ define([
                 help    : 'paste cell above',
                 help_index : 'eg',
                 handler : function (event) {
-                        that.notebook.paste_cell_above();
+                    that.notebook.paste_cell_above();
                     return false;
                 }
             },
@@ -279,7 +279,7 @@ define([
                 help    : 'paste cell below',
                 help_index : 'eh',
                 handler : function (event) {
-                        that.notebook.paste_cell_below();
+                    that.notebook.paste_cell_below();
                     return false;
                 }
             },
@@ -288,7 +288,7 @@ define([
                 help_index : 'ej',
                 count: 2,
                 handler : function (event) {
-                        that.notebook.delete_cell();
+                    that.notebook.delete_cell();
                     return false;
                 }
             },
@@ -296,9 +296,9 @@ define([
                 help    : 'insert cell above',
                 help_index : 'ec',
                 handler : function (event) {
-                        that.notebook.insert_cell_above();
-                        that.notebook.select_prev();
-                        that.notebook.focus_cell();
+                    that.notebook.insert_cell_above();
+                    that.notebook.select_prev();
+                    that.notebook.focus_cell();
                     return false;
                 }
             },
@@ -306,9 +306,9 @@ define([
                 help    : 'insert cell below',
                 help_index : 'ed',
                 handler : function (event) {
-                        that.notebook.insert_cell_below();
-                        that.notebook.select_next();
-                        that.notebook.focus_cell();
+                    that.notebook.insert_cell_below();
+                    that.notebook.select_next();
+                    that.notebook.focus_cell();
                     return false;
                 }
             },
@@ -316,7 +316,7 @@ define([
                 help    : 'to code',
                 help_index : 'ca',
                 handler : function (event) {
-                        that.notebook.to_code();
+                    that.notebook.to_code();
                     return false;
                 }
             },
@@ -324,7 +324,7 @@ define([
                 help    : 'to markdown',
                 help_index : 'cb',
                 handler : function (event) {
-                        that.notebook.to_markdown();
+                    that.notebook.to_markdown();
                     return false;
                 }
             },
@@ -332,7 +332,7 @@ define([
                 help    : 'to raw',
                 help_index : 'cc',
                 handler : function (event) {
-                        that.notebook.to_raw();
+                    that.notebook.to_raw();
                     return false;
                 }
             },
@@ -340,7 +340,7 @@ define([
                 help    : 'to heading 1',
                 help_index : 'cd',
                 handler : function (event) {
-                        that.notebook.to_heading(undefined, 1);
+                    that.notebook.to_heading(undefined, 1);
                     return false;
                 }
             },
@@ -348,7 +348,7 @@ define([
                 help    : 'to heading 2',
                 help_index : 'ce',
                 handler : function (event) {
-                        that.notebook.to_heading(undefined, 2);
+                    that.notebook.to_heading(undefined, 2);
                     return false;
                 }
             },
@@ -356,7 +356,7 @@ define([
                 help    : 'to heading 3',
                 help_index : 'cf',
                 handler : function (event) {
-                        that.notebook.to_heading(undefined, 3);
+                    that.notebook.to_heading(undefined, 3);
                     return false;
                 }
             },
@@ -364,7 +364,7 @@ define([
                 help    : 'to heading 4',
                 help_index : 'cg',
                 handler : function (event) {
-                        that.notebook.to_heading(undefined, 4);
+                    that.notebook.to_heading(undefined, 4);
                     return false;
                 }
             },
@@ -372,7 +372,7 @@ define([
                 help    : 'to heading 5',
                 help_index : 'ch',
                 handler : function (event) {
-                        that.notebook.to_heading(undefined, 5);
+                    that.notebook.to_heading(undefined, 5);
                     return false;
                 }
             },
@@ -380,7 +380,7 @@ define([
                 help    : 'to heading 6',
                 help_index : 'ci',
                 handler : function (event) {
-                        that.notebook.to_heading(undefined, 6);
+                    that.notebook.to_heading(undefined, 6);
                     return false;
                 }
             },
@@ -388,7 +388,7 @@ define([
                 help    : 'toggle output',
                 help_index : 'gb',
                 handler : function (event) {
-                        that.notebook.toggle_output();
+                    that.notebook.toggle_output();
                     return false;
                 }
             },
@@ -396,7 +396,7 @@ define([
                 help    : 'toggle output scrolling',
                 help_index : 'gc',
                 handler : function (event) {
-                        that.notebook.toggle_output_scroll();
+                    that.notebook.toggle_output_scroll();
                     return false;
                 }
             },
@@ -404,7 +404,7 @@ define([
                 help    : 'save notebook',
                 help_index : 'fa',
                 handler : function (event) {
-                        that.notebook.save_checkpoint();
+                    that.notebook.save_checkpoint();
                     return false;
                 }
             },
@@ -412,7 +412,7 @@ define([
                 help    : 'move cell down',
                 help_index : 'eb',
                 handler : function (event) {
-                        that.notebook.move_cell_down();
+                    that.notebook.move_cell_down();
                     return false;
                 }
             },
@@ -420,7 +420,7 @@ define([
                 help    : 'move cell up',
                 help_index : 'ea',
                 handler : function (event) {
-                        that.notebook.move_cell_up();
+                    that.notebook.move_cell_up();
                     return false;
                 }
             },
@@ -428,7 +428,7 @@ define([
                 help    : 'toggle line numbers',
                 help_index : 'ga',
                 handler : function (event) {
-                        that.notebook.cell_toggle_line_numbers();
+                    that.notebook.cell_toggle_line_numbers();
                     return false;
                 }
             },
@@ -437,7 +437,7 @@ define([
                 help_index : 'ha',
                 count: 2,
                 handler : function (event) {
-                        that.notebook.kernel.interrupt();
+                    that.notebook.kernel.interrupt();
                     return false;
                 }
             },
@@ -446,7 +446,7 @@ define([
                 help_index : 'hb',
                 count: 2,
                 handler : function (event) {
-                        that.notebook.restart_kernel();
+                    that.notebook.restart_kernel();
                     return false;
                 }
             },
@@ -454,7 +454,7 @@ define([
                 help    : 'keyboard shortcuts',
                 help_index : 'ge',
                 handler : function (event) {
-                        that.quick_help.show_keyboard_shortcuts();
+                    that.quick_help.show_keyboard_shortcuts();
                     return false;
                 }
             },
@@ -462,7 +462,7 @@ define([
                 help    : 'undo last delete',
                 help_index : 'ei',
                 handler : function (event) {
-                        that.notebook.undelete_cell();
+                    that.notebook.undelete_cell();
                     return false;
                 }
             },
@@ -470,7 +470,7 @@ define([
                 help    : 'merge cell below',
                 help_index : 'ek',
                 handler : function (event) {
-                        that.notebook.merge_cell_below();
+                    that.notebook.merge_cell_below();
                     return false;
                 }
             },
@@ -478,7 +478,7 @@ define([
                 help    : 'close pager',
                 help_index : 'gd',
                 handler : function (event) {
-                        that.pager.collapse();
+                    that.pager.collapse();
                     return false;
                 }
             },
diff --git a/IPython/html/static/notebook/js/maintoolbar.js b/IPython/html/static/notebook/js/maintoolbar.js
index 54d8e3105..2c46edd3d 100644
--- a/IPython/html/static/notebook/js/maintoolbar.js
+++ b/IPython/html/static/notebook/js/maintoolbar.js
@@ -150,7 +150,6 @@ define([
             );
     };
 
-
     MainToolBar.prototype.add_celltoolbar_list = function () {
         var label = $('<span/>').addClass("navbar-text").text('Cell Toolbar:');
         var select = $('<select/>')
@@ -188,12 +187,10 @@ define([
         });
     };
 
-
     MainToolBar.prototype.add_scrollmanager_list = function () {
         this._scrollselector = new scrollmanager.ScrollSelector(this.element, this.notebook);
     };
 
-
     MainToolBar.prototype.bind_events = function () {
         var that = this;
         

From 27058f48045cd350526e18a13aa9117279eaf1a4 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Fri, 8 Aug 2014 14:40:26 -0700
Subject: [PATCH 09/17] Removed ScrollManager selector combo.

---
 .../html/static/notebook/js/maintoolbar.js    |  8 +---
 IPython/html/static/notebook/js/notebook.js   |  5 ++-
 .../html/static/notebook/js/scrollmanager.js  | 43 -------------------
 3 files changed, 4 insertions(+), 52 deletions(-)

diff --git a/IPython/html/static/notebook/js/maintoolbar.js b/IPython/html/static/notebook/js/maintoolbar.js
index 2c46edd3d..56293b878 100644
--- a/IPython/html/static/notebook/js/maintoolbar.js
+++ b/IPython/html/static/notebook/js/maintoolbar.js
@@ -6,8 +6,7 @@ define([
     'jquery',
     'notebook/js/toolbar',
     'notebook/js/celltoolbar',
-    'notebook/js/scrollmanager'
-], function(IPython, $, toolbar, celltoolbar, scrollmanager) {
+], function(IPython, $, toolbar, celltoolbar) {
     "use strict";
 
     var MainToolBar = function (selector, options) {
@@ -25,7 +24,6 @@ define([
         this.construct();
         this.add_celltype_list();
         this.add_celltoolbar_list();
-        this.add_scrollmanager_list();
         this.bind_events();
     };
 
@@ -187,10 +185,6 @@ define([
         });
     };
 
-    MainToolBar.prototype.add_scrollmanager_list = function () {
-        this._scrollselector = new scrollmanager.ScrollSelector(this.element, this.notebook);
-    };
-
     MainToolBar.prototype.bind_events = function () {
         var that = this;
         
diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index fe88317d5..b715cd47d 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -67,8 +67,9 @@ define([
         this._session_starting = false;
         this.default_cell_type = this.config.default_cell_type || 'code';
 
-        //  Create and register scroll managers.
-        this.scrollmanager = new scrollmanager.ScrollManager(this);
+        //  Create default scroll manager.
+        this.scrollmanager = new scrollmanager.SlideScrollManager(this);
+
         // default_kernel_name is a temporary measure while we implement proper
         // kernel selection and delayed start. Do not rely on it.
         this.default_kernel_name = 'python';
diff --git a/IPython/html/static/notebook/js/scrollmanager.js b/IPython/html/static/notebook/js/scrollmanager.js
index a4a2b1bce..1a6dad292 100644
--- a/IPython/html/static/notebook/js/scrollmanager.js
+++ b/IPython/html/static/notebook/js/scrollmanager.js
@@ -3,48 +3,6 @@
 define(['jquery'], function($){
     "use strict";
 
-    var ScrollSelector = function(element, notebook) {
-        // Public constructor.
-        this.notebook = notebook;
-        $('<span />')
-            .addClass('nabar-text')
-            .text('Scrolling Mode:')
-            .appendTo(element);
-        this._combo = $('<select />')
-            .addClass('form-control select-xs')
-            .appendTo(element);
-
-        // Redirect class level manager registration to this instance.
-        this._registered = {};
-        ScrollSelector.register = $.proxy(this.register, this);
-
-        // Register cached managers.
-        for (var i =0; i < ScrollSelector.registered.length; i++) {
-            this.register.apply(this, ScrollSelector.registered[i]);
-        }
-
-        // Listen for scroll manager change, apply it to the notebook.
-        var that = this;
-        this._combo.change(function(){
-            var manager = that._registered[$(this).find("option:selected").val()];
-            that.notebook.scrollmanager = manager;
-        });
-    };
-
-    // Cache scroll managers registered before the construction of a scroll 
-    // manager.
-    ScrollSelector.registered = [];
-    ScrollSelector.register = function(name, manager) {
-        ScrollSelector.registered.push(arguments);
-    };
-    ScrollSelector.prototype.register = function(name, manager) {
-        this._registered[name] = manager;
-        this._combo.append($('<option />')
-            .val(name)
-            .text(name));
-    };
-
-
     var ScrollManager = function(notebook) {
         // Public constructor.
         this.notebook = notebook;
@@ -164,7 +122,6 @@ define(['jquery'], function($){
 
     // Return naemspace for require.js loads
     return {
-        'ScrollSelector': ScrollSelector,
         'ScrollManager': ScrollManager,
         'SlideScrollManager': SlideScrollManager,
         'HeadingScrollManager': HeadingScrollManager,

From 3ff4d4c16e1ea8a05dd6d9be8f917706cf93215b Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Wed, 20 Aug 2014 13:38:52 -0700
Subject: [PATCH 10/17] Address review comments

---
 IPython/html/static/notebook/js/notebook.js   |  2 +-
 .../html/static/notebook/js/scrollmanager.js  | 39 +++++++++++++------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index b715cd47d..3c2f4272f 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -68,7 +68,7 @@ define([
         this.default_cell_type = this.config.default_cell_type || 'code';
 
         //  Create default scroll manager.
-        this.scrollmanager = new scrollmanager.SlideScrollManager(this);
+        this.scroll_manager = new scrollmanager.SlideScrollManager(this);
 
         // default_kernel_name is a temporary measure while we implement proper
         // kernel selection and delayed start. Do not rely on it.
diff --git a/IPython/html/static/notebook/js/scrollmanager.js b/IPython/html/static/notebook/js/scrollmanager.js
index 1a6dad292..e8ca3fb67 100644
--- a/IPython/html/static/notebook/js/scrollmanager.js
+++ b/IPython/html/static/notebook/js/scrollmanager.js
@@ -3,10 +3,10 @@
 define(['jquery'], function($){
     "use strict";
 
-    var ScrollManager = function(notebook) {
+    var ScrollManager = function(notebook, options) {
         // Public constructor.
         this.notebook = notebook;
-        this.animation_speed = 250; //ms
+        this.animation_speed = options.animation_speed || 250; //ms
     };
 
     ScrollManager.prototype.scroll = function (delta) {
@@ -20,13 +20,18 @@ define(['jquery'], function($){
         return false;
     };
 
-    ScrollManager.prototype.scroll_to = function(destination) {
+    ScrollManager.prototype.scroll_to = function(selector) {
         // Scroll to an element in the notebook.
-        $('#notebook').animate({'scrollTop': $(destination).offset().top + $('#notebook').scrollTop() - $('#notebook').offset().top}, this.animation_speed);
+        $('#notebook').animate({'scrollTop': $(selector).offset().top + $('#notebook').scrollTop() - $('#notebook').offset().top}, this.animation_speed);
     };
 
     ScrollManager.prototype.scroll_some = function(pages) {
         // Scroll up or down a given number of pages.
+        //
+        // Parameters
+        // ----------
+        // pages: integer
+        //  number of pages to scroll the document, may be positive or negative.
         $('#notebook').animate({'scrollTop': $('#notebook').scrollTop() + pages * $('#notebook').height()}, this.animation_speed);
     };
 
@@ -57,13 +62,22 @@ define(['jquery'], function($){
     };
 
 
-    var TargetScrollManager = function(notebook) {
+    var TargetScrollManager = function(notebook, options) {
         // Public constructor.
-        ScrollManager.apply(this, [notebook]);
+        ScrollManager.apply(this, [notebook, options]);
     };
     TargetScrollManager.prototype = new ScrollManager();
 
     TargetScrollManager.prototype.is_target = function (index) {
+        // Check if a cell should be a scroll stop.
+        //
+        // Returns `true` if the cell is a cell that the scroll manager
+        // should scroll to.  Otherwise, false is returned. 
+        //
+        // Parameters
+        // ----------
+        // index: integer
+        //  index of the cell to test.
         return false;
     };
 
@@ -93,9 +107,9 @@ define(['jquery'], function($){
     };
 
 
-    var SlideScrollManager = function(notebook) {
+    var SlideScrollManager = function(notebook, options) {
         // Public constructor.
-        TargetScrollManager.apply(this, [notebook]);
+        TargetScrollManager.apply(this, [notebook, options]);
     };
     SlideScrollManager.prototype = new TargetScrollManager();
 
@@ -103,14 +117,15 @@ define(['jquery'], function($){
         var cell = this.notebook.get_cell(index);
         return cell.metadata && cell.metadata.slideshow && 
             cell.metadata.slideshow.slide_type && 
-            cell.metadata.slideshow.slide_type === "slide";
+            (cell.metadata.slideshow.slide_type === "slide" ||
+            cell.metadata.slideshow.slide_type === "subslide");
     };
 
 
-    var HeadingScrollManager = function(notebook, heading_level) {
+    var HeadingScrollManager = function(notebook, options) {
         // Public constructor.
-        TargetScrollManager.apply(this, [notebook]);
-        this._level = heading_level;
+        TargetScrollManager.apply(this, [notebook, options]);
+        this._level = options.heading_level || 1;
     };
     HeadingScrollManager.prototype = new TargetScrollManager();
 

From 8c0c04910bce093905c7e864939d56cd3aeb79d2 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Wed, 20 Aug 2014 14:46:26 -0700
Subject: [PATCH 11/17] options bug fix

---
 IPython/html/static/notebook/js/scrollmanager.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/html/static/notebook/js/scrollmanager.js b/IPython/html/static/notebook/js/scrollmanager.js
index e8ca3fb67..ea8cccf39 100644
--- a/IPython/html/static/notebook/js/scrollmanager.js
+++ b/IPython/html/static/notebook/js/scrollmanager.js
@@ -6,6 +6,7 @@ define(['jquery'], function($){
     var ScrollManager = function(notebook, options) {
         // Public constructor.
         this.notebook = notebook;
+        options = options = {};
         this.animation_speed = options.animation_speed || 250; //ms
     };
 
@@ -125,6 +126,7 @@ define(['jquery'], function($){
     var HeadingScrollManager = function(notebook, options) {
         // Public constructor.
         TargetScrollManager.apply(this, [notebook, options]);
+        options = options = {};
         this._level = options.heading_level || 1;
     };
     HeadingScrollManager.prototype = new TargetScrollManager();

From 3f9fea0328122d89371e849b189501137216aebd Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Wed, 20 Aug 2014 15:26:22 -0700
Subject: [PATCH 12/17] Added comments clarifying scroll units

---
 IPython/html/static/notebook/js/scrollmanager.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/html/static/notebook/js/scrollmanager.js b/IPython/html/static/notebook/js/scrollmanager.js
index ea8cccf39..d7a7f2dbc 100644
--- a/IPython/html/static/notebook/js/scrollmanager.js
+++ b/IPython/html/static/notebook/js/scrollmanager.js
@@ -16,7 +16,8 @@ define(['jquery'], function($){
         // Parameters
         // ----------
         // delta: integer
-        //  direction to scroll the document.  Positive is downwards.
+        //  direction to scroll the document.  Positive is downwards. 
+        //  Unit is one page length.
         this.scroll_some(delta);
         return false;
     };
@@ -89,6 +90,7 @@ define(['jquery'], function($){
         // ----------
         // delta: integer
         //  direction to scroll the document.  Positive is downwards.
+        //  Units are targets.
 
         // Try to scroll to the next slide.
         var cell_count = this.notebook.ncells();

From f6adf3e064ae5c7687512ebf22df9dd1007f8e9c Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Thu, 21 Aug 2014 08:22:10 -0700
Subject: [PATCH 13/17] Fixed dumb typo, forgot to update scrollmanager ref to
 scroll_manager.

---
 IPython/html/static/notebook/js/keyboardmanager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/html/static/notebook/js/keyboardmanager.js b/IPython/html/static/notebook/js/keyboardmanager.js
index de21797e8..3ff69ba62 100644
--- a/IPython/html/static/notebook/js/keyboardmanager.js
+++ b/IPython/html/static/notebook/js/keyboardmanager.js
@@ -186,13 +186,13 @@ define([
             'space': {
                 help: "Scroll down",
                 handler: function(event) {
-                    return that.notebook.scrollmanager.scroll(1);
+                    return that.notebook.scroll_manager.scroll(1);
                 },
             },
             'shift-space': {
                 help: "Scroll up",
                 handler: function(event) {
-                    return that.notebook.scrollmanager.scroll(-1);
+                    return that.notebook.scroll_manager.scroll(-1);
                 },
             },
             'enter' : {

From 46eb5288bc1130ea9f466c5a224f3f4a7892cdd0 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Tue, 26 Aug 2014 17:42:11 -0700
Subject: [PATCH 14/17] Scroll to all heading levels <= target level.

---
 IPython/html/static/notebook/js/scrollmanager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/html/static/notebook/js/scrollmanager.js b/IPython/html/static/notebook/js/scrollmanager.js
index d7a7f2dbc..568abd3be 100644
--- a/IPython/html/static/notebook/js/scrollmanager.js
+++ b/IPython/html/static/notebook/js/scrollmanager.js
@@ -135,7 +135,7 @@ define(['jquery'], function($){
 
     HeadingScrollManager.prototype.is_target = function (index) {
         var cell = this.notebook.get_cell(index);
-        return cell.cell_type === "heading" && cell.level == this._level;
+        return cell.cell_type === "heading" && cell.level <= this._level;
     };
 
 

From c957cbc9c279d411cca7b590b7d0d4276479c312 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Tue, 26 Aug 2014 17:45:22 -0700
Subject: [PATCH 15/17] Set heading scroll manager as default scroll manager.

---
 IPython/html/static/notebook/js/notebook.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index 3c2f4272f..e96a9b494 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -68,7 +68,7 @@ define([
         this.default_cell_type = this.config.default_cell_type || 'code';
 
         //  Create default scroll manager.
-        this.scroll_manager = new scrollmanager.SlideScrollManager(this);
+        this.scroll_manager = new scrollmanager.HeadingScrollManager(this);
 
         // default_kernel_name is a temporary measure while we implement proper
         // kernel selection and delayed start. Do not rely on it.

From 9831e6ea1b5c494e6c3478e4a15eb47f26121680 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Tue, 16 Sep 2014 13:52:58 -0700
Subject: [PATCH 16/17] Make the default the single page scroller.

---
 IPython/html/static/notebook/js/notebook.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index e96a9b494..8bcf3c9fa 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -68,7 +68,7 @@ define([
         this.default_cell_type = this.config.default_cell_type || 'code';
 
         //  Create default scroll manager.
-        this.scroll_manager = new scrollmanager.HeadingScrollManager(this);
+        this.scroll_manager = new scrollmanager.ScrollManager(this);
 
         // default_kernel_name is a temporary measure while we implement proper
         // kernel selection and delayed start. Do not rely on it.

From 0bd868888e7b7a0112e377be531d16623db8e326 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Wed, 17 Sep 2014 16:31:00 -0700
Subject: [PATCH 17/17] Make HeadingScrollManager scroll to heading elements,
 not cells.

---
 .../html/static/notebook/js/scrollmanager.js  | 60 ++++++++++++++++---
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/IPython/html/static/notebook/js/scrollmanager.js b/IPython/html/static/notebook/js/scrollmanager.js
index 568abd3be..a93dcbcb7 100644
--- a/IPython/html/static/notebook/js/scrollmanager.js
+++ b/IPython/html/static/notebook/js/scrollmanager.js
@@ -6,7 +6,7 @@ define(['jquery'], function($){
     var ScrollManager = function(notebook, options) {
         // Public constructor.
         this.notebook = notebook;
-        options = options = {};
+        options = options || {};
         this.animation_speed = options.animation_speed || 250; //ms
     };
 
@@ -127,17 +127,61 @@ define(['jquery'], function($){
 
     var HeadingScrollManager = function(notebook, options) {
         // Public constructor.
-        TargetScrollManager.apply(this, [notebook, options]);
-        options = options = {};
+        ScrollManager.apply(this, [notebook, options]);
+        options = options || {};
         this._level = options.heading_level || 1;
     };
-    HeadingScrollManager.prototype = new TargetScrollManager();
+    HeadingScrollManager.prototype = new ScrollManager();
 
-    HeadingScrollManager.prototype.is_target = function (index) {
-        var cell = this.notebook.get_cell(index);
-        return cell.cell_type === "heading" && cell.level <= this._level;
-    };
+    HeadingScrollManager.prototype.scroll = function (delta) {
+        // Scroll the document.
+        //
+        // Parameters
+        // ----------
+        // delta: integer
+        //  direction to scroll the document.  Positive is downwards.
+        //  Units are headers.
+
+        // Get all of the header elements that match the heading level or are of
+        // greater magnitude (a smaller header number).
+        var headers = $();
+        var i;
+        for (i = 1; i <= this._level; i++) {
+            headers = headers.add('#notebook-container h' + i);
+        }
 
+        // Find the header the user is on or below.
+        var first_cell_top = this.notebook.get_cell(0).element.offset().top;
+        var notebook = $('#notebook');
+        var current_scroll = notebook.scrollTop();
+        var header_scroll = 0;
+        i = -1;
+        while (current_scroll >= header_scroll && i < headers.length) {
+            if (++i < headers.length) {
+                header_scroll = $(headers[i]).offset().top - first_cell_top;
+            }
+        }
+        i--;
+
+        // Check if the user is below the header.
+        if (i < 0 || current_scroll > $(headers[i]).offset().top - first_cell_top + 30) {
+            // Below the header, count the header as a target.
+            if (delta < 0) {
+                delta += 1;
+            }
+        }
+        i += delta;
+
+        // Scroll!
+        if (0 <= i && i < headers.length) {
+            this.scroll_to(headers[i]);
+            return false;
+        } else {
+            // Default to the base's scroll behavior when target header doesn't
+            // exist.
+            return ScrollManager.prototype.scroll.apply(this, [delta]);
+        }
+    };
 
     // Return naemspace for require.js loads
     return {