From 3b2ce2032320fdc68f48b3bf1d22320bcc81d7f9 2014-11-03 18:17:12
From: KesterTong <kestert@google.com>
Date: 2014-11-03 18:17:12
Subject: [PATCH] Removes unnecessary parameter from ContentManager.delete_notebook

---

diff --git a/IPython/html/static/base/js/contentmanager.js b/IPython/html/static/base/js/contentmanager.js
index 49fc9a4..a764e57 100644
--- a/IPython/html/static/base/js/contentmanager.js
+++ b/IPython/html/static/base/js/contentmanager.js
@@ -74,16 +74,16 @@ define([
         $.ajax(url,settings);
     };
 
-    ContentManager.prototype.delete_notebook = function(name, path, base_url) {
+    ContentManager.prototype.delete_notebook = function(name, path) {
         var settings = {
             processData : false,
             cache : false,
             type : "DELETE",
-            dataType: "json",
+            dataType : "json",
             error : utils.log_ajax_error,
         };
         var url = utils.url_join_encode(
-            base_url,
+            this.base_url,
             'api/notebooks',
             path,
             name
diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index 0f3fc3b..3ae490d 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -2065,7 +2065,7 @@ define([
     };
 
     Notebook.prototype.delete = function () {
-        this.content_manager.delete_notebook(this.notebook_name, this.notebook_path, this.base_url);
+        this.content_manager.delete_notebook(this.notebook_name, this.notebook_path);
     };
 
     Notebook.prototype.rename_success = function (json, status, xhr) {
diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js
index e1219dd..83275fc 100644
--- a/IPython/html/static/tree/js/notebooklist.js
+++ b/IPython/html/static/tree/js/notebooklist.js
@@ -332,7 +332,6 @@ define([
                 var parent_item = that.parents('div.list_item');
                 var nbname = parent_item.data('nbname');
                 var path = parent_item.data('path');
-                var base_url = utils.get_body_data("baseUrl");
                 var message = 'Are you sure you want to permanently delete the notebook: ' + nbname + '?';
                 dialog.modal({
                     title : "Delete file",
@@ -341,7 +340,7 @@ define([
                         Delete : {
                             class: "btn-danger",
                             click: function() {
-                                notebooklist.content_manager.delete_notebook(nbname, path, base_url);
+                                notebooklist.content_manager.delete_notebook(nbname, path);
                             }
                         },
                         Cancel : {}