From 5b5e19408209ddc0998f9fcb5d0c73452bf954f3 Mon Sep 17 00:00:00 2001
From: Jeff Hemmelgarn <jhemmelg@gmail.com>
Date: Sun, 20 Jul 2014 15:10:35 -0400
Subject: [PATCH] Move notebook.rename to contentmanager

Make notebook.rename call contentmanager.rename
---
 IPython/html/static/base/js/contentmanager.js | 14 +++++------
 IPython/html/static/notebook/js/notebook.js   | 25 +------------------
 2 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/IPython/html/static/base/js/contentmanager.js b/IPython/html/static/base/js/contentmanager.js
index 367c5e128..a784bebe2 100644
--- a/IPython/html/static/base/js/contentmanager.js
+++ b/IPython/html/static/base/js/contentmanager.js
@@ -103,16 +103,16 @@ define([
             type : "PATCH",
             data : JSON.stringify(data),
             dataType: "json",
-            headers : {'Content-Type': 'application/json'},
-            success : $.proxy(that.rename_success, this),
-            error : $.proxy(that.rename_error, this)
+            contentType: 'application/json',
+            success : $.proxy(that.rename_success, that),
+            error : $.proxy(that.rename_error, that)
         };
         this.events.trigger('rename_notebook.Notebook', data);
         var url = utils.url_join_encode(
-            this.base_url,
+            that.base_url,
             'api/notebooks',
-            this.notebook_path,
-            this.notebook_name
+            that.notebook_path,
+            that.notebook_name
         );
         $.ajax(url, settings);
     };
@@ -133,7 +133,7 @@ define([
             cache : false,
             type : "PUT",
             data : JSON.stringify(model),
-            headers : {'Content-Type': 'application/json'},
+            contentType: 'application/json',
             success : $.proxy(notebook.save_notebook_success, this, start),
             error : $.proxy(notebook.save_notebook_error, this)
         };
diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index f094d9bd6..6044a4d4e 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -2095,36 +2095,13 @@ define([
     };
 
     Notebook.prototype.rename = function (nbname) {
-        var that = this;
-        if (!nbname.match(/\.ipynb$/)) {
-            nbname = nbname + ".ipynb";
-        }
-        var data = {name: nbname};
-        var settings = {
-            processData : false,
-            cache : false,
-            type : "PATCH",
-            data : JSON.stringify(data),
-            dataType: "json",
-            contentType: 'application/json',
-            success : $.proxy(that.rename_success, this),
-            error : $.proxy(that.rename_error, this)
-        };
-        this.events.trigger('rename_notebook.Notebook', data);
-        var url = utils.url_join_encode(
-            this.base_url,
-            'api/contents',
-            this.notebook_path,
-            this.notebook_name
-        );
-        $.ajax(url, settings);
+        this.content_manager.rename_notebook(this, nbname);
     };
 
     Notebook.prototype.delete = function () {
         this.content_manager.delete_notebook(this.notebook_name, this.notebook_path, this.base_url);
     };
 
-    
     Notebook.prototype.rename_success = function (json, status, xhr) {
         var name = this.notebook_name = json.name;
         var path = json.path;