mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-02-11 12:30:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

switch notebook.delete to use contentmanager

Browse Source 
Make notebook.delete call contentmanager.delete_notebook
This commit is contained in:
Jeff Hemmelgarn 2014-07-20 10:19:33 -04:00 committed by Thomas Kluyver
parent 728c6f005f
commit 7043aa1b9e
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IPython/html/static/notebook/js/main.js
View File

@ -72,15 +72,16 @@ require([
var save_widget = new savewidget.SaveWidget('span#save_widget', {
events: events,
keyboard_manager: keyboard_manager});
var content_manager = new contentmanager.ContentManager($.extend({
events: events},
common_options));
var notebook = new notebook.Notebook('div#notebook', $.extend({
events: events,
keyboard_manager: keyboard_manager,
save_widget: save_widget,
content_manager: content_manager,
config: user_config},
common_options));
var content_manager = new contentmanager.ContentManager($.extend({
events: events},
common_options));
var login_widget = new loginwidget.LoginWidget('span#login_widget', common_options);
var toolbar = new maintoolbar.MainToolBar('#maintoolbar-container', {
notebook: notebook,
@ -137,6 +138,7 @@ require([
IPython.page = page;
IPython.layout_manager = layout_manager;
IPython.notebook = notebook;
IPython.content_manager = content_manager;
IPython.pager = pager;
IPython.quick_help = quick_help;
IPython.login_widget = login_widget;

17
IPython/html/static/notebook/js/notebook.js
View File

@ -61,6 +61,7 @@ define([
this.notebook_name = options.notebook_name;
this.events = options.events;
this.keyboard_manager = options.keyboard_manager;
this.content_manager = options.content_manager;
this.save_widget = options.save_widget;
this.tooltip = new tooltip.Tooltip(this.events);
this.ws_url = options.ws_url;
@ -2120,21 +2121,7 @@ define([
};
Notebook.prototype.delete = function () {
var that = this;
var settings = {
processData : false,
cache : false,
type : "DELETE",
dataType: "json",
error : utils.log_ajax_error,
};
var url = utils.url_join_encode(
this.base_url,
'api/contents',
this.notebook_path,
this.notebook_name
);
$.ajax(url, settings);
this.content_manager.delete_notebook(this.notebook_name, this.notebook_path, this.base_url);
};