From e93d4a9308e2914ffd4f77a383093e22b70df4dd Mon Sep 17 00:00:00 2001
From: Brian Granger <ellisonbg@gmail.com>
Date: Wed, 18 Jan 2012 23:33:07 -0800
Subject: [PATCH 1/2] Minor, but important fixes to cut/copy/paste.

When enabling paste, I was adding the click callback multiple
times causing paste to overwrite multiple cells. I also found
a bug that was doing paste above instead of paste below.
---
 .../html/notebook/static/js/notebook.js       | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/js/notebook.js b/IPython/frontend/html/notebook/static/js/notebook.js
index 15b5fd61c..4f37669e8 100644
--- a/IPython/frontend/html/notebook/static/js/notebook.js
+++ b/IPython/frontend/html/notebook/static/js/notebook.js
@@ -21,6 +21,7 @@ var IPython = (function (IPython) {
         this.next_prompt_number = 1;
         this.kernel = null;
         this.clipboard = null;
+        this.paste_enabled = false;
         this.dirty = false;
         this.msg_cell_map = {};
         this.metadata = {};
@@ -583,23 +584,30 @@ var IPython = (function (IPython) {
 
     Notebook.prototype.enable_paste = function () {
         var that = this;
-        $('#paste_cell').removeClass('ui-state-disabled')
-            .on('click', function () {that.paste_cell();});
-        $('#paste_cell_above').removeClass('ui-state-disabled')
-            .on('click', function () {that.paste_cell_above();});
-        $('#paste_cell_below').removeClass('ui-state-disabled')
-            .on('click', function () {that.paste_cell_below();});
+        if (!this.paste_enabled) {
+            $('#paste_cell').removeClass('ui-state-disabled')
+                .on('click', function () {that.paste_cell();});
+            $('#paste_cell_above').removeClass('ui-state-disabled')
+                .on('click', function () {that.paste_cell_above();});
+            $('#paste_cell_below').removeClass('ui-state-disabled')
+                .on('click', function () {that.paste_cell_below();});
+            this.paste_enabled = true;
+        };
     };
 
 
     Notebook.prototype.disable_paste = function () {
-        $('#paste_cell').addClass('ui-state-disabled').off('click');
-        $('#paste_cell_above').addClass('ui-state-disabled').off('click');
-        $('#paste_cell_below').addClass('ui-state-disabled').off('click');
+        if (this.paste_enabled) {
+            $('#paste_cell').addClass('ui-state-disabled').off('click');
+            $('#paste_cell_above').addClass('ui-state-disabled').off('click');
+            $('#paste_cell_below').addClass('ui-state-disabled').off('click');
+            this.paste_enabled = false;
+        };
     };
 
 
     Notebook.prototype.cut_cell = function () {
+        console.log('cut_cell');
         this.copy_cell();
         this.delete_cell();
     }
@@ -612,7 +620,8 @@ var IPython = (function (IPython) {
 
 
     Notebook.prototype.paste_cell = function () {
-        if (this.clipboard !== null) {
+        console.log('paste_cell');
+        if (this.clipboard !== null && this.paste_enabled) {
             var cell_data = this.clipboard;
             if (cell_data.cell_type == 'code') {
                 new_cell = this.insert_code_cell_above();
@@ -624,14 +633,14 @@ var IPython = (function (IPython) {
                 new_cell = this.insert_markdown_cell_above();
                 new_cell.fromJSON(cell_data);
             };
+            this.select_next();
+            this.delete_cell();
         };
-        this.select_next();
-        this.delete_cell();
     };
 
 
     Notebook.prototype.paste_cell_above = function () {
-        if (this.clipboard !== null) {
+        if (this.clipboard !== null && this.paste_enabled) {
             var cell_data = this.clipboard;
             if (cell_data.cell_type == 'code') {
                 new_cell = this.insert_code_cell_above();
@@ -648,16 +657,16 @@ var IPython = (function (IPython) {
 
 
     Notebook.prototype.paste_cell_below = function () {
-        if (this.clipboard !== null) {
+        if (this.clipboard !== null && this.paste_enabled) {
             var cell_data = this.clipboard;
             if (cell_data.cell_type == 'code') {
-                new_cell = this.insert_code_cell_above();
+                new_cell = this.insert_code_cell_below();
                 new_cell.fromJSON(cell_data);
             } else if (cell_data.cell_type === 'html') {
-                new_cell = this.insert_html_cell_above();
+                new_cell = this.insert_html_cell_below();
                 new_cell.fromJSON(cell_data);
             } else if (cell_data.cell_type === 'markdown') {
-                new_cell = this.insert_markdown_cell_above();
+                new_cell = this.insert_markdown_cell_below();
                 new_cell.fromJSON(cell_data);
             };
         };

From 1b8b716b485d9c876a3e30cfa9cd699e0e660b5d Mon Sep 17 00:00:00 2001
From: Brian Granger <ellisonbg@gmail.com>
Date: Wed, 18 Jan 2012 23:40:47 -0800
Subject: [PATCH 2/2] Removing left over console.logs.

---
 IPython/frontend/html/notebook/static/js/notebook.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/js/notebook.js b/IPython/frontend/html/notebook/static/js/notebook.js
index 4f37669e8..e75f1c2dd 100644
--- a/IPython/frontend/html/notebook/static/js/notebook.js
+++ b/IPython/frontend/html/notebook/static/js/notebook.js
@@ -607,7 +607,6 @@ var IPython = (function (IPython) {
 
 
     Notebook.prototype.cut_cell = function () {
-        console.log('cut_cell');
         this.copy_cell();
         this.delete_cell();
     }
@@ -620,7 +619,6 @@ var IPython = (function (IPython) {
 
 
     Notebook.prototype.paste_cell = function () {
-        console.log('paste_cell');
         if (this.clipboard !== null && this.paste_enabled) {
             var cell_data = this.clipboard;
             if (cell_data.cell_type == 'code') {