Progress...

IPython/html/static/base/js/security.js

@@ -1,19 +1,11 b''
-//----------------------------------------------------------------------------
-//  Copyright (C) 2014  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.
-//----------------------------------------------------------------------------
+// Copyright (c) IPython Development Team.
+// Distributed under the terms of the Modified BSD License.
 
-//============================================================================
-// Utilities
-//============================================================================
-IPython.namespace('IPython.security');
-
-IPython.security = (function (IPython) {
+define([
+    'base/js/namespace',
+    'components/jquery/jquery.min'
+], function(IPython, $) {
     "use strict";
-
-    var utils = IPython.utils;
     
     var noop = function (x) { return x; };
     
@@ -121,6 +113,4 b' IPython.security = (function (IPython) {'
         caja: caja,
         sanitize_html: sanitize_html
     };
-
-}(IPython));
-
+});

IPython/html/static/base/js/utils.js

@@ -550,7 +550,8 b' define(['
         log_ajax_error : log_ajax_error,
     };
 
-    // Register self in the global namespace for convenience.
+    // Backwards compatability.
     IPython.Utils = Utils;
+    
     return Utils;
 }); 

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

@@ -1,73 +1,51 b''
-"components/codemirror/lib/codemirror.js",
-// Set codemirror version.
-// CodeMirror.modeURL = "{{ static_url("components/codemirror/mode/%N/%N.js", include_version=False) }}";
-"components/codemirror/addon/mode/loadmode.js",
-"components/codemirror/addon/mode/multiplex.js",
-"components/codemirror/addon/mode/overlay.js",
-"components/codemirror/addon/edit/matchbrackets.js",
-"components/codemirror/addon/edit/closebrackets.js",
-"components/codemirror/addon/comment/comment.js",
-"components/codemirror/mode/htmlmixed/htmlmixed.js",
-"components/codemirror/mode/xml/xml.js",
-"components/codemirror/mode/javascript/javascript.js",
-"components/codemirror/mode/css/css.js",
-"components/codemirror/mode/rst/rst.js",
-"components/codemirror/mode/markdown/markdown.js",
-"components/codemirror/mode/python/python.js",
-"notebook/js/codemirror-ipython.js",
-"notebook/js/codemirror-ipythongfm.js",
-
-
-// monkey patch CM to be able to syntax highlight cell magics
-// bug reported upstream,
-// see https://github.com/marijnh/CodeMirror2/issues/670
-if(CodeMirror.getMode(1,'text/plain').indent === undefined ){
-    console.log('patching CM for undefined indent');
-    CodeMirror.modes.null = function() {
-        return {token: function(stream) {stream.skipToEnd();},indent : function(){return 0;}};
-    };
-}
-
-CodeMirror.patchedGetMode = function(config, mode){
-        var cmmode = CodeMirror.getMode(config, mode);
-        if(cmmode.indent === null) {
-            console.log('patch mode "' , mode, '" on the fly');
-            cmmode.indent = function(){return 0;};
-        }
-        return cmmode;
-    };
-// end monkey patching CodeMirror
-
-
-"notebook/js/tooltip",
-    Tooltip, 
-    tooltip = new Tooltip();
-    IPython.tooltip = tooltip;
-
-
-
-//----------------------------------------------------------------------------
-//  Copyright (C) 2008-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.
-//----------------------------------------------------------------------------
-
-//============================================================================
-// Cell
-//============================================================================
-/**
- * An extendable module that provide base functionnality to create cell for notebook.
- * @module IPython
- * @namespace IPython
- * @submodule Cell
- */
-
-var IPython = (function (IPython) {
+// Copyright (c) IPython Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+define([
+    'base/js/namespace',
+    'components/jquery/jquery.min',
+    'components/codemirror/lib/codemirror.js',
+    'base/js/utils',
+
+    // Set codemirror version.
+    // CodeMirror.modeURL = '{{ static_url("components/codemirror/mode/%N/%N.js", include_version=False) }}';
+    'components/codemirror/addon/mode/loadmode.js',
+    'components/codemirror/addon/mode/multiplex.js',
+    'components/codemirror/addon/mode/overlay.js',
+    'components/codemirror/addon/edit/matchbrackets.js',
+    'components/codemirror/addon/edit/closebrackets.js',
+    'components/codemirror/addon/comment/comment.js',
+    'components/codemirror/mode/htmlmixed/htmlmixed.js',
+    'components/codemirror/mode/xml/xml.js',
+    'components/codemirror/mode/javascript/javascript.js',
+    'components/codemirror/mode/css/css.js',
+    'components/codemirror/mode/rst/rst.js',
+    'components/codemirror/mode/markdown/markdown.js',
+    'components/codemirror/mode/python/python.js',
+    'notebook/js/codemirror-ipython.js',
+    'notebook/js/codemirror-ipythongfm.js',
+], function(IPython, $, CodeMirror, Utils) {
     "use strict";
 
-    var utils = IPython.utils;
-    var keycodes = IPython.keyboard.keycodes;
+    // monkey patch CM to be able to syntax highlight cell magics
+    // bug reported upstream,
+    // see https://github.com/marijnh/CodeMirror2/issues/670
+    if(CodeMirror.getMode(1,'text/plain').indent === undefined ){
+        console.log('patching CM for undefined indent');
+        CodeMirror.modes.null = function() {
+            return {token: function(stream) {stream.skipToEnd();},indent : function(){return 0;}};
+        };
+    }
+
+    CodeMirror.patchedGetMode = function(config, mode){
+            var cmmode = CodeMirror.getMode(config, mode);
+            if(cmmode.indent === null) {
+                console.log('patch mode "' , mode, '" on the fly');
+                cmmode.indent = function(){return 0;};
+            }
+            return cmmode;
+        };
+    // end monkey patching CodeMirror
 
     /**
      * The Base `Cell` class from which to inherit
@@ -80,8 +58,8 b' var IPython = (function (IPython) {'
      * @param {object|undefined} [options]
      *     @param [options.cm_config] {object} config to pass to CodeMirror, will extend default parameters
      */
-    var Cell = function (options) {
-
+    var Cell = function (keyboard_manager) {
+        this.keyboard_manager = keyboard_manager;
         options = this.mergeopt(Cell, options);
         // superclass default overwrite our default
         
@@ -94,7 +72,7 b' var IPython = (function (IPython) {'
         // load this from metadata later ?
         this.user_highlight = 'auto';
         this.cm_config = options.cm_config;
-        this.cell_id = utils.uuid();
+        this.cell_id = Utils.uuid();
         this._options = options;
 
         // For JS VM engines optimization, attributes should be all set (even
@@ -130,7 +108,7 b' var IPython = (function (IPython) {'
     // FIXME: Workaround CM Bug #332 (Safari segfault on drag)
     // by disabling drag/drop altogether on Safari
     // https://github.com/marijnh/CodeMirror/issues/332    
-    if (utils.browser[0] == "Safari") {
+    if (Utils.browser[0] == "Safari") {
         Cell.options_default.cm_config.dragDrop = false;
     }
 
@@ -180,27 +158,27 b' var IPython = (function (IPython) {'
         // We trigger events so that Cell doesn't have to depend on Notebook.
         that.element.click(function (event) {
             if (!that.selected) {
-                $([IPython.events]).trigger('select.Cell', {'cell':that});
+                that.events.trigger('select.Cell', {'cell':that});
             }
         });
         that.element.focusin(function (event) {
             if (!that.selected) {
-                $([IPython.events]).trigger('select.Cell', {'cell':that});
+                that.events.trigger('select.Cell', {'cell':that});
             }
         });
         if (this.code_mirror) {
             this.code_mirror.on("change", function(cm, change) {
-                $([IPython.events]).trigger("set_dirty.Notebook", {value: true});
+                that.events.trigger("set_dirty.Notebook", {value: true});
             });
         }
         if (this.code_mirror) {
             this.code_mirror.on('focus', function(cm, change) {
-                $([IPython.events]).trigger('edit_mode.Cell', {cell: that});
+                that.events.trigger('edit_mode.Cell', {cell: that});
             });
         }
         if (this.code_mirror) {
             this.code_mirror.on('blur', function(cm, change) {
-                $([IPython.events]).trigger('command_mode.Cell', {cell: that});
+                that.events.trigger('command_mode.Cell', {cell: that});
             });
         }
     };
@@ -219,7 +197,7 b' var IPython = (function (IPython) {'
      */
     Cell.prototype.handle_codemirror_keyevent = function (editor, event) {
         var that = this;
-        var shortcuts = IPython.keyboard_manager.edit_shortcuts;
+        var shortcuts = this.keyboard_manager.edit_shortcuts;
 
         // if this is an edit_shortcuts shortcut, the global keyboard/shortcut
         // manager will handle it
@@ -597,9 +575,9 b' var IPython = (function (IPython) {'
         this.code_mirror.setOption('mode', default_mode);
     };
 
+    // Backwards compatability.
     IPython.Cell = Cell;
 
-    return IPython;
-
-}(IPython));
+    return Cell;
 
+});

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

