\n" +
"
\n" +
"
\n" +
@@ -148,17 +146,14 @@ define([
NotebookTour.prototype.command_icon_hack = function() {
$('#modal_indicator').css('min-height', 20);
};
-
+
NotebookTour.prototype.toggle_pause_play = function () {
$('#tour-pause').toggleClass('fa-pause fa-play');
};
-
+
NotebookTour.prototype.edit_mode = function() {
this.notebook.focus_cell();
this.notebook.edit_mode();
};
- return {'Tour': NotebookTour};
-
-});
-
+ exports.Tour = NotebookTour;
diff --git a/notebook/static/services/config.js b/notebook/static/services/config.js
index a03dae037..65cd141dd 100644
--- a/notebook/static/services/config.js
+++ b/notebook/static/services/config.js
@@ -1,12 +1,10 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
-
-define([
- 'jquery',
- 'base/js/utils',
- ],
-function($, utils) {
"use strict";
+
+ var $ = require('jquery');
+ var utils = require('base/js/utils');
+
var ConfigSection = function(section_name, options) {
this.section_name = section_name;
this.base_url = options.base_url;
@@ -27,14 +25,14 @@ function($, utils) {
ConfigSection.prototype.api_url = function() {
return utils.url_join_encode(this.base_url, 'api/config', this.section_name);
};
-
+
ConfigSection.prototype._load_done = function() {
if (!this._one_load_finished) {
this._one_load_finished = true;
this._finish_firstload();
}
};
-
+
ConfigSection.prototype.load = function() {
var that = this;
return utils.promising_ajax(this.api_url(), {
@@ -47,7 +45,7 @@ function($, utils) {
return data;
});
};
-
+
/**
* Modify the config values stored. Update the local data immediately,
* send the change to the server, and use the updated data from the server
@@ -69,14 +67,14 @@ function($, utils) {
return data;
});
};
-
-
+
+
var ConfigWithDefaults = function(section, defaults, classname) {
this.section = section;
this.defaults = defaults;
this.classname = classname;
};
-
+
ConfigWithDefaults.prototype._class_data = function() {
if (this.classname) {
return this.section.data[this.classname] || {};
@@ -84,7 +82,7 @@ function($, utils) {
return this.section.data
}
};
-
+
/**
* Wait for config to have loaded, then get a value or the default.
* Returns a promise.
@@ -95,7 +93,7 @@ function($, utils) {
return this._class_data()[key] || this.defaults[key]
});
};
-
+
/**
* Return a config value. If config is not yet loaded, return the default
* instead of waiting for it to load.
@@ -103,7 +101,7 @@ function($, utils) {
ConfigWithDefaults.prototype.get_sync = function(key) {
return this._class_data()[key] || this.defaults[key];
};
-
+
/**
* Set a config value. Send the update to the server, and change our
* local copy of the data immediately.
@@ -121,9 +119,8 @@ function($, utils) {
return this.section.update(d);
}
};
-
- return {ConfigSection: ConfigSection,
- ConfigWithDefaults: ConfigWithDefaults,
- };
-});
+ module.exports = {
+ ConfigSection: ConfigSection,
+ ConfigWithDefaults: ConfigWithDefaults,
+ };
diff --git a/notebook/static/services/contents.js b/notebook/static/services/contents.js
index 64b446b88..a1c5fe1c7 100644
--- a/notebook/static/services/contents.js
+++ b/notebook/static/services/contents.js
@@ -1,7 +1,5 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
-
-define(function(require) {
"use strict";
var $ = require('jquery');
@@ -36,7 +34,7 @@ define(function(require) {
// directory.
this.message = 'A directory must be empty before being deleted.';
};
-
+
Contents.DirectoryNotEmptyError.prototype = Object.create(Error.prototype);
Contents.DirectoryNotEmptyError.prototype.name =
Contents.DIRECTORY_NOT_EMPTY_ERROR;
@@ -173,7 +171,7 @@ define(function(require) {
var url = this.api_url(path);
return utils.promising_ajax(url, settings);
};
-
+
Contents.prototype.copy = function(from_file, to_dir) {
/**
* Copy a file into a given directory via POST
@@ -252,5 +250,4 @@ define(function(require) {
return this.get(path, {type: 'directory'});
};
- return {'Contents': Contents};
-});
+ exports.Contents = Contents;
diff --git a/notebook/static/services/kernels/comm.js b/notebook/static/services/kernels/comm.js
index 85065ddcb..8c1362212 100644
--- a/notebook/static/services/kernels/comm.js
+++ b/notebook/static/services/kernels/comm.js
@@ -1,16 +1,15 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
-define([
- 'jquery',
- 'base/js/utils',
-], function($, utils) {
"use strict";
+ var $ = require('jquery');
+ var utils = require('base/js/utils');
+
//-----------------------------------------------------------------------
// CommManager class
//-----------------------------------------------------------------------
-
+
var CommManager = function (kernel) {
this.comms = {};
this.targets = {};
@@ -18,7 +17,7 @@ define([
this.init_kernel(kernel);
}
};
-
+
CommManager.prototype.init_kernel = function (kernel) {
/**
* connect the kernel, and register message handlers
@@ -30,7 +29,7 @@ define([
kernel.register_iopub_handler(msg_type, $.proxy(this[msg_type], this));
}
};
-
+
CommManager.prototype.new_comm = function (target_name, data, callbacks, metadata, comm_id) {
/**
* Create a new Comm, register it, and open its Kernel-side counterpart
@@ -43,21 +42,21 @@ define([
comm.open(data, callbacks, metadata);
return comm;
};
-
+
CommManager.prototype.register_target = function (target_name, f) {
/**
* Register a target function for a given target name
*/
this.targets[target_name] = f;
};
-
+
CommManager.prototype.unregister_target = function (target_name, f) {
/**
* Unregister a target function for a given target name
*/
delete this.targets[target_name];
};
-
+
CommManager.prototype.register_comm = function (comm) {
/**
* Register a comm in the mapping
@@ -66,16 +65,16 @@ define([
comm.kernel = this.kernel;
return comm.comm_id;
};
-
+
CommManager.prototype.unregister_comm = function (comm) {
/**
* Remove a comm from the mapping
*/
delete this.comms[comm.comm_id];
};
-
+
// comm message handlers
-
+
CommManager.prototype.comm_open = function (msg) {
var content = msg.content;
var that = this;
@@ -100,7 +99,7 @@ define([
}, utils.reject('Could not open comm', true));
return this.comms[comm_id];
};
-
+
CommManager.prototype.comm_close = function(msg) {
var content = msg.content;
if (this.comms[content.comm_id] === undefined) {
@@ -120,7 +119,7 @@ define([
});
return this.comms[content.comm_id];
};
-
+
CommManager.prototype.comm_msg = function(msg) {
var content = msg.content;
if (this.comms[content.comm_id] === undefined) {
@@ -138,17 +137,17 @@ define([
});
return this.comms[content.comm_id];
};
-
+
//-----------------------------------------------------------------------
// Comm base class
//-----------------------------------------------------------------------
-
+
var Comm = function (target_name, comm_id) {
this.target_name = target_name;
this.comm_id = comm_id || utils.uuid();
this._msg_callback = this._close_callback = null;
};
-
+
// methods for sending messages
Comm.prototype.open = function (data, callbacks, metadata) {
var content = {
@@ -158,7 +157,7 @@ define([
};
return this.kernel.send_shell_message("comm_open", content, callbacks, metadata);
};
-
+
Comm.prototype.send = function (data, callbacks, metadata, buffers) {
var content = {
comm_id : this.comm_id,
@@ -166,7 +165,7 @@ define([
};
return this.kernel.send_shell_message("comm_msg", content, callbacks, metadata, buffers);
};
-
+
Comm.prototype.close = function (data, callbacks, metadata) {
var content = {
comm_id : this.comm_id,
@@ -174,22 +173,22 @@ define([
};
return this.kernel.send_shell_message("comm_close", content, callbacks, metadata);
};
-
+
// methods for registering callbacks for incoming messages
Comm.prototype._register_callback = function (key, callback) {
this['_' + key + '_callback'] = callback;
};
-
+
Comm.prototype.on_msg = function (callback) {
this._register_callback('msg', callback);
};
-
+
Comm.prototype.on_close = function (callback) {
this._register_callback('close', callback);
};
-
+
// methods for handling incoming messages
-
+
Comm.prototype._callback = function (key, msg) {
var callback = this['_' + key + '_callback'];
if (callback) {
@@ -200,17 +199,16 @@ define([
}
}
};
-
+
Comm.prototype.handle_msg = function (msg) {
this._callback('msg', msg);
};
-
+
Comm.prototype.handle_close = function (msg) {
this._callback('close', msg);
};
-
- return {
+
+ module.exports = {
'CommManager': CommManager,
'Comm': Comm
};
-});
diff --git a/notebook/static/services/kernels/kernel.js b/notebook/static/services/kernels/kernel.js
index e90dd7f1e..059c89b67 100644
--- a/notebook/static/services/kernels/kernel.js
+++ b/notebook/static/services/kernels/kernel.js
@@ -1,15 +1,13 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
-
-define([
- 'jquery',
- 'base/js/utils',
- './comm',
- './serialize',
- 'base/js/events'
-], function($, utils, comm, serialize, events) {
"use strict";
+ var $ = require('jquery');
+ var utils = require('base/js/utils');
+ var comm = require('./comm');
+ var serialize = require('./serialize');
+ var events = require('base/js/events');
+
/**
* A Kernel class to communicate with the Python kernel. This
* should generally not be constructed directly, but be created
@@ -527,7 +525,7 @@ define([
}
this._schedule_reconnect();
};
-
+
Kernel.prototype._schedule_reconnect = function () {
/**
* function to call when kernel connection is lost
@@ -545,7 +543,7 @@ define([
console.log("Failed to reconnect, giving up.");
}
};
-
+
Kernel.prototype.stop_channels = function () {
/**
* Close the websocket. After successful close, the value
@@ -599,7 +597,7 @@ define([
*/
return (this.ws === null);
};
-
+
Kernel.prototype.send_shell_message = function (msg_type, content, callbacks, metadata, buffers) {
/**
* Send a message on the Kernel's shell channel
@@ -806,7 +804,7 @@ define([
delete this._msg_callbacks[msg_id];
}
};
-
+
/**
* @function _finish_shell
*/
@@ -832,7 +830,7 @@ define([
}
}
};
-
+
/**
* Set callbacks for a particular message.
* Callbacks should be a struct of the following form:
@@ -856,7 +854,7 @@ define([
this.last_msg_callbacks = {};
}
};
-
+
Kernel.prototype._handle_ws_message = function (e) {
var that = this;
this._msg_queue = this._msg_queue.then(function() {
@@ -880,7 +878,7 @@ define([
console.error("unrecognized message channel", msg.channel, msg);
}
};
-
+
Kernel.prototype._handle_shell_reply = function (reply) {
this.events.trigger('shell_reply.Kernel', {kernel: this, reply:reply});
var that = this;
@@ -977,7 +975,7 @@ define([
this._kernel_dead();
}
};
-
+
/**
* Handle clear_output message
*
@@ -1060,5 +1058,4 @@ define([
}
};
- return {'Kernel': Kernel};
-});
+ exports.Kernel = Kernel;
diff --git a/notebook/static/services/kernels/serialize.js b/notebook/static/services/kernels/serialize.js
index a0bfd7ad8..2bcf7e704 100644
--- a/notebook/static/services/kernels/serialize.js
+++ b/notebook/static/services/kernels/serialize.js
@@ -1,11 +1,9 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
-
-define([
- 'underscore',
- ], function (_) {
"use strict";
-
+
+ var _ = require('underscore');
+
var _deserialize_array_buffer = function (buf) {
var data = new DataView(buf);
// read the header: 1 + nbufs 32b integers
@@ -29,7 +27,7 @@ define([
}
return msg;
};
-
+
var _deserialize_binary = function(data) {
/**
* deserialize the binary message format
@@ -66,7 +64,7 @@ define([
return Promise.resolve(_deserialize_binary(data));
}
};
-
+
var _serialize_binary = function (msg) {
/**
* implement the binary serialization protocol
@@ -109,7 +107,7 @@ define([
// return raw ArrayBuffer
return msg_buf.buffer;
};
-
+
var serialize = function (msg) {
if (msg.buffers && msg.buffers.length) {
return _serialize_binary(msg);
@@ -117,10 +115,8 @@ define([
return JSON.stringify(msg);
}
};
-
- var exports = {
+
+ module.exports = {
deserialize : deserialize,
serialize: serialize
};
- return exports;
-});
diff --git a/notebook/static/services/sessions/session.js b/notebook/static/services/sessions/session.js
index e36491803..d26d4d0bd 100644
--- a/notebook/static/services/sessions/session.js
+++ b/notebook/static/services/sessions/session.js
@@ -1,13 +1,11 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
-
-define([
- 'jquery',
- 'base/js/utils',
- 'services/kernels/kernel',
-], function($, utils, kernel) {
"use strict";
+ var $ = require('jquery');
+ var utils = require('base/js/utils');
+ var kernel = require('services/kernels/kernel');
+
/**
* Session object for accessing the session REST api. The session
* should be used to start kernels and then shut them down -- for
@@ -311,11 +309,10 @@ define([
this.name = "SessionAlreadyStarting";
this.message = (message || "");
};
-
+
SessionAlreadyStarting.prototype = Error.prototype;
-
- return {
+
+ module.exports = {
Session: Session,
SessionAlreadyStarting: SessionAlreadyStarting
};
-});
diff --git a/notebook/static/terminal/js/main.js b/notebook/static/terminal/js/main.js
index 84ec2f599..a9b9caf6f 100644
--- a/notebook/static/terminal/js/main.js
+++ b/notebook/static/terminal/js/main.js
@@ -1,23 +1,15 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
-
-require([
- 'jquery',
- 'termjs',
- 'base/js/utils',
- 'base/js/page',
- 'services/config',
- 'terminal/js/terminado',
- 'custom/custom',
-], function(
- $,
- termjs,
- utils,
- page,
- configmod,
- terminado
- ){
"use strict";
+
+ var $ = require('jquery');
+ var termjs = require('termjs');
+ var utils = require('base/js/utils');
+ var page = require('base/js/page');
+ var configmod = require('services/config');
+ var terminado = require('terminal/js/terminado');
+ require('custom/custom');
+
page = new page.Page();
var common_config = new configmod.ConfigSection('common',
@@ -33,7 +25,7 @@ require([
var ws_path = utils.get_body_data('wsPath');
var ws_url = location.protocol.replace('http', 'ws') + "//" + location.host
+ base_url + ws_path;
-
+
var header = $("#header")[0]
function calculate_size() {
var height = $(window).height() - header.offsetHeight;
@@ -43,16 +35,16 @@ require([
console.log("resize to :", rows , 'rows by ', cols, 'columns');
return {rows: rows, cols: cols};
}
-
+
page.show_header();
-
+
var size = calculate_size();
var terminal = terminado.make_terminal($("#terminado-container")[0], size, ws_url);
-
+
page.show_site();
-
+
utils.load_extensions_from_config(common_config);
-
+
window.onresize = function() {
var geom = calculate_size();
terminal.term.resize(geom.cols, geom.rows);
@@ -62,5 +54,3 @@ require([
// Expose terminal for fiddling with in the browser
window.terminal = terminal;
-
-});
diff --git a/notebook/static/terminal/js/terminado.js b/notebook/static/terminal/js/terminado.js
index 5192f713f..62be993ea 100644
--- a/notebook/static/terminal/js/terminado.js
+++ b/notebook/static/terminal/js/terminado.js
@@ -1,6 +1,8 @@
-define ([], function() {
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
"use strict";
- function make_terminal(element, size, ws_url) {
+
+ exports.make_terminal = function(element, size, ws_url) {
var ws = new WebSocket(ws_url);
Terminal.brokenBold = true;
var term = new Terminal({
@@ -36,6 +38,3 @@ define ([], function() {
};
return {socket: ws, term: term};
}
-
- return {make_terminal: make_terminal};
-});
diff --git a/notebook/static/tree/js/kernellist.js b/notebook/static/tree/js/kernellist.js
index 8b2e8f837..05183f8ee 100644
--- a/notebook/static/tree/js/kernellist.js
+++ b/notebook/static/tree/js/kernellist.js
@@ -1,13 +1,11 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
-
-define([
- 'base/js/namespace',
- 'jquery',
- 'tree/js/notebooklist',
-], function(IPython, $, notebooklist) {
"use strict";
+ var IPython = require('base/js/namespace');
+ var $ = require('jquery');
+ var notebooklist = require('tree/js/notebooklist');
+
var KernelList = function (selector, options) {
/**
* Constructor
@@ -32,7 +30,7 @@ define([
* do nothing
*/
};
-
+
KernelList.prototype.sessions_loaded = function (d) {
this.sessions = d;
this.clear_list();
@@ -68,9 +66,8 @@ define([
})
.appendTo(running_indicator);
};
-
+
// Backwards compatability.
IPython.KernelList = KernelList;
- return {'KernelList': KernelList};
-});
+ exports.KernelList = KernelList;
diff --git a/notebook/static/tree/js/main.js b/notebook/static/tree/js/main.js
index 8f49be739..644ffd7df 100644
--- a/notebook/static/tree/js/main.js
+++ b/notebook/static/tree/js/main.js
@@ -1,46 +1,30 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
-
-require([
- 'jquery',
- 'base/js/namespace',
- 'base/js/dialog',
- 'base/js/events',
- 'base/js/page',
- 'base/js/utils',
- 'services/config',
- 'contents',
- 'tree/js/notebooklist',
- 'tree/js/sessionlist',
- 'tree/js/kernellist',
- 'tree/js/terminallist',
- 'tree/js/newnotebook',
- 'auth/js/loginwidget',
- // only loaded, not used:
- 'jqueryui',
- 'bootstrap',
- 'custom/custom',
-], function(
- $,
- IPython,
- dialog,
- events,
- page,
- utils,
- config,
- contents_service,
- notebooklist,
- sesssionlist,
- kernellist,
- terminallist,
- newnotebook,
- loginwidget){
"use strict";
+ var $ = require('jquery');
+ var IPython = require('base/js/namespace');
+ var dialog = require('base/js/dialog');
+ var events = require('base/js/events');
+ var page = require('base/js/page');
+ var utils = require('base/js/utils');
+ var config = require('services/config');
+ var contents_service = require('contents');
+ var notebooklist = require('tree/js/notebooklist');
+ var sesssionlist = require('tree/js/sessionlist');
+ var kernellist = require('tree/js/kernellist');
+ var terminallist = require('tree/js/terminallist');
+ var newnotebook = require('tree/js/newnotebook');
+ var loginwidget = require('auth/js/loginwidget');
+
+ require('jqueryui');
+ require('bootstrap');
+ require('custom/custom');
+
IPython.NotebookList = notebooklist.NotebookList;
page = new page.Page();
-
+
var common_options = {
base_url: utils.get_body_data("baseUrl"),
notebook_path: utils.get_body_data("notebookPath"),
@@ -65,7 +49,7 @@ require([
var kernel_list = new kernellist.KernelList('#running_list', $.extend({
session_list: session_list},
common_options));
-
+
var terminal_list;
if (utils.get_body_data("terminalsAvailable") === "True") {
terminal_list = new terminallist.TerminalList('#terminal_list', common_options);
@@ -148,12 +132,12 @@ require([
events.trigger('app_initialized.DashboardApp');
utils.load_extensions_from_config(cfg);
utils.load_extensions_from_config(common_config);
-
+
// bound the upload method to the on change of the file select list
$("#alternate_upload").change(function (event){
notebook_list.handleFilesUpload(event,'form');
});
-
+
// set hash on tab click
$("#tabs").find("a").click(function(e) {
// Prevent the document from jumping when the active tab is changed to a
@@ -169,9 +153,8 @@ require([
window.location.hash = hash;
}
});
-
+
// load tab if url hash
if (window.location.hash) {
$("#tabs").find("a[href=" + window.location.hash + "]").click();
}
-});
diff --git a/notebook/static/tree/js/newnotebook.js b/notebook/static/tree/js/newnotebook.js
index b2088887b..a2d088f0b 100644
--- a/notebook/static/tree/js/newnotebook.js
+++ b/notebook/static/tree/js/newnotebook.js
@@ -1,14 +1,12 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
-
-define([
- 'jquery',
- 'base/js/namespace',
- 'base/js/utils',
- 'base/js/dialog',
-], function ($, IPython, utils, dialog) {
"use strict";
-
+
+ var $ = require('jquery');
+ var IPython = require('base/js/namespace');
+ var utils = require('base/js/utils');
+ var dialog = require('base/js/dialog');
+
var NewNotebookWidget = function (selector, options) {
this.selector = selector;
this.base_url = options.base_url;
@@ -22,20 +20,20 @@ define([
}
this.bind_events();
};
-
+
NewNotebookWidget.prototype.bind_events = function () {
var that = this;
this.element.find('#new_notebook').click(function () {
that.new_notebook();
});
};
-
+
NewNotebookWidget.prototype.request_kernelspecs = function () {
/** request and then load kernel specs */
var url = utils.url_join_encode(this.base_url, 'api/kernelspecs');
utils.promising_ajax(url).then($.proxy(this._load_kernelspecs, this));
};
-
+
NewNotebookWidget.prototype._load_kernelspecs = function (data) {
/** load kernelspec list */
var that = this;
@@ -70,7 +68,7 @@ define([
menu.after(li);
}
};
-
+
NewNotebookWidget.prototype.new_notebook = function (kernel_name) {
/** create and open a new notebook */
var that = this;
@@ -100,6 +98,5 @@ define([
});
});
};
-
- return {'NewNotebookWidget': NewNotebookWidget};
-});
+
+ exports.NewNotebookWidget = NewNotebookWidget;
diff --git a/notebook/static/tree/js/notebooklist.js b/notebook/static/tree/js/notebooklist.js
index 1ef1a5228..e8284bab0 100644
--- a/notebook/static/tree/js/notebooklist.js
+++ b/notebook/static/tree/js/notebooklist.js
@@ -1,16 +1,14 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
-
-define([
- 'base/js/namespace',
- 'jquery',
- 'base/js/utils',
- 'base/js/dialog',
- 'base/js/events',
- 'base/js/keyboard',
-], function(IPython, $, utils, dialog, events, keyboard) {
"use strict";
-
+
+ var IPython = require('base/js/namespace');
+ var $ = require('jquery');
+ var utils = require('base/js/utils');
+ var dialog = require('base/js/dialog');
+ var events = require('base/js/events');
+ var keyboard = require('base/js/keyboard');
+
var NotebookList = function (selector, options) {
/**
* Constructor
@@ -883,5 +881,4 @@ define([
.append(cancel_button);
};
- return {'NotebookList': NotebookList};
-});
+ exports.NotebookList = NotebookList;
diff --git a/notebook/static/tree/js/sessionlist.js b/notebook/static/tree/js/sessionlist.js
index 129d668ed..b6c076011 100644
--- a/notebook/static/tree/js/sessionlist.js
+++ b/notebook/static/tree/js/sessionlist.js
@@ -1,12 +1,10 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
-
-define([
- 'jquery',
- 'base/js/utils',
-], function($, utils) {
"use strict";
+ var $ = require('jquery');
+ var utils = require('base/js/utils');
+
var SesssionList = function (options) {
/**
* Constructor
@@ -51,7 +49,7 @@ define([
});
});
};
-
+
SesssionList.prototype.load_sessions = function(){
var that = this;
var settings = {
@@ -77,5 +75,4 @@ define([
this.events.trigger('sessions_loaded.Dashboard', this.sessions);
};
- return {'SesssionList': SesssionList};
-});
+ exports.SesssionList = SesssionList;
diff --git a/notebook/static/tree/js/terminallist.js b/notebook/static/tree/js/terminallist.js
index 13952bf8e..707a0d214 100644
--- a/notebook/static/tree/js/terminallist.js
+++ b/notebook/static/tree/js/terminallist.js
@@ -1,14 +1,12 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
-
-define([
- 'base/js/namespace',
- 'base/js/utils',
- 'jquery',
- 'tree/js/notebooklist',
-], function(IPython, utils, $, notebooklist) {
"use strict";
+ var IPython = require('base/js/namespace');
+ var utils = require('base/js/utils');
+ var $ = require('jquery');
+ var notebooklist = require('tree/js/notebooklist');
+
var TerminalList = function (selector, options) {
/**
* Constructor
@@ -62,7 +60,7 @@ define([
);
$.ajax(url, settings);
};
-
+
TerminalList.prototype.load_terminals = function() {
var url = utils.url_join_encode(this.base_url, 'api/terminals');
$.ajax(url, {
@@ -86,7 +84,7 @@ define([
}
$('#terminal_list_header').toggle(data.length === 0);
};
-
+
TerminalList.prototype.add_link = function(name, item) {
item.data('term-name', name);
item.find(".item_name").text("terminals/" + name);
@@ -96,7 +94,7 @@ define([
link.attr('target', IPython._target||'_blank');
this.add_shutdown_button(name, item);
};
-
+
TerminalList.prototype.add_shutdown_button = function(name, item) {
var that = this;
var shutdown_button = $("").text("Shutdown").addClass("btn btn-xs btn-warning").
@@ -117,5 +115,4 @@ define([
item.find(".item_buttons").text("").append(shutdown_button);
};
- return {TerminalList: TerminalList};
-});
+ exports.TerminalList = TerminalList;