Removed ScrollManager selector combo.

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;
         

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';

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,