##// END OF EJS Templates
Merge remote-tracking branch 'public-upstream/master' into links-rebase...
Merge remote-tracking branch 'public-upstream/master' into links-rebase Conflicts: examples/Interactive Widgets/Widget Events.ipynb

File last commit:

r19176:f48e011c
r19202:bab26ab3 merge
Show More
kernellist.js
59 lines | 1.6 KiB | application/javascript | JavascriptLexer
Jonathan Frederic
Finished making tree.html requirejs friendly
r17190 // Copyright (c) IPython Development Team.
// Distributed under the terms of the Modified BSD License.
define([
'base/js/namespace',
Jonathan Frederic
MWE,...
r17200 'jquery',
Jonathan Frederic
Finished making tree.html requirejs friendly
r17190 'tree/js/notebooklist',
Jonathan Frederic
Fix imports of "modules",...
r17202 ], function(IPython, $, notebooklist) {
Paul Ivanov
minimal KernelList
r15382 "use strict";
jon
In person review with @ellisonbg
r17210 var KernelList = function (selector, options) {
Jonathan Frederic
Ran function comment conversion tool
r19176 /**
* Constructor
*
* Parameters:
* selector: string
* options: dictionary
* Dictionary of keyword arguments.
* session_list: SessionList instance
* base_url: string
* notebook_path: string
*/
jon
In person review with @ellisonbg
r17210 notebooklist.NotebookList.call(this, selector, $.extend({
MinRK
updates per review...
r17535 element_name: 'running'},
jon
In person review with @ellisonbg
r17210 options));
Paul Ivanov
minimal KernelList
r15382 };
Jonathan Frederic
Fix all the bugs!
r17203 KernelList.prototype = Object.create(notebooklist.NotebookList.prototype);
Paul Ivanov
minimal KernelList
r15382
Min RK
update add_duplicate_button with API changes...
r18928 KernelList.prototype.add_duplicate_button = function () {
Jonathan Frederic
Ran function comment conversion tool
r19176 /**
* do nothing
*/
Min RK
update add_duplicate_button with API changes...
r18928 };
Paul Ivanov
ok, Running tab is working now
r15454 KernelList.prototype.sessions_loaded = function (d) {
Paul Ivanov
added IPython.session_list...
r15479 this.sessions = d;
Paul Ivanov
ok, Running tab is working now
r15454 this.clear_list();
Min RK
update add_duplicate_button with API changes...
r18928 var item, path;
for (path in d) {
if (!d.hasOwnProperty(path)) {
MinRK
updates per review...
r17535 // nothing is safe in javascript
continue;
}
item = this.new_item(-1);
this.add_link({
Min RK
update add_duplicate_button with API changes...
r18928 name: path,
path: path,
MinRK
updates per review...
r17535 type: 'notebook',
}, item);
Paul Ivanov
ok, Running tab is working now
r15454 }
Paul Ivanov
use explicit running header name + jquery's toggle
r15512 $('#running_list_header').toggle($.isEmptyObject(d));
Jonathan Frederic
Finished making tree.html requirejs friendly
r17190 };
Paul Ivanov
ok, Running tab is working now
r15454
Jonathan Frederic
Finished making tree.html requirejs friendly
r17190 // Backwards compatability.
Paul Ivanov
minimal KernelList
r15382 IPython.KernelList = KernelList;
Jonathan Frederic
Return dicts instead of classes,...
r17201 return {'KernelList': KernelList};
Jonathan Frederic
Finished making tree.html requirejs friendly
r17190 });