diff --git a/IPython/html/base/handlers.py b/IPython/html/base/handlers.py index d32e1de..a52f1d6 100644 --- a/IPython/html/base/handlers.py +++ b/IPython/html/base/handlers.py @@ -141,8 +141,7 @@ class IPythonHandler(AuthenticatedHandler): def contents_js_source(self): self.log.debug("Using contents: %s", self.settings.get('contents_js_source', 'services/contents')) - return self.settings.get('contents_js_source', - 'services/contents') + return self.settings.get('contents_js_source', 'services/contents') #--------------------------------------------------------------- # Manager objects diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js index 8a774f5..fdc1c61 100644 --- a/IPython/html/static/notebook/js/notebook.js +++ b/IPython/html/static/notebook/js/notebook.js @@ -1908,7 +1908,7 @@ define([ var content = $.extend(this.toJSON(), { nbformat : this.nbformat, nbformat_minor : this.nbformat_minor - }) + }); // Create a JSON model to be sent to the server. var model = { name : this.notebook_name, diff --git a/IPython/html/static/tree/js/main.js b/IPython/html/static/tree/js/main.js index 777f271..1f53a7f 100644 --- a/IPython/html/static/tree/js/main.js +++ b/IPython/html/static/tree/js/main.js @@ -59,7 +59,7 @@ require([ login_widget = new loginwidget.LoginWidget('#login_widget', common_options); - $('#new_notebook').button().click(function (e) { + $('#new_notebook').click(function (e) { contents.new_notebook(common_options.notebook_path, { success: function (data, status, xhr) { diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js index 2b5fba4..c54c60e 100644 --- a/IPython/html/static/tree/js/notebooklist.js +++ b/IPython/html/static/tree/js/notebooklist.js @@ -321,9 +321,9 @@ define([ // We use the filename from the parent list_item element's // data because the outer scope's values change as we iterate through the loop. var parent_item = that.parents('div.list_item'); - var nbname = parent_item.data('nbname'); + var name = parent_item.data('nbname'); var path = parent_item.data('path'); - var message = 'Are you sure you want to permanently delete the notebook: ' + nbname + '?'; + var message = 'Are you sure you want to permanently delete the file: ' + nbname + '?'; dialog.modal({ title : "Delete file", body : message, @@ -331,9 +331,9 @@ define([ Delete : { class: "btn-danger", click: function() { - notebooklist.contents.delete_file(nbname, path, { + notebooklist.contents.delete_file(name, path, { success: function() { - notebooklist.notebook_deleted(path, nbname); + notebooklist.notebook_deleted(path, name); } }); }