fixing some bugs after rebase

IPython/html/services/notebooks/handlers.py

@@ -118,7 +118,7 class NotebookHandler(IPythonHandler):
     def delete(self, notebook_path):
         nbm = self.notebook_manager
         name, path = nbm.named_notebook_path(notebook_path)
-        self.notebook_manager.delete_notebook(name, path)
+        nbm.delete_notebook(name, path)
         self.set_status(204)
         self.finish()
 

IPython/html/static/tree/js/notebooklist.js

@@ -279,10 +279,10 var IPython = (function (IPython) {
                                     }
                                 };
                                 if (notebooklist.notebookPath() == "") {
-                                    var url = notebooklist.baseProjectUrl() + 'api/notebooks/' + nbname; 
+                                    var url = notebooklist.baseProjectUrl() + 'api/notebooks/' + nbname +'.ipynb'; 
                                 }
                                 else {
-                                    var url = notebooklist.baseProjectUrl() + 'api/notebooks/' + notebooklist.notebookPath() + nbname;
+                                    var url = notebooklist.baseProjectUrl() + 'api/notebooks/' + notebooklist.notebookPath() + nbname + '.ipynb';
                                 }
                                 $.ajax(url, settings);
                             }