@@ -1,22 +1,11 b''
-//----------------------------------------------------------------------------
-//  Copyright (C) 2012  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.
-//----------------------------------------------------------------------------
-
-//============================================================================
-// CellToolbar
-//============================================================================
-
-
-/**
- * A Module to control the per-cell toolbar.
- * @module IPython
- * @namespace IPython
- * @submodule CellToolbar
- */
-var IPython = (function (IPython) {
+// Copyright (c) IPython Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+define([
+    'base/js/namespace',
+    'components/jquery/jquery.min',
+    'notebook/js/textcell',
+], function(IPython, $, TextCell) {
     "use strict";
 
     /**
@@ -24,8 +13,10 b' var IPython = (function (IPython) {'
      * @class CellToolbar
      * @param {The cell to attach the metadata UI to} cell
      */
-    var CellToolbar = function (cell) {
+    var CellToolbar = function (cell, events, notebook) {
         CellToolbar._instances.push(this);
+        this.notebook = notebook;
+        this.events = events;
         this.cell = cell;
         this.create_element();
         this.rebuild();
@@ -34,7 +25,7 b' var IPython = (function (IPython) {'
 
 
     CellToolbar.prototype.create_element = function () {
-        this.inner_element = $('<div/>').addClass('celltoolbar')
+        this.inner_element = $('<div/>').addClass('celltoolbar');
         this.element = $('<div/>').addClass('ctb_hideshow')
             .append(this.inner_element);
     };
@@ -184,10 +175,10 b' var IPython = (function (IPython) {'
      */
     CellToolbar.register_preset = function(name, preset_list) {
         CellToolbar._presets[name] = preset_list;
-        $([IPython.events]).trigger('preset_added.CellToolbar', {name: name});
+        this.events.trigger('preset_added.CellToolbar', {name: name});
         // When "register_callback" is called by a custom extension, it may be executed after notebook is loaded.
         // In that case, activate the preset if needed.
-        if (IPython.notebook && IPython.notebook.metadata && IPython.notebook.metadata.celltoolbar === name)
+        if (this.notebook && this.notebook.metadata && this.notebook.metadata.celltoolbar === name)
             this.activate_preset(name);
     };
 
@@ -229,7 +220,7 b' var IPython = (function (IPython) {'
             CellToolbar.rebuild_all();
         }
 
-        $([IPython.events]).trigger('preset_activated.CellToolbar', {name: preset_name});
+        this.events.trigger('preset_activated.CellToolbar', {name: preset_name});
     };
 
 
@@ -283,7 +274,7 b' var IPython = (function (IPython) {'
         }
 
         // If there are no controls or the cell is a rendered TextCell hide the toolbar.
-        if (!this.ui_controls_list.length || (this.cell instanceof IPython.TextCell && this.cell.rendered)) {
+        if (!this.ui_controls_list.length || (this.cell instanceof TextCell && this.cell.rendered)) {
             this.hide();
         } else {
             this.show();
@@ -415,8 +406,8 b' var IPython = (function (IPython) {'
         };
     };
 
-
+    // Backwards compatability.
     IPython.CellToolbar = CellToolbar;
 
-    return IPython;
-}(IPython));
+    return CellToolbar;
+});

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

@@ -1,3 +1,9 b''
+
+"notebook/js/tooltip",
+    Tooltip, 
+    tooltip = new Tooltip();
+    IPython.tooltip = tooltip;
+
 //----------------------------------------------------------------------------
 //  Copyright (C) 2008-2011  The IPython Development Team
 //

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

@@ -7,9 +7,8 b' define(['
 ], function(IPython, $) {
     "use strict";
 
-    var LayoutManager = function (pager) {
+    var LayoutManager = function () {
         this.bind_events();
-        this.pager = pager;
     };
 
     LayoutManager.prototype.bind_events = function () {
@@ -39,14 +38,15 b' define(['
         var app_height = this.app_height();  // content height
 
         $('#ipython-main-app').height(app_height);  // content+padding+border height
-
-        var pager_height = this.pager.percentage_height*app_height;
-        var pager_splitter_height = $('div#pager_splitter').outerHeight(true);
-        $('div#pager').outerHeight(pager_height);
-        if (this.pager.expanded) {
-            $('div#notebook').outerHeight(app_height-pager_height-pager_splitter_height);
-        } else {
-            $('div#notebook').outerHeight(app_height-pager_splitter_height);
+        if (this.pager) {
+            var pager_height = this.pager.percentage_height*app_height;
+            var pager_splitter_height = $('div#pager_splitter').outerHeight(true);
+            $('div#pager').outerHeight(pager_height);
+            if (this.pager.expanded) {
+                $('div#notebook').outerHeight(app_height-pager_height-pager_splitter_height);
+            } else {
+                $('div#notebook').outerHeight(app_height-pager_splitter_height);
+            }    
         }
     };
 

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

@@ -4,6 +4,7 b''
 var ipython = ipython || {};
 require([
     'base/js/namespace',
+    'components/jquery/jquery.min',
     'notebook/js/notebook',
     'base/js/utils',
     'base/js/page',
@@ -17,6 +18,7 b' require(['
     'notebook/js/notificationarea',
 ], function(
     IPython, 
+    $,
     Notebook, 
     Utils, 
     Page, 
@@ -41,12 +43,13 b' require(['
     };
 
     page = new Page();
-    pager = new Pager('div#pager', 'div#pager_splitter');
-    layout_manager = new LayoutManager(pager);
-    events = new Events();
+    layout_manager = new LayoutManager();
+    pager = new Pager('div#pager', 'div#pager_splitter', layout_manager);
+    layout_manager.pager = pager;
+    events = $([new Events()]);
     notebook = new Notebook('div#notebook', opts, events);
     login_widget = new LoginWidget('span#login_widget', opts);
-    toolbar = new MainToolBar('#maintoolbar-container');
+    toolbar = new MainToolBar('#maintoolbar-container', notebook, events);
     quick_help = new QuickHelp();
     menubar = new MenuBar('#menubar', opts);
 

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

@@ -5,11 +5,13 b' define(['
     'base/js/namespace',
     'components/jquery/jquery.min',
     'notebook/js/toolbar',
-], function(IPython, $, Toolbar) {
+    'notebook/js/celltoolbar',
+], function(IPython, $, Toolbar, CellToolbar) {
     "use strict";
 
-    var MainToolBar = function (selector, notebook) {
+    var MainToolBar = function (selector, layout_manager, notebook, events) {
         ToolBar.apply(this, arguments);
+        this.events = events;
         this.notebook = notebook;
         this.construct();
         this.add_celltype_list();
@@ -150,27 +152,27 b' define(['
         select.change(function() {
                 var val = $(this).val();
                 if (val ==='') {
-                    IPython.CellToolbar.global_hide();
+                    CellToolbar.global_hide();
                     delete this.notebook.metadata.celltoolbar;
                 } else {
-                    IPython.CellToolbar.global_show();
-                    IPython.CellToolbar.activate_preset(val);
+                    CellToolbar.global_show();
+                    CellToolbar.activate_preset(val);
                     this.notebook.metadata.celltoolbar = val;
                 }
             });
         // Setup the currently registered presets.
-        var presets = IPython.CellToolbar.list_presets();
+        var presets = CellToolbar.list_presets();
         for (var i=0; i<presets.length; i++) {
             var name = presets[i];
             select.append($('<option/>').attr('value', name).text(name));
         }
         // Setup future preset registrations.
-        $([IPython.events]).on('preset_added.CellToolbar', function (event, data) {
+        this.events.on('preset_added.CellToolbar', function (event, data) {
             var name = data.name;
             select.append($('<option/>').attr('value', name).text(name));
         });
         // Update select value when a preset is activated.
-        $([IPython.events]).on('preset_activated.CellToolbar', function (event, data) {
+        this.events.on('preset_activated.CellToolbar', function (event, data) {
             if (select.val() !== data.name)
                 select.val(data.name);
         });
@@ -202,7 +204,7 b' define(['
                 this.notebook.to_heading(undefined, 6);
             }
         });
-        $([IPython.events]).on('selected_cell_type_changed.Notebook', function (event, data) {
+        this.events.on('selected_cell_type_changed.Notebook', function (event, data) {
             if (data.cell_type === 'heading') {
                 that.element.find('#cell_type').val(data.cell_type+data.level);
             } else {

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

@@ -46,7 +46,7 b' define(['
      * @param {Object} [events] An events object
      */
     var Notebook = function (selector, options, events) {
-        this.events = events || new Events();
+        this.events = events || $([new Events()]);
         this.keyboard_manager = new KeyboardManager();
         this.keyboard = new Keyboard();
         this.save_widget = new SaveWidget('span#save_widget');

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

@@ -1,16 +1,18 b''
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-//============================================================================
-// Pager
-//============================================================================
-
-var IPython = (function (IPython) {
+define([
+    'base/js/namespace',
+    'components/jquery/jquery.min',
+    'notebook/js/toolbar',
+    'notebook/js/celltoolbar',
+], function(IPython, $, Toolbar, CellToolbar) {
     "use strict";
 
     var utils = IPython.utils;
 
-    var Pager = function (pager_selector, pager_splitter_selector) {
+    var Pager = function (pager_selector, pager_splitter_selector, layout_manager, events) {
+        this.events = events;
         this.pager_element = $(pager_selector);
         this.pager_button_area = $('#pager_button_area');
         var that = this;
@@ -23,7 +25,7 b' var IPython = (function (IPython) {'
                         drag: function(event, ui) {
                             // recalculate the amount of space the pager should take
                             var pheight = ($(document.body).height()-event.clientY-4);
-                            var downprct = pheight/IPython.layout_manager.app_height();
+                            var downprct = pheight/layout_manager.app_height();
                                 downprct = Math.min(0.9, downprct);
                             if (downprct < 0.1) {
                                 that.percentage_height = 0.1;
@@ -32,7 +34,7 b' var IPython = (function (IPython) {'
                                 that.percentage_height = downprct;
                                 that.expand({'duration':0});
                             }
-                            IPython.layout_manager.do_resize();
+                            layout_manager.do_resize();
                        }
             });
         this.expanded = false;
@@ -47,22 +49,22 b' var IPython = (function (IPython) {'
             $('<a>').attr('role', "button")
                     .attr('title',"Open the pager in an external window")
                     .addClass('ui-button')
-                    .click(function(){that.detach()})
+                    .click(function(){that.detach();})
                     .attr('style','position: absolute; right: 20px;')
                     .append(
                         $('<span>').addClass("ui-icon ui-icon-extlink")
                     )
-        )
+        );
         this.pager_button_area.append(
             $('<a>').attr('role', "button")
                     .attr('title',"Close the pager")
                     .addClass('ui-button')
-                    .click(function(){that.collapse()})
+                    .click(function(){that.collapse();})
                     .attr('style','position: absolute; right: 5px;')
                     .append(
                         $('<span>').addClass("ui-icon ui-icon-close")
                     )
-        )
+        );
     };
 
     Pager.prototype.style = function () {
@@ -105,7 +107,7 b' var IPython = (function (IPython) {'
             that.toggle();
         });
 
-        $([IPython.events]).on('open_with_text.Pager', function (event, payload) {
+        this.events.on('open_with_text.Pager', function (event, payload) {
             // FIXME: support other mime types
             if (payload.data['text/plain'] && payload.data['text/plain'] !== "") {
                 that.clear();
@@ -171,10 +173,8 b' var IPython = (function (IPython) {'
         this.pager_element.find(".container").append($('<pre/>').html(utils.fixCarriageReturn(utils.fixConsole(text))));
     };
 
-
+    // Backwards compatability.
     IPython.Pager = Pager;
 
-    return IPython;
-
-}(IPython));
-
+    return Pager;
+});

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

@@ -1,40 +1,27 b''
-//----------------------------------------------------------------------------
-//  Copyright (C) 2008-2012  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.
-//----------------------------------------------------------------------------
-
-//============================================================================
-// TextCell
-//============================================================================
-
-
-
-/**
-    A module that allow to create different type of Text Cell
-    @module IPython
-    @namespace IPython
- */
-var IPython = (function (IPython) {
+// Copyright (c) IPython Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+define([
+    'base/js/namespace',
+    'components/jquery/jquery.min',
+    'notebook/js/cell',
+    'base/js/security',
+], function(IPython, $, Cell, Security) {
     "use strict";
 
-    // TextCell base class
-    var keycodes = IPython.keyboard.keycodes;
-    var security = IPython.security;
-
     /**
      * Construct a new TextCell, codemirror mode is by default 'htmlmixed', and cell type is 'text'
      * cell start as not redered.
      *
      * @class TextCell
      * @constructor TextCell
-     * @extend IPython.Cell
+     * @extend Cell
      * @param {object|undefined} [options]
      *      @param [options.cm_config] {object} config to pass to CodeMirror, will extend/overwrite default config
      *      @param [options.placeholder] {string} default string to use when souce in empty for rendering (only use in some TextCell subclass)
      */
-    var TextCell = function (options) {
+    var TextCell = function (options, events, config, mathjaxutils) {
+        // TODO: Config is IPython.config
         // in all TextCell/Cell subclasses
         // do not assign most of members here, just pass it down
         // in the options dict potentially overwriting what you wish.
@@ -48,13 +35,14 b' var IPython = (function (IPython) {'
         options = this.mergeopt(TextCell,options,{cm_config:cm_overwrite_options});
 
         this.cell_type = this.cell_type || 'text';
+        this.mathjaxutils = mathjaxutils;
 
-        IPython.Cell.apply(this, [options]);
+        Cell.apply(this, [options], events);
 
         this.rendered = false;
     };
 
-    TextCell.prototype = new IPython.Cell();
+    TextCell.prototype = new Cell();
 
     TextCell.options_default = {
         cm_config : {
@@ -71,7 +59,7 b' var IPython = (function (IPython) {'
      * @private
      */
     TextCell.prototype.create_element = function () {
-        IPython.Cell.prototype.create_element.apply(this, arguments);
+        Cell.prototype.create_element.apply(this, arguments);
 
         var cell = $("<div>").addClass('cell text_cell border-box-sizing');
         cell.attr('tabindex','2');
@@ -79,7 +67,7 b' var IPython = (function (IPython) {'
         var prompt = $('<div/>').addClass('prompt input_prompt');
         cell.append(prompt);
         var inner_cell = $('<div/>').addClass('inner_cell');
-        this.celltoolbar = new IPython.CellToolbar(this);
+        this.celltoolbar = new CellToolbar(this);
         inner_cell.append(this.celltoolbar.element);
         var input_area = $('<div/>').addClass('input_area');
         this.code_mirror = new CodeMirror(input_area.get(0), this.cm_config);
@@ -99,12 +87,12 b' var IPython = (function (IPython) {'
      * @method bind_event
      */
     TextCell.prototype.bind_events = function () {
-        IPython.Cell.prototype.bind_events.apply(this);
+        Cell.prototype.bind_events.apply(this);
         var that = this;
 
         this.element.dblclick(function () {
             if (that.selected === false) {
-                $([IPython.events]).trigger('select.Cell', {'cell':that});
+                this.events.trigger('select.Cell', {'cell':that});
             }
             var cont = that.unrender();
             if (cont) {
@@ -116,7 +104,7 b' var IPython = (function (IPython) {'
     // Cell level actions
     
     TextCell.prototype.select = function () {
-        var cont = IPython.Cell.prototype.select.apply(this);
+        var cont = Cell.prototype.select.apply(this);
         if (cont) {
             if (this.mode === 'edit') {
                 this.code_mirror.refresh();
@@ -127,7 +115,7 b' var IPython = (function (IPython) {'
 
     TextCell.prototype.unrender = function () {
         if (this.read_only) return;
-        var cont = IPython.Cell.prototype.unrender.apply(this);
+        var cont = Cell.prototype.unrender.apply(this);
         if (cont) {
             var text_cell = this.element;
             var output = text_cell.find("div.text_cell_render");
@@ -191,7 +179,7 b' var IPython = (function (IPython) {'
      * @method fromJSON
      */
     TextCell.prototype.fromJSON = function (data) {
-        IPython.Cell.prototype.fromJSON.apply(this, arguments);
+        Cell.prototype.fromJSON.apply(this, arguments);
         if (data.cell_type === this.cell_type) {
             if (data.source !== undefined) {
                 this.set_text(data.source);
@@ -211,7 +199,7 b' var IPython = (function (IPython) {'
      * @return {object} cell data serialised to json
      */
     TextCell.prototype.toJSON = function () {
-        var data = IPython.Cell.prototype.toJSON.apply(this);
+        var data = Cell.prototype.toJSON.apply(this);
         data.source = this.get_text();
         if (data.source == this.placeholder) {
             data.source = "";
@@ -245,17 +233,17 b' var IPython = (function (IPython) {'
      * @method render
      */
     MarkdownCell.prototype.render = function () {
-        var cont = IPython.TextCell.prototype.render.apply(this);
+        var cont = TextCell.prototype.render.apply(this);
         if (cont) {
             var text = this.get_text();
             var math = null;
             if (text === "") { text = this.placeholder; }
-            var text_and_math = IPython.mathjaxutils.remove_math(text);
+            var text_and_math = this.mathjaxutils.remove_math(text);
             text = text_and_math[0];
             math = text_and_math[1];
             var html = marked.parser(marked.lexer(text));
-            html = IPython.mathjaxutils.replace_math(html, math);
-            html = security.sanitize_html(html);
+            html = this.mathjaxutils.replace_math(html, math);
+            html = Security.sanitize_html(html);
             html = $($.parseHTML(html));
             // links in markdown cells should open in new tabs
             html.find("a[href]").not('[href^="#"]').attr("target", "_blank");
@@ -273,7 +261,7 b' var IPython = (function (IPython) {'
     /**
      * @class RawCell
      * @constructor RawCell
-     * @extends IPython.TextCell
+     * @extends TextCell
      */
     var RawCell = function (options) {
 
@@ -309,12 +297,12 b' var IPython = (function (IPython) {'
      * @method auto_highlight
      */
     RawCell.prototype.auto_highlight = function () {
-        this._auto_highlight(IPython.config.raw_cell_highlight);
+        this._auto_highlight(config.raw_cell_highlight);
     };
 
     /** @method render **/
     RawCell.prototype.render = function () {
-        var cont = IPython.TextCell.prototype.render.apply(this);
+        var cont = TextCell.prototype.render.apply(this);
         if (cont){
             var text = this.get_text();
             if (text === "") { text = this.placeholder; }
@@ -327,12 +315,12 b' var IPython = (function (IPython) {'
 
     /**
      * @class HeadingCell
-     * @extends IPython.TextCell
+     * @extends TextCell
      */
 
     /**
      * @constructor HeadingCell
-     * @extends IPython.TextCell
+     * @extends TextCell
      */
     var HeadingCell = function (options) {
         options = this.mergeopt(HeadingCell, options);
@@ -412,22 +400,21 b' var IPython = (function (IPython) {'
         return r.children().first().html();
     };
 
-
     HeadingCell.prototype.render = function () {
-        var cont = IPython.TextCell.prototype.render.apply(this);
+        var cont = TextCell.prototype.render.apply(this);
         if (cont) {
             var text = this.get_text();
             var math = null;
             // Markdown headings must be a single line
             text = text.replace(/\n/g, ' ');
             if (text === "") { text = this.placeholder; }
-            text = Array(this.level + 1).join("#") + " " + text;
-            var text_and_math = IPython.mathjaxutils.remove_math(text);
+            text = new Array(this.level + 1).join("#") + " " + text;
+            var text_and_math = this.mathjaxutils.remove_math(text);
             text = text_and_math[0];
             math = text_and_math[1];
             var html = marked.parser(marked.lexer(text));
-            html = IPython.mathjaxutils.replace_math(html, math);
-            html = security.sanitize_html(html);
+            html = this.mathjaxutils.replace_math(html, math);
+            html = Security.sanitize_html(html);
             var h = $($.parseHTML(html));
             // add id and linkback anchor
             var hash = h.text().replace(/ /g, '-');
@@ -446,14 +433,17 b' var IPython = (function (IPython) {'
         return cont;
     };
 
-//  TODO: RETURN IN THIS NAMESPACE!
+    // Backwards compatability.
     IPython.TextCell = TextCell;
     IPython.MarkdownCell = MarkdownCell;
     IPython.RawCell = RawCell;
     IPython.HeadingCell = HeadingCell;
 
-
-    return IPython;
-
-}(IPython));
-
+    Cells = {
+        'TextCell': TextCell,
+        'MarkdownCell': MarkdownCell,
+        'RawCell': RawCell,
+        'HeadingCell': HeadingCell,
+    };
+    return Cells;
+});

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

@@ -1,20 +1,10 b''
-//----------------------------------------------------------------------------
-//  Copyright (C) 2008 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.
-//----------------------------------------------------------------------------
+// Copyright (c) IPython Development Team.
+// Distributed under the terms of the Modified BSD License.
 
-//============================================================================
-// ToolBar
-//============================================================================
-/**
- * @module IPython
- * @namespace IPython
- * @submodule ToolBar
- */
-
-var IPython = (function (IPython) {
+define([
+    'base/js/namespace',
+    'components/jquery/jquery.min',
+], function(IPython, $) {
     "use strict";
 
     /**
@@ -23,8 +13,9 b' var IPython = (function (IPython) {'
      * @constructor
      * @param {Dom object} selector
      */
-    var ToolBar = function (selector) {
+    var ToolBar = function (selector, layout_manager) {
         this.selector = selector;
+        this.layout_manager = layout_manager;
         if (this.selector !== undefined) {
             this.element = $(selector);
             this.style();
@@ -98,14 +89,13 b' var IPython = (function (IPython) {'
      */
     ToolBar.prototype.toggle = function () {
         this.element.toggle();
-        if (IPython.layout_manager !== undefined) {
-            IPython.layout_manager.do_resize();
+        if (this.layout_manager !== undefined) {
+            this.layout_manager.do_resize();
         }
     };
 
-
+    // Backwards compatability.
     IPython.ToolBar = ToolBar;
 
-    return IPython;
-
-}(IPython));
+    return Toolbar;
+});

IPython/html/static/tree/js/main.js

@@ -33,7 +33,7 b' require(['
         base_url: Utils.get_body_data("baseUrl"),
         notebook_path: Utils.get_body_data("notebookPath"),
     };
-    events = new Events();
+    events = $([new Events()]);
     session_list = new SesssionList(opts, events);
     notebook_list = new NotebookList('#notebook_list', opts, undefined, session_list);
     cluster_list = new ClusterList('#cluster_list', opts);