From c28096f0c5d20884020fb065c605232b3bafee07 Mon Sep 17 00:00:00 2001
From: Paul Ivanov <pi@berkeley.edu>
Date: Thu, 20 Mar 2014 02:21:38 -0700
Subject: [PATCH 01/58] prevent saving of partially loaded notebooks

closes #5363
---
 IPython/html/static/notebook/js/notebook.js         | 10 ++++++++--
 IPython/html/static/notebook/js/notificationarea.js |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index 05cb955c1..6681aa2c3 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -58,6 +58,9 @@ var IPython = (function (IPython) {
         this.style();
         this.create_elements();
         this.bind_events();
+        this.save_notebook = function() { // don't allow save until notebook_loaded
+            this.save_notebook_error(null, null, "Notebook was not fully loaded.");
+        };
     };
 
     /**
@@ -1723,7 +1726,8 @@ var IPython = (function (IPython) {
     };
     
     /**
-     * Save this notebook on the server.
+     * Save this notebook on the server. This becomes a notebook instance's
+     * .save_notebook method *after* the entire notebook has been loaded.
      * 
      * @method save_notebook
      */
@@ -2100,7 +2104,9 @@ var IPython = (function (IPython) {
             IPython.CellToolbar.global_show();
             IPython.CellToolbar.activate_preset(this.metadata.celltoolbar);
         }
-        
+
+        // now that we're fully loaded, it is safe to restore save functionality
+        delete(this.save_notebook);
         $([IPython.events]).trigger('notebook_loaded.Notebook');
     };
 
diff --git a/IPython/html/static/notebook/js/notificationarea.js b/IPython/html/static/notebook/js/notificationarea.js
index 87f508ef1..9cc5db26f 100644
--- a/IPython/html/static/notebook/js/notificationarea.js
+++ b/IPython/html/static/notebook/js/notificationarea.js
@@ -188,8 +188,8 @@ var IPython = (function (IPython) {
         $([IPython.events]).on('notebook_saved.Notebook', function () {
             nnw.set_message("Notebook saved",2000);
         });
-        $([IPython.events]).on('notebook_save_failed.Notebook', function () {
-            nnw.set_message("Notebook save failed");
+        $([IPython.events]).on('notebook_save_failed.Notebook', function (evt, xhr, status, data) {
+            nnw.set_message("Notebook save failed:" + data);
         });
         
         // Checkpoint events

From 0f5f3a27f5c10d04d8514732ab32ebb9f67e20c5 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Fri, 7 Mar 2014 14:10:17 -0800
Subject: [PATCH 02/58] Add dual mode JS tests

---
 IPython/html/tests/notebook/dualmode.js | 231 ++++++++++++++++++++++++
 1 file changed, 231 insertions(+)
 create mode 100644 IPython/html/tests/notebook/dualmode.js

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
new file mode 100644
index 000000000..1c69c0a2c
--- /dev/null
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -0,0 +1,231 @@
+// Test the notebook dual mode feature.
+
+// Test
+casper.notebook_test(function () {
+    var index = this.append_cell('print("a")');
+    this.execute_cell_then(index);
+    index = this.append_cell('print("b")');
+    this.execute_cell_then(index);
+    index = this.append_cell('print("c")');
+    this.execute_cell_then(index);
+
+    this.then(function () {
+        this.validate_state('initial state', 'edit', 0);
+        this.key_press('esc');
+        this.validate_state('esc', 'command', 0);
+        this.key_press('down');
+        this.validate_state('down', 'command', 1);
+        this.key_press('enter');
+        this.validate_state('enter', 'edit', 1);
+        this.key_press('j');
+        this.validate_state('j in edit mode', 'edit', 1);
+        this.key_press('esc');
+        this.validate_state('esc', 'command', 1);
+        this.key_press('j');
+        this.validate_state('j in command mode', 'command', 2);
+        this.click_cell(0);
+        this.validate_state('click cell 0', 'edit', 0);
+        this.click_cell(3);
+        this.validate_state('click cell 3', 'edit', 3);
+        this.key_press('esc');
+        this.validate_state('esc', 'command', 3);
+
+        // Open keyboard help
+        this.evaluate(function(){
+            $('#keyboard_shortcuts a').click();
+        }, {});
+
+        this.key_press('k');
+        this.validate_state('k in command mode while keyboard help is up', 'command', 3);
+
+        // Close keyboard help
+        this.evaluate(function(){
+            $('div.modal button.close').click();
+        }, {});
+
+        this.key_press('k');
+        this.validate_state('k in command mode', 'command', 2);
+        this.click_cell(0);
+        this.validate_state('click cell 0', 'edit', 0);
+        this.focus_notebook();
+        this.validate_state('focus #notebook', 'command', 0);
+        this.click_cell(0);
+        this.validate_state('click cell 0', 'edit', 0);
+        this.focus_notebook();
+        this.validate_state('focus #notebook', 'command', 0);
+        this.click_cell(3);
+        this.validate_state('click cell 3', 'edit', 3);
+        this.key_press('shift+enter');
+        this.validate_state('shift+enter (no cell below)', 'edit', 4);
+        this.click_cell(3);
+        this.validate_state('click cell 3', 'edit', 3);
+        this.key_press('shift+enter');
+        this.validate_state('shift+enter (cell exists below)', 'command', 4);
+        this.click_cell(3);
+        this.validate_state('click cell 3', 'edit', 3);
+        this.key_press('alt+enter');
+        this.validate_state('alt+enter', 'edit', 4);
+        this.key_press('ctrl+enter');
+        this.validate_state('ctrl+enter', 'command', 4);
+    });
+
+
+    // Utility functions.
+    this.validate_state = function(message, mode, cell_index) {
+        // General tests.
+        this.test.assertEquals(this._get_keyboard_mode(), this._get_notebook_mode(),
+            message + '; keyboard and notebook modes match');
+        // Is codemirror focused appropriately?
+        this.test.assert(this.is_editor_focus_valid(), message + '; cell editor focused appropriately');
+        // Is the selected cell the only cell that is selected?
+        if (cell_index!==undefined) {
+            this.test.assert(this.is_cell_selected(cell_index),
+                message + '; cell ' + cell_index + ' is the only cell selected');
+        }
+
+        // Mode specific tests.
+        if (mode==='command') {
+            // Are the notebook and keyboard manager in command mode?
+            this.test.assertEquals(this._get_keyboard_mode(), 'command',
+                message + '; in command mode');
+            // Make sure there isn't a single cell in edit mode.
+            this.test.assert(this.is_cell_edit(null),
+                message + '; all cells in command mode');
+
+        } else if (mode==='edit') {
+            // Are the notebook and keyboard manager in edit mode?
+            this.test.assertEquals(this._get_keyboard_mode(), 'edit',
+                message + '; in edit mode');
+            // Is the specified cell the only cell in edit mode?
+            if (cell_index!==undefined) {
+                this.test.assert(this.is_cell_edit(cell_index),
+                    message + '; cell ' + cell_index + ' is the only cell in edit mode');
+            }
+
+        } else {
+            this.test.assert(false, message + '; ' + mode + ' is an unknown mode');
+        }
+    };
+
+    this.is_editor_focus_valid = function() {
+        var cells = this._get_cells();
+        for (var i = 0; i < cells.length; i++) {
+            if (!this.is_cell_editor_focus_valid(i)) {
+                return false;
+            }
+        }
+        return true;
+    };
+
+    this.is_cell_editor_focus_valid = function(i) {
+        var cell = this._get_cell(i);
+        if (cell) {
+            if (cell.mode == 'edit') {
+                return this._is_cell_editor_focused(i);
+            } else {
+                return !this._is_cell_editor_focused(i);
+            }
+        }
+        return true;
+    };
+
+    this.is_cell_selected = function(i) {
+        return this._is_cell_on(i, 'selected', 'unselected');
+    };
+
+    this.is_cell_edit = function(i) {
+        return this._is_cell_on(i, 'edit_mode', 'command_mode');
+    };
+
+    this.click_cell = function(index) {
+        // Code Mirror does not play nicely with emulated brower events.  
+        // Instead of trying to emulate a click, here we run code similar to
+        // the code used in Code Mirror that handles the mousedown event on a
+        // region of codemirror that the user can focus.
+        this.evaluate(function (i) {
+            cm = IPython.notebook.get_cell(i).code_mirror;
+            if (cm.options.readOnly != "nocursor" && (document.activeElement != cm.display.input))
+                cm.display.input.focus();
+        }, {i: index});
+    };
+
+    this.focus_notebook = function() {
+        this.evaluate(function (){
+            $('#notebook').focus();
+        }, {});
+    };
+
+    this.key_press = function(key) {
+        this.evaluate(function (k) {
+            IPython.keyboard.trigger_keydown(k);
+        }, {k: key});
+    };
+
+    this._is_cell_editor_focused = function(i) {
+        return this._is_cell_inputfield(i, '.CodeMirror-focused *');
+    };
+
+    this._is_cell_on = function(i, on_class, off_class) {
+        var cells = this._get_cells();
+        for (var j = 0; j < cells.length; j++) {
+            if (j === i) {
+                if (this._has_cell_class(j, off_class) || !this._has_cell_class(j, on_class)) {
+                    return false;
+                }
+            } else {
+                if (!this._has_cell_class(j, off_class) || this._has_cell_class(j, on_class)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    };
+
+    this._get_keyboard_mode = function() {
+        return this.evaluate(function() {
+            return IPython.keyboard_manager.mode;
+        }, {});
+    };
+
+    this._get_notebook_mode = function() {
+        return this.evaluate(function() {
+            return IPython.notebook.mode;
+        }, {});
+    };
+
+    this._get_cells = function() {
+        return this.evaluate(function() {
+            return IPython.notebook.get_cells();
+        }, {});
+    };
+
+    this._get_cell = function(index) {
+        return this.evaluate(function(i) {
+            var cell = IPython.notebook.get_cell(i);
+            if (cell) {
+                return cell;
+            }
+            return null;
+        }, {i : index});
+    };
+
+    this._is_cell_inputfield = function(index, selector) {
+        return this.evaluate(function(i, s) {
+            var cell = IPython.notebook.get_cell(i);
+            if (cell) {
+                return $(cell.code_mirror.getInputField()).is(s);
+            }
+            return false;
+        }, {i : index, s: selector});
+    };
+
+    this._has_cell_class = function(index, classes) {
+        return this.evaluate(function(i, c) {
+            var cell = IPython.notebook.get_cell(i);
+            if (cell) {
+                return cell.element.hasClass(c);
+            }
+            return false;
+        }, {i : index, c: classes});
+    };
+});

From 45bbcc949edc7b651c97166b6377cbe93a82d53c Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 10 Mar 2014 12:27:05 -0700
Subject: [PATCH 03/58] s/key_press/trigger_keydown

---
 IPython/html/tests/notebook/dualmode.js | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 1c69c0a2c..74b3b2dea 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -11,23 +11,23 @@ casper.notebook_test(function () {
 
     this.then(function () {
         this.validate_state('initial state', 'edit', 0);
-        this.key_press('esc');
+        this.trigger_keydown('esc');
         this.validate_state('esc', 'command', 0);
-        this.key_press('down');
+        this.trigger_keydown('down');
         this.validate_state('down', 'command', 1);
-        this.key_press('enter');
+        this.trigger_keydown('enter');
         this.validate_state('enter', 'edit', 1);
-        this.key_press('j');
+        this.trigger_keydown('j');
         this.validate_state('j in edit mode', 'edit', 1);
-        this.key_press('esc');
+        this.trigger_keydown('esc');
         this.validate_state('esc', 'command', 1);
-        this.key_press('j');
+        this.trigger_keydown('j');
         this.validate_state('j in command mode', 'command', 2);
         this.click_cell(0);
         this.validate_state('click cell 0', 'edit', 0);
         this.click_cell(3);
         this.validate_state('click cell 3', 'edit', 3);
-        this.key_press('esc');
+        this.trigger_keydown('esc');
         this.validate_state('esc', 'command', 3);
 
         // Open keyboard help
@@ -35,7 +35,7 @@ casper.notebook_test(function () {
             $('#keyboard_shortcuts a').click();
         }, {});
 
-        this.key_press('k');
+        this.trigger_keydown('k');
         this.validate_state('k in command mode while keyboard help is up', 'command', 3);
 
         // Close keyboard help
@@ -43,7 +43,7 @@ casper.notebook_test(function () {
             $('div.modal button.close').click();
         }, {});
 
-        this.key_press('k');
+        this.trigger_keydown('k');
         this.validate_state('k in command mode', 'command', 2);
         this.click_cell(0);
         this.validate_state('click cell 0', 'edit', 0);
@@ -55,17 +55,17 @@ casper.notebook_test(function () {
         this.validate_state('focus #notebook', 'command', 0);
         this.click_cell(3);
         this.validate_state('click cell 3', 'edit', 3);
-        this.key_press('shift+enter');
+        this.trigger_keydown('shift+enter');
         this.validate_state('shift+enter (no cell below)', 'edit', 4);
         this.click_cell(3);
         this.validate_state('click cell 3', 'edit', 3);
-        this.key_press('shift+enter');
+        this.trigger_keydown('shift+enter');
         this.validate_state('shift+enter (cell exists below)', 'command', 4);
         this.click_cell(3);
         this.validate_state('click cell 3', 'edit', 3);
-        this.key_press('alt+enter');
+        this.trigger_keydown('alt+enter');
         this.validate_state('alt+enter', 'edit', 4);
-        this.key_press('ctrl+enter');
+        this.trigger_keydown('ctrl+enter');
         this.validate_state('ctrl+enter', 'command', 4);
     });
 
@@ -155,7 +155,7 @@ casper.notebook_test(function () {
         }, {});
     };
 
-    this.key_press = function(key) {
+    this.trigger_keydown = function(key) {
         this.evaluate(function (k) {
             IPython.keyboard.trigger_keydown(k);
         }, {k: key});

From 6a834223da8a4a22fe4612ac66eb9187a770df64 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 10 Mar 2014 12:27:49 -0700
Subject: [PATCH 04/58] s/_is_cell_editor_focused/is_cell_editor_focused

---
 IPython/html/tests/notebook/dualmode.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 74b3b2dea..e82c9c2bf 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -121,9 +121,9 @@ casper.notebook_test(function () {
         var cell = this._get_cell(i);
         if (cell) {
             if (cell.mode == 'edit') {
-                return this._is_cell_editor_focused(i);
+                return this.is_cell_editor_focused(i);
             } else {
-                return !this._is_cell_editor_focused(i);
+                return !this.is_cell_editor_focused(i);
             }
         }
         return true;
@@ -161,7 +161,7 @@ casper.notebook_test(function () {
         }, {k: key});
     };
 
-    this._is_cell_editor_focused = function(i) {
+    this.is_cell_editor_focused = function(i) {
         return this._is_cell_inputfield(i, '.CodeMirror-focused *');
     };
 

From c43044d5142170e0bbf1e452aedd83dbb21f402e Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 10 Mar 2014 12:28:40 -0700
Subject: [PATCH 05/58] s/_is_cell_on/is_cell_on

---
 IPython/html/tests/notebook/dualmode.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index e82c9c2bf..58e320fed 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -130,11 +130,11 @@ casper.notebook_test(function () {
     };
 
     this.is_cell_selected = function(i) {
-        return this._is_cell_on(i, 'selected', 'unselected');
+        return this.is_cell_on(i, 'selected', 'unselected');
     };
 
     this.is_cell_edit = function(i) {
-        return this._is_cell_on(i, 'edit_mode', 'command_mode');
+        return this.is_cell_on(i, 'edit_mode', 'command_mode');
     };
 
     this.click_cell = function(index) {
@@ -165,7 +165,7 @@ casper.notebook_test(function () {
         return this._is_cell_inputfield(i, '.CodeMirror-focused *');
     };
 
-    this._is_cell_on = function(i, on_class, off_class) {
+    this.is_cell_on = function(i, on_class, off_class) {
         var cells = this._get_cells();
         for (var j = 0; j < cells.length; j++) {
             if (j === i) {

From 86fef90a8ceb1952926de67d333fb80888db3aae Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 10 Mar 2014 12:31:20 -0700
Subject: [PATCH 06/58] Make a few more methods public, in preparation to move
 them into the base utils.js

---
 IPython/html/tests/notebook/dualmode.js | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 58e320fed..830d1f3dc 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -73,7 +73,7 @@ casper.notebook_test(function () {
     // Utility functions.
     this.validate_state = function(message, mode, cell_index) {
         // General tests.
-        this.test.assertEquals(this._get_keyboard_mode(), this._get_notebook_mode(),
+        this.test.assertEquals(this.get_keyboard_mode(), this.get_notebook_mode(),
             message + '; keyboard and notebook modes match');
         // Is codemirror focused appropriately?
         this.test.assert(this.is_editor_focus_valid(), message + '; cell editor focused appropriately');
@@ -86,7 +86,7 @@ casper.notebook_test(function () {
         // Mode specific tests.
         if (mode==='command') {
             // Are the notebook and keyboard manager in command mode?
-            this.test.assertEquals(this._get_keyboard_mode(), 'command',
+            this.test.assertEquals(this.get_keyboard_mode(), 'command',
                 message + '; in command mode');
             // Make sure there isn't a single cell in edit mode.
             this.test.assert(this.is_cell_edit(null),
@@ -94,7 +94,7 @@ casper.notebook_test(function () {
 
         } else if (mode==='edit') {
             // Are the notebook and keyboard manager in edit mode?
-            this.test.assertEquals(this._get_keyboard_mode(), 'edit',
+            this.test.assertEquals(this.get_keyboard_mode(), 'edit',
                 message + '; in edit mode');
             // Is the specified cell the only cell in edit mode?
             if (cell_index!==undefined) {
@@ -108,7 +108,7 @@ casper.notebook_test(function () {
     };
 
     this.is_editor_focus_valid = function() {
-        var cells = this._get_cells();
+        var cells = this.get_cells();
         for (var i = 0; i < cells.length; i++) {
             if (!this.is_cell_editor_focus_valid(i)) {
                 return false;
@@ -117,24 +117,24 @@ casper.notebook_test(function () {
         return true;
     };
 
-    this.is_cell_editor_focus_valid = function(i) {
-        var cell = this._get_cell(i);
+    this.is_cell_editor_focus_valid = function(index) {
+        var cell = this.get_cell(index);
         if (cell) {
             if (cell.mode == 'edit') {
-                return this.is_cell_editor_focused(i);
+                return this.is_cell_editor_focused(index);
             } else {
-                return !this.is_cell_editor_focused(i);
+                return !this.is_cell_editor_focused(index);
             }
         }
         return true;
     };
 
-    this.is_cell_selected = function(i) {
-        return this.is_cell_on(i, 'selected', 'unselected');
+    this.is_cell_selected = function(index) {
+        return this.is_cell_on(index, 'selected', 'unselected');
     };
 
-    this.is_cell_edit = function(i) {
-        return this.is_cell_on(i, 'edit_mode', 'command_mode');
+    this.is_cell_edit = function(index) {
+        return this.is_cell_on(index, 'edit_mode', 'command_mode');
     };
 
     this.click_cell = function(index) {
@@ -161,12 +161,12 @@ casper.notebook_test(function () {
         }, {k: key});
     };
 
-    this.is_cell_editor_focused = function(i) {
-        return this._is_cell_inputfield(i, '.CodeMirror-focused *');
+    this.is_cell_editor_focused = function(index) {
+        return this._is_cell_inputfield(index, '.CodeMirror-focused *');
     };
 
     this.is_cell_on = function(i, on_class, off_class) {
-        var cells = this._get_cells();
+        var cells = this.get_cells();
         for (var j = 0; j < cells.length; j++) {
             if (j === i) {
                 if (this._has_cell_class(j, off_class) || !this._has_cell_class(j, on_class)) {
@@ -181,25 +181,25 @@ casper.notebook_test(function () {
         return true;
     };
 
-    this._get_keyboard_mode = function() {
+    this.get_keyboard_mode = function() {
         return this.evaluate(function() {
             return IPython.keyboard_manager.mode;
         }, {});
     };
 
-    this._get_notebook_mode = function() {
+    this.get_notebook_mode = function() {
         return this.evaluate(function() {
             return IPython.notebook.mode;
         }, {});
     };
 
-    this._get_cells = function() {
+    this.get_cells = function() {
         return this.evaluate(function() {
             return IPython.notebook.get_cells();
         }, {});
     };
 
-    this._get_cell = function(index) {
+    this.get_cell = function(index) {
         return this.evaluate(function(i) {
             var cell = IPython.notebook.get_cell(i);
             if (cell) {

From 241b62a37a7863679d3b8aa76d61140d5ca0fa36 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 10 Mar 2014 12:33:58 -0700
Subject: [PATCH 07/58] Move code into is_cell_editor_focused

---
 IPython/html/tests/notebook/dualmode.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 830d1f3dc..ab1d4cf79 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -162,7 +162,13 @@ casper.notebook_test(function () {
     };
 
     this.is_cell_editor_focused = function(index) {
-        return this._is_cell_inputfield(index, '.CodeMirror-focused *');
+        return this.evaluate(function(i) {
+            var cell = IPython.notebook.get_cell(i);
+            if (cell) {
+                return $(cell.code_mirror.getInputField()).is('.CodeMirror-focused *');
+            }
+            return false;
+        }, {i : index});
     };
 
     this.is_cell_on = function(i, on_class, off_class) {
@@ -209,16 +215,6 @@ casper.notebook_test(function () {
         }, {i : index});
     };
 
-    this._is_cell_inputfield = function(index, selector) {
-        return this.evaluate(function(i, s) {
-            var cell = IPython.notebook.get_cell(i);
-            if (cell) {
-                return $(cell.code_mirror.getInputField()).is(s);
-            }
-            return false;
-        }, {i : index, s: selector});
-    };
-
     this._has_cell_class = function(index, classes) {
         return this.evaluate(function(i, c) {
             var cell = IPython.notebook.get_cell(i);

From 2b800d3360c13858b73a3d467249c95ff431170b Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 10 Mar 2014 12:36:26 -0700
Subject: [PATCH 08/58] Add '_only' to only cell methods

---
 IPython/html/tests/notebook/dualmode.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index ab1d4cf79..c5378edbf 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -79,7 +79,7 @@ casper.notebook_test(function () {
         this.test.assert(this.is_editor_focus_valid(), message + '; cell editor focused appropriately');
         // Is the selected cell the only cell that is selected?
         if (cell_index!==undefined) {
-            this.test.assert(this.is_cell_selected(cell_index),
+            this.test.assert(this.is_only_cell_selected(cell_index),
                 message + '; cell ' + cell_index + ' is the only cell selected');
         }
 
@@ -89,7 +89,7 @@ casper.notebook_test(function () {
             this.test.assertEquals(this.get_keyboard_mode(), 'command',
                 message + '; in command mode');
             // Make sure there isn't a single cell in edit mode.
-            this.test.assert(this.is_cell_edit(null),
+            this.test.assert(this.is_only_cell_edit(null),
                 message + '; all cells in command mode');
 
         } else if (mode==='edit') {
@@ -98,7 +98,7 @@ casper.notebook_test(function () {
                 message + '; in edit mode');
             // Is the specified cell the only cell in edit mode?
             if (cell_index!==undefined) {
-                this.test.assert(this.is_cell_edit(cell_index),
+                this.test.assert(this.is_only_cell_edit(cell_index),
                     message + '; cell ' + cell_index + ' is the only cell in edit mode');
             }
 
@@ -129,12 +129,12 @@ casper.notebook_test(function () {
         return true;
     };
 
-    this.is_cell_selected = function(index) {
-        return this.is_cell_on(index, 'selected', 'unselected');
+    this.is_only_cell_selected = function(index) {
+        return this.is_only_cell_on(index, 'selected', 'unselected');
     };
 
-    this.is_cell_edit = function(index) {
-        return this.is_cell_on(index, 'edit_mode', 'command_mode');
+    this.is_only_cell_edit = function(index) {
+        return this.is_only_cell_on(index, 'edit_mode', 'command_mode');
     };
 
     this.click_cell = function(index) {
@@ -171,7 +171,7 @@ casper.notebook_test(function () {
         }, {i : index});
     };
 
-    this.is_cell_on = function(i, on_class, off_class) {
+    this.is_only_cell_on = function(i, on_class, off_class) {
         var cells = this.get_cells();
         for (var j = 0; j < cells.length; j++) {
             if (j === i) {

From 9bd0ac19bf846d029ae12b960183839bd6d9205e Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 10 Mar 2014 12:42:32 -0700
Subject: [PATCH 09/58] sep. fucntions to move to util.js

---
 IPython/html/tests/notebook/dualmode.js | 69 +++++++++++++------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index c5378edbf..7126829bd 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -129,13 +129,10 @@ casper.notebook_test(function () {
         return true;
     };
 
-    this.is_only_cell_selected = function(index) {
-        return this.is_only_cell_on(index, 'selected', 'unselected');
-    };
 
-    this.is_only_cell_edit = function(index) {
-        return this.is_only_cell_on(index, 'edit_mode', 'command_mode');
-    };
+    /* TODO: MOVE EVERYTHING BELOW THIS LINE INTO THE BASE (utils.js) */
+
+
 
     this.click_cell = function(index) {
         // Code Mirror does not play nicely with emulated brower events.  
@@ -161,32 +158,6 @@ casper.notebook_test(function () {
         }, {k: key});
     };
 
-    this.is_cell_editor_focused = function(index) {
-        return this.evaluate(function(i) {
-            var cell = IPython.notebook.get_cell(i);
-            if (cell) {
-                return $(cell.code_mirror.getInputField()).is('.CodeMirror-focused *');
-            }
-            return false;
-        }, {i : index});
-    };
-
-    this.is_only_cell_on = function(i, on_class, off_class) {
-        var cells = this.get_cells();
-        for (var j = 0; j < cells.length; j++) {
-            if (j === i) {
-                if (this._has_cell_class(j, off_class) || !this._has_cell_class(j, on_class)) {
-                    return false;
-                }
-            } else {
-                if (!this._has_cell_class(j, off_class) || this._has_cell_class(j, on_class)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    };
-
     this.get_keyboard_mode = function() {
         return this.evaluate(function() {
             return IPython.keyboard_manager.mode;
@@ -215,6 +186,40 @@ casper.notebook_test(function () {
         }, {i : index});
     };
 
+    this.is_cell_editor_focused = function(index) {
+        return this.evaluate(function(i) {
+            var cell = IPython.notebook.get_cell(i);
+            if (cell) {
+                return $(cell.code_mirror.getInputField()).is('.CodeMirror-focused *');
+            }
+            return false;
+        }, {i : index});
+    };
+
+    this.is_only_cell_selected = function(index) {
+        return this.is_only_cell_on(index, 'selected', 'unselected');
+    };
+
+    this.is_only_cell_edit = function(index) {
+        return this.is_only_cell_on(index, 'edit_mode', 'command_mode');
+    };
+
+    this.is_only_cell_on = function(i, on_class, off_class) {
+        var cells = this.get_cells();
+        for (var j = 0; j < cells.length; j++) {
+            if (j === i) {
+                if (this._has_cell_class(j, off_class) || !this._has_cell_class(j, on_class)) {
+                    return false;
+                }
+            } else {
+                if (!this._has_cell_class(j, off_class) || this._has_cell_class(j, on_class)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    };
+
     this._has_cell_class = function(index, classes) {
         return this.evaluate(function(i, c) {
             var cell = IPython.notebook.get_cell(i);

From 55773dd95adbc1c834f9b048f3bdc875caaddcb2 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 10 Mar 2014 13:06:53 -0700
Subject: [PATCH 10/58] Made *+enter tests more complicated.

---
 IPython/html/tests/notebook/dualmode.js | 58 +++++++++++++++++++++----
 1 file changed, 49 insertions(+), 9 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 7126829bd..444f0deca 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -55,18 +55,58 @@ casper.notebook_test(function () {
         this.validate_state('focus #notebook', 'command', 0);
         this.click_cell(3);
         this.validate_state('click cell 3', 'edit', 3);
+
+        // shift+enter tests.
+        // last cell in notebook
+        var base_index = 3;
+        this.trigger_keydown('shift+enter'); // Creates one cell
+        this.validate_state('shift+enter (no cell below)', 'edit', base_index + 1);
+        // not last cell in notebook & starts in edit mode
+        this.click_cell(base_index);
+        this.validate_state('click cell %d' % base_index, 'edit', base_index);
         this.trigger_keydown('shift+enter');
-        this.validate_state('shift+enter (no cell below)', 'edit', 4);
-        this.click_cell(3);
-        this.validate_state('click cell 3', 'edit', 3);
+        this.validate_state('shift+enter (cell exists below)', 'command', base_index + 1);
+        // starts in command mode
+        this.trigger_keydown('k');
+        this.validate_state('k in comand mode', 'command', base_index);
         this.trigger_keydown('shift+enter');
-        this.validate_state('shift+enter (cell exists below)', 'command', 4);
-        this.click_cell(3);
-        this.validate_state('click cell 3', 'edit', 3);
-        this.trigger_keydown('alt+enter');
-        this.validate_state('alt+enter', 'edit', 4);
+        this.validate_state('shift+enter (start in command mode)', 'command', base_index + 1);
+
+        // ctrl+enter tests.
+        // last cell in notebook
+        base_index++;
         this.trigger_keydown('ctrl+enter');
-        this.validate_state('ctrl+enter', 'command', 4);
+        this.validate_state('ctrl+enter (no cell below)', 'command', base_index);
+        // not last cell in notebook & starts in edit mode
+        this.click_cell(base_index-1);
+        this.validate_state('click cell %d' % (base_index-1), 'edit', base_index-1);
+        this.trigger_keydown('ctrl+enter');
+        this.validate_state('ctrl+enter (cell exists below)', 'command', base_index-1);
+        // starts in command mode
+        this.trigger_keydown('j');
+        this.validate_state('j in comand mode', 'command', base_index);
+        this.trigger_keydown('ctrl+enter');
+        this.validate_state('ctrl+enter (start in command mode)', 'command', base_index);
+
+        // alt+enter tests.
+        // last cell in notebook
+        base_index++;
+        this.trigger_keydown('alt+enter'); // Creates one cell
+        this.validate_state('alt+enter (no cell below)', 'edit', base_index + 1);
+        // not last cell in notebook & starts in edit mode
+        this.click_cell(base_index);
+        this.validate_state('click cell %d' % base_index, 'edit', base_index);
+        this.trigger_keydown('alt+enter'); // Creates one cell
+        this.validate_state('alt+enter (cell exists below)', 'edit', base_index + 1);
+        // starts in command mode
+        this.trigger_keydown('esc');
+        this.trigger_keydown('k');
+        this.validate_state('k in comand mode', 'command', base_index);
+        this.trigger_keydown('alt+enter'); // Creates one cell
+        this.validate_state('alt+enter (start in command mode)', 'edit', base_index + 1);
+
+        // Notebook will now have 8 cells, the index of the last cell will be 7.
+        
     });
 
 

From 4f6884f985245b4a129612e73698275439fffd8b Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 10 Mar 2014 13:32:19 -0700
Subject: [PATCH 11/58] Add test for cell type modifier keyboard shortcuts

---
 IPython/html/tests/notebook/dualmode.js | 32 +++++++++++++++++++++----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 444f0deca..4403f5359 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -63,7 +63,7 @@ casper.notebook_test(function () {
         this.validate_state('shift+enter (no cell below)', 'edit', base_index + 1);
         // not last cell in notebook & starts in edit mode
         this.click_cell(base_index);
-        this.validate_state('click cell %d' % base_index, 'edit', base_index);
+        this.validate_state('click cell ' + base_index, 'edit', base_index);
         this.trigger_keydown('shift+enter');
         this.validate_state('shift+enter (cell exists below)', 'command', base_index + 1);
         // starts in command mode
@@ -79,7 +79,7 @@ casper.notebook_test(function () {
         this.validate_state('ctrl+enter (no cell below)', 'command', base_index);
         // not last cell in notebook & starts in edit mode
         this.click_cell(base_index-1);
-        this.validate_state('click cell %d' % (base_index-1), 'edit', base_index-1);
+        this.validate_state('click cell ' + (base_index-1), 'edit', base_index-1);
         this.trigger_keydown('ctrl+enter');
         this.validate_state('ctrl+enter (cell exists below)', 'command', base_index-1);
         // starts in command mode
@@ -90,12 +90,11 @@ casper.notebook_test(function () {
 
         // alt+enter tests.
         // last cell in notebook
-        base_index++;
         this.trigger_keydown('alt+enter'); // Creates one cell
         this.validate_state('alt+enter (no cell below)', 'edit', base_index + 1);
         // not last cell in notebook & starts in edit mode
         this.click_cell(base_index);
-        this.validate_state('click cell %d' % base_index, 'edit', base_index);
+        this.validate_state('click cell ' + base_index, 'edit', base_index);
         this.trigger_keydown('alt+enter'); // Creates one cell
         this.validate_state('alt+enter (cell exists below)', 'edit', base_index + 1);
         // starts in command mode
@@ -106,7 +105,30 @@ casper.notebook_test(function () {
         this.validate_state('alt+enter (start in command mode)', 'edit', base_index + 1);
 
         // Notebook will now have 8 cells, the index of the last cell will be 7.
-        
+        this.test.assertEquals(this.get_cells.length, 8, '*-enter commands added cells where needed.');
+        this.click_cell(7);
+        this.trigger_keydown('esc');
+        this.validate_state('click cell ' + 7 + ' and esc', 'command', 7);
+
+        this.trigger_keydown('r');
+        this.test.assertEquals(this.get_cell(7).cell_type, 'raw', 'r; cell is raw');
+        this.trigger_keydown('1');
+        this.test.assertEquals(this.get_cell(7).cell_type, 'heading', '1; cell is heading');
+        this.test.assertEquals(this.get_cell(7).level, 1, '1; cell is level 1 heading');
+        this.trigger_keydown('2');
+        this.test.assertEquals(this.get_cell(7).level, 2, '2; cell is level 2 heading');
+        this.trigger_keydown('3');
+        this.test.assertEquals(this.get_cell(7).level, 3, '3; cell is level 3 heading');
+        this.trigger_keydown('4');
+        this.test.assertEquals(this.get_cell(7).level, 4, '4; cell is level 4 heading');
+        this.trigger_keydown('5');
+        this.test.assertEquals(this.get_cell(7).level, 5, '5; cell is level 5 heading');
+        this.trigger_keydown('6');
+        this.test.assertEquals(this.get_cell(7).level, 6, '6; cell is level 6 heading');
+        this.trigger_keydown('m');
+        this.test.assertEquals(this.get_cell(7).cell_type, 'markdown', 'm; cell is markdown');
+        this.trigger_keydown('y');
+        this.test.assertEquals(this.get_cell(7).cell_type, 'code', 'y; cell is code');
     });
 
 

From e647e13162066da64df85f8f1a628a64c70aabc9 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 10 Mar 2014 13:58:49 -0700
Subject: [PATCH 12/58] Add dd tests

---
 IPython/html/tests/notebook/dualmode.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 4403f5359..2e81e5788 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -105,7 +105,7 @@ casper.notebook_test(function () {
         this.validate_state('alt+enter (start in command mode)', 'edit', base_index + 1);
 
         // Notebook will now have 8 cells, the index of the last cell will be 7.
-        this.test.assertEquals(this.get_cells.length, 8, '*-enter commands added cells where needed.');
+        this.test.assertEquals(this.get_cells().length, 8, '*-enter commands added cells where needed.');
         this.click_cell(7);
         this.trigger_keydown('esc');
         this.validate_state('click cell ' + 7 + ' and esc', 'command', 7);
@@ -129,8 +129,23 @@ casper.notebook_test(function () {
         this.test.assertEquals(this.get_cell(7).cell_type, 'markdown', 'm; cell is markdown');
         this.trigger_keydown('y');
         this.test.assertEquals(this.get_cell(7).cell_type, 'code', 'y; cell is code');
+
+        this.trigger_keydown('d');
+        this.trigger_keydown('d');
+        this.test.assertEquals(this.get_cells().length, 7, 'dd actually deletes a cell');
+        this.validate_state('dd', 'command', 6);
+
+        // Make sure that if the time between d presses is too long 
+        this.trigger_keydown('d');
     });
+    this.wait(1000);
+    this.then(function () {
+        this.trigger_keydown('d');
 
+        this.test.assertEquals(this.get_cells().length, 6, "d, 1 second wait, d doesn't delete a cell");
+        this.validate_state('d, 1 second wait, d', 'command', 6);
+
+    });
 
     // Utility functions.
     this.validate_state = function(message, mode, cell_index) {

From 13908b60a47f18dfe0bfeed6704ed88da01ba657 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 10 Mar 2014 14:06:20 -0700
Subject: [PATCH 13/58] Fixed typo in dd test

---
 IPython/html/tests/notebook/dualmode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 2e81e5788..8dc926851 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -142,7 +142,7 @@ casper.notebook_test(function () {
     this.then(function () {
         this.trigger_keydown('d');
 
-        this.test.assertEquals(this.get_cells().length, 6, "d, 1 second wait, d doesn't delete a cell");
+        this.test.assertEquals(this.get_cells().length, 7, "d, 1 second wait, d doesn't delete a cell");
         this.validate_state('d, 1 second wait, d', 'command', 6);
 
     });

From 1094299934ad1599997cbabc0b62f6680b199f75 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 10 Mar 2014 18:14:58 -0700
Subject: [PATCH 14/58] Added up/down and markdown tests

---
 IPython/html/tests/notebook/dualmode.js | 99 ++++++++++++++++++++-----
 1 file changed, 80 insertions(+), 19 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 8dc926851..804bebade 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -23,9 +23,9 @@ casper.notebook_test(function () {
         this.validate_state('esc', 'command', 1);
         this.trigger_keydown('j');
         this.validate_state('j in command mode', 'command', 2);
-        this.click_cell(0);
+        this.click_cell_editor(0);
         this.validate_state('click cell 0', 'edit', 0);
-        this.click_cell(3);
+        this.click_cell_editor(3);
         this.validate_state('click cell 3', 'edit', 3);
         this.trigger_keydown('esc');
         this.validate_state('esc', 'command', 3);
@@ -45,15 +45,15 @@ casper.notebook_test(function () {
 
         this.trigger_keydown('k');
         this.validate_state('k in command mode', 'command', 2);
-        this.click_cell(0);
+        this.click_cell_editor(0);
         this.validate_state('click cell 0', 'edit', 0);
         this.focus_notebook();
         this.validate_state('focus #notebook', 'command', 0);
-        this.click_cell(0);
+        this.click_cell_editor(0);
         this.validate_state('click cell 0', 'edit', 0);
         this.focus_notebook();
         this.validate_state('focus #notebook', 'command', 0);
-        this.click_cell(3);
+        this.click_cell_editor(3);
         this.validate_state('click cell 3', 'edit', 3);
 
         // shift+enter tests.
@@ -62,7 +62,7 @@ casper.notebook_test(function () {
         this.trigger_keydown('shift+enter'); // Creates one cell
         this.validate_state('shift+enter (no cell below)', 'edit', base_index + 1);
         // not last cell in notebook & starts in edit mode
-        this.click_cell(base_index);
+        this.click_cell_editor(base_index);
         this.validate_state('click cell ' + base_index, 'edit', base_index);
         this.trigger_keydown('shift+enter');
         this.validate_state('shift+enter (cell exists below)', 'command', base_index + 1);
@@ -78,7 +78,7 @@ casper.notebook_test(function () {
         this.trigger_keydown('ctrl+enter');
         this.validate_state('ctrl+enter (no cell below)', 'command', base_index);
         // not last cell in notebook & starts in edit mode
-        this.click_cell(base_index-1);
+        this.click_cell_editor(base_index-1);
         this.validate_state('click cell ' + (base_index-1), 'edit', base_index-1);
         this.trigger_keydown('ctrl+enter');
         this.validate_state('ctrl+enter (cell exists below)', 'command', base_index-1);
@@ -93,21 +93,19 @@ casper.notebook_test(function () {
         this.trigger_keydown('alt+enter'); // Creates one cell
         this.validate_state('alt+enter (no cell below)', 'edit', base_index + 1);
         // not last cell in notebook & starts in edit mode
-        this.click_cell(base_index);
+        this.click_cell_editor(base_index);
         this.validate_state('click cell ' + base_index, 'edit', base_index);
         this.trigger_keydown('alt+enter'); // Creates one cell
         this.validate_state('alt+enter (cell exists below)', 'edit', base_index + 1);
         // starts in command mode
-        this.trigger_keydown('esc');
-        this.trigger_keydown('k');
+        this.trigger_keydown('esc', 'k');
         this.validate_state('k in comand mode', 'command', base_index);
         this.trigger_keydown('alt+enter'); // Creates one cell
         this.validate_state('alt+enter (start in command mode)', 'edit', base_index + 1);
 
         // Notebook will now have 8 cells, the index of the last cell will be 7.
         this.test.assertEquals(this.get_cells().length, 8, '*-enter commands added cells where needed.');
-        this.click_cell(7);
-        this.trigger_keydown('esc');
+        this.select_cell(7);
         this.validate_state('click cell ' + 7 + ' and esc', 'command', 7);
 
         this.trigger_keydown('r');
@@ -130,8 +128,7 @@ casper.notebook_test(function () {
         this.trigger_keydown('y');
         this.test.assertEquals(this.get_cell(7).cell_type, 'code', 'y; cell is code');
 
-        this.trigger_keydown('d');
-        this.trigger_keydown('d');
+        this.trigger_keydown('d', 'd');
         this.test.assertEquals(this.get_cells().length, 7, 'dd actually deletes a cell');
         this.validate_state('dd', 'command', 6);
 
@@ -144,6 +141,63 @@ casper.notebook_test(function () {
 
         this.test.assertEquals(this.get_cells().length, 7, "d, 1 second wait, d doesn't delete a cell");
         this.validate_state('d, 1 second wait, d', 'command', 6);
+        this.trigger_keydown('j');
+        this.validate_state('j at end of notebook', 'command', 6);
+        this.trigger_keydown('down');
+        this.validate_state('down at end of notebook', 'command', 6);
+        this.trigger_keydown('up');
+        this.validate_state('up', 'command', 5);
+        this.select_cell(0);
+        this.validate_state('select 0', 'command', 0);
+        this.trigger_keydown('k');
+        this.validate_state('k at top of notebook', 'command', 0);
+        this.trigger_keydown('up');
+        this.validate_state('up at top of notebook', 'command', 0);
+        this.trigger_keydown('down');
+        this.validate_state('down', 'command', 1);
+
+        this.click_cell_editor(6);
+        this.validate_state('click cell 6', 'edit', 6);
+        this.trigger_keydown('down');
+        this.validate_state('down at end of notebook', 'edit', 6);
+        this.trigger_keydown('up');
+        this.validate_state('up', 'edit', 5);
+        this.click_cell_editor(0);
+        this.validate_state('click 0', 'edit', 0);
+        this.trigger_keydown('up');
+        this.validate_state('up at top of notebook', 'edit', 0);
+        this.trigger_keydown('down');
+        this.validate_state('down', 'edit', 1);
+
+        this.select_cell(6);
+        this.validate_state('select 6', 'command', 6);
+        this.trigger_keydown('m');
+        this.test.assertEquals(this.get_cell(6).cell_type, 'markdown', 'm; cell is markdown');
+        this.test.assertEquals(this.get_cell(6).rendered, true, 'm; cell is rendered');
+        this.trigger_keydown('enter');
+        this.test.assertEquals(this.get_cell(6).rendered, false, 'enter; cell is unrendered');
+        this.validate_state('enter', 'edit', 6);
+        this.trigger_keydown('ctrl+enter');
+        this.test.assertEquals(this.get_cell(6).rendered, true, 'enter; cell is rendered');
+        this.validate_state('enter', 'command', 6);
+        this.trigger_keydown('enter');
+        this.test.assertEquals(this.get_cell(6).rendered, false, 'enter; cell is unrendered');
+        this.select_cell(5);
+        this.test.assertEquals(this.get_cell(6).rendered, false, 'select 5; cell 6 is still unrendered');
+        this.validate_state('select 5', 'command', 5);
+        this.select_cell(6);
+        this.validate_state('select 6', 'command', 5);
+        this.trigger_keydown('ctrl+enter');
+        this.test.assertEquals(this.get_cell(6).rendered, true, 'enter; cell is rendered');
+        this.select_cell(5);
+        this.validate_state('select 5', 'command', 5);
+        this.trigger_keydown('shift+enter');
+        this.validate_state('shift+enter', 'command', 6);
+        this.test.assertEquals(this.get_cell(6).rendered, true, 'enter; cell is rendered');
+        this.trigger_keydown('shift+enter'); // Creates one cell
+        this.validate_state('shift+enter', 'edit', 7);
+        this.test.assertEquals(this.get_cell(6).rendered, true, 'enter; cell is rendered');
+
 
     });
 
@@ -210,8 +264,13 @@ casper.notebook_test(function () {
     /* TODO: MOVE EVERYTHING BELOW THIS LINE INTO THE BASE (utils.js) */
 
 
+    this.select_cell = function (index) {
+        this.evaluate(function (i) {
+            IPython.notebook.select(i);
+        }, {i: index});
+    };
 
-    this.click_cell = function(index) {
+    this.click_cell_editor = function(index) {
         // Code Mirror does not play nicely with emulated brower events.  
         // Instead of trying to emulate a click, here we run code similar to
         // the code used in Code Mirror that handles the mousedown event on a
@@ -229,10 +288,12 @@ casper.notebook_test(function () {
         }, {});
     };
 
-    this.trigger_keydown = function(key) {
-        this.evaluate(function (k) {
-            IPython.keyboard.trigger_keydown(k);
-        }, {k: key});
+    this.trigger_keydown = function() {
+        for (var i = 0; i < arguments.length; i++) {
+            this.evaluate(function (k) {
+                IPython.keyboard.trigger_keydown(k);
+            }, {k: arguments[i]});    
+        }
     };
 
     this.get_keyboard_mode = function() {

From 26e3d14f81571abb226e69bde674ab49de307f91 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 10 Mar 2014 18:24:35 -0700
Subject: [PATCH 15/58] Fixed state type for new markdown cell

---
 IPython/html/tests/notebook/dualmode.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 804bebade..43a6b38d9 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -173,12 +173,12 @@ casper.notebook_test(function () {
         this.validate_state('select 6', 'command', 6);
         this.trigger_keydown('m');
         this.test.assertEquals(this.get_cell(6).cell_type, 'markdown', 'm; cell is markdown');
-        this.test.assertEquals(this.get_cell(6).rendered, true, 'm; cell is rendered');
+        this.test.assertEquals(this.get_cell(6).rendered, false, 'm; cell is rendered');
         this.trigger_keydown('enter');
         this.test.assertEquals(this.get_cell(6).rendered, false, 'enter; cell is unrendered');
         this.validate_state('enter', 'edit', 6);
         this.trigger_keydown('ctrl+enter');
-        this.test.assertEquals(this.get_cell(6).rendered, true, 'enter; cell is rendered');
+        this.test.assertEquals(this.get_cell(6).rendered, true, 'ctrl+enter; cell is rendered');
         this.validate_state('enter', 'command', 6);
         this.trigger_keydown('enter');
         this.test.assertEquals(this.get_cell(6).rendered, false, 'enter; cell is unrendered');
@@ -188,15 +188,15 @@ casper.notebook_test(function () {
         this.select_cell(6);
         this.validate_state('select 6', 'command', 5);
         this.trigger_keydown('ctrl+enter');
-        this.test.assertEquals(this.get_cell(6).rendered, true, 'enter; cell is rendered');
+        this.test.assertEquals(this.get_cell(6).rendered, true, 'ctrl+enter; cell is rendered');
         this.select_cell(5);
         this.validate_state('select 5', 'command', 5);
         this.trigger_keydown('shift+enter');
         this.validate_state('shift+enter', 'command', 6);
-        this.test.assertEquals(this.get_cell(6).rendered, true, 'enter; cell is rendered');
+        this.test.assertEquals(this.get_cell(6).rendered, true, 'shift+enter; cell is rendered');
         this.trigger_keydown('shift+enter'); // Creates one cell
         this.validate_state('shift+enter', 'edit', 7);
-        this.test.assertEquals(this.get_cell(6).rendered, true, 'enter; cell is rendered');
+        this.test.assertEquals(this.get_cell(6).rendered, true, 'shift+enter; cell is rendered');
 
 
     });

From ddc21618174bf21d73ba07cb0e91af106d67b9cd Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Tue, 11 Mar 2014 12:29:38 -0700
Subject: [PATCH 16/58] Added ctrl+(j&k), a, and b tests

---
 IPython/html/tests/notebook/dualmode.js | 86 ++++++++++++++++++-------
 1 file changed, 61 insertions(+), 25 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 43a6b38d9..2f7ce2e49 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -2,11 +2,16 @@
 
 // Test
 casper.notebook_test(function () {
-    var index = this.append_cell('print("a")');
+    var a = 'print("a")';
+    var index = this.append_cell(a);
     this.execute_cell_then(index);
-    index = this.append_cell('print("b")');
+
+    var b = 'print("b")';
+    index = this.append_cell(b);
     this.execute_cell_then(index);
-    index = this.append_cell('print("c")');
+
+    var c = 'print("c")';
+    index = this.append_cell(c);
     this.execute_cell_then(index);
 
     this.then(function () {
@@ -56,7 +61,7 @@ casper.notebook_test(function () {
         this.click_cell_editor(3);
         this.validate_state('click cell 3', 'edit', 3);
 
-        // shift+enter tests.
+        // shift+enter
         // last cell in notebook
         var base_index = 3;
         this.trigger_keydown('shift+enter'); // Creates one cell
@@ -72,7 +77,7 @@ casper.notebook_test(function () {
         this.trigger_keydown('shift+enter');
         this.validate_state('shift+enter (start in command mode)', 'command', base_index + 1);
 
-        // ctrl+enter tests.
+        // ctrl+enter
         // last cell in notebook
         base_index++;
         this.trigger_keydown('ctrl+enter');
@@ -88,7 +93,7 @@ casper.notebook_test(function () {
         this.trigger_keydown('ctrl+enter');
         this.validate_state('ctrl+enter (start in command mode)', 'command', base_index);
 
-        // alt+enter tests.
+        // alt+enter
         // last cell in notebook
         this.trigger_keydown('alt+enter'); // Creates one cell
         this.validate_state('alt+enter (no cell below)', 'edit', base_index + 1);
@@ -104,10 +109,11 @@ casper.notebook_test(function () {
         this.validate_state('alt+enter (start in command mode)', 'edit', base_index + 1);
 
         // Notebook will now have 8 cells, the index of the last cell will be 7.
-        this.test.assertEquals(this.get_cells().length, 8, '*-enter commands added cells where needed.');
+        this.test.assertEquals(this.get_cells_length(), 8, '*-enter commands added cells where needed.');
         this.select_cell(7);
         this.validate_state('click cell ' + 7 + ' and esc', 'command', 7);
 
+        // Cell mode change
         this.trigger_keydown('r');
         this.test.assertEquals(this.get_cell(7).cell_type, 'raw', 'r; cell is raw');
         this.trigger_keydown('1');
@@ -128,19 +134,21 @@ casper.notebook_test(function () {
         this.trigger_keydown('y');
         this.test.assertEquals(this.get_cell(7).cell_type, 'code', 'y; cell is code');
 
+        // Cell deletion
         this.trigger_keydown('d', 'd');
-        this.test.assertEquals(this.get_cells().length, 7, 'dd actually deletes a cell');
+        this.test.assertEquals(this.get_cells_length(), 7, 'dd actually deletes a cell');
         this.validate_state('dd', 'command', 6);
 
-        // Make sure that if the time between d presses is too long 
+        // Make sure that if the time between d presses is too long, nothing gets removed.
         this.trigger_keydown('d');
     });
     this.wait(1000);
     this.then(function () {
         this.trigger_keydown('d');
-
-        this.test.assertEquals(this.get_cells().length, 7, "d, 1 second wait, d doesn't delete a cell");
+        this.test.assertEquals(this.get_cells_length(), 7, "d, 1 second wait, d doesn't delete a cell");
         this.validate_state('d, 1 second wait, d', 'command', 6);
+
+        // Up and down in command mode
         this.trigger_keydown('j');
         this.validate_state('j at end of notebook', 'command', 6);
         this.trigger_keydown('down');
@@ -156,6 +164,7 @@ casper.notebook_test(function () {
         this.trigger_keydown('down');
         this.validate_state('down', 'command', 1);
 
+        // Up and down in edit mode
         this.click_cell_editor(6);
         this.validate_state('click cell 6', 'edit', 6);
         this.trigger_keydown('down');
@@ -169,6 +178,7 @@ casper.notebook_test(function () {
         this.trigger_keydown('down');
         this.validate_state('down', 'edit', 1);
 
+        // Markdown rendering / unredering
         this.select_cell(6);
         this.validate_state('select 6', 'command', 6);
         this.trigger_keydown('m');
@@ -186,7 +196,7 @@ casper.notebook_test(function () {
         this.test.assertEquals(this.get_cell(6).rendered, false, 'select 5; cell 6 is still unrendered');
         this.validate_state('select 5', 'command', 5);
         this.select_cell(6);
-        this.validate_state('select 6', 'command', 5);
+        this.validate_state('select 6', 'command', 6);
         this.trigger_keydown('ctrl+enter');
         this.test.assertEquals(this.get_cell(6).rendered, true, 'ctrl+enter; cell is rendered');
         this.select_cell(5);
@@ -198,6 +208,38 @@ casper.notebook_test(function () {
         this.validate_state('shift+enter', 'edit', 7);
         this.test.assertEquals(this.get_cell(6).rendered, true, 'shift+enter; cell is rendered');
 
+        // Cell movement ( ctrl+(k or j) )
+        this.select_cell(2);
+        this.test.assertEquals(this.get_cell_text(2), b, 'select 2; Cell 2 text is correct');
+        this.trigger_keydown('ctrl+k'); // Move cell 2 up one
+        this.test.assertEquals(this.get_cell_text(1), b, 'ctrl+k; Cell 1 text is correct');
+        this.test.assertEquals(this.get_cell_text(2), a, 'ctrl+k; Cell 2 text is correct');
+        this.validate_state('ctrl+k', 'command', 1);
+        this.trigger_keydown('ctrl+j'); // Move cell 1 down one
+        this.test.assertEquals(this.get_cell_text(1), a, 'ctrl+j; Cell 1 text is correct');
+        this.test.assertEquals(this.get_cell_text(2), b, 'ctrl+j; Cell 2 text is correct');
+        this.validate_state('ctrl+j', 'command', 2);
+
+        // Cell insertion
+        this.trigger_keydown('a'); // Creates one cell
+        this.test.assertEquals(this.get_cell_text(2), '', 'a; New cell 2 text is empty');
+        this.validate_state('a', 'command', 2);
+        this.trigger_keydown('b'); // Creates one cell
+        this.test.assertEquals(this.get_cell_text(2), '', 'b; Cell 2 text is still empty');
+        this.test.assertEquals(this.get_cell_text(3), '', 'b; New cell 3 text is empty');
+        this.validate_state('b', 'command', 3);
+
+        // Copy/past/cut
+        var num_cells = this.get_cells_length();
+        this.test.assertEquals(this.get_cell_text(1), a, 'Verify that cell 1 is a');
+        this.select_cell(1);
+        this.trigger_keydown('x'); // Cut
+        this.validate_state('x', 'command', 1);
+        this.test.assertEquals(this.get_cells_length(), num_cells-1,  'Verify that the cell was removed.');
+        this.test.assertEquals(this.get_cell_text(1), '', 'Verify that cell 2 is now where cell 1 was.');
+        this.select_cell(2);
+        this.trigger_keydown('v'); // Paste
+        this.validate_state('v', 'command', 3);
 
     });
 
@@ -239,8 +281,8 @@ casper.notebook_test(function () {
     };
 
     this.is_editor_focus_valid = function() {
-        var cells = this.get_cells();
-        for (var i = 0; i < cells.length; i++) {
+        var cells_length = this.get_cells_length();
+        for (var i = 0; i < cells_length; i++) {
             if (!this.is_cell_editor_focus_valid(i)) {
                 return false;
             }
@@ -308,12 +350,6 @@ casper.notebook_test(function () {
         }, {});
     };
 
-    this.get_cells = function() {
-        return this.evaluate(function() {
-            return IPython.notebook.get_cells();
-        }, {});
-    };
-
     this.get_cell = function(index) {
         return this.evaluate(function(i) {
             var cell = IPython.notebook.get_cell(i);
@@ -343,14 +379,14 @@ casper.notebook_test(function () {
     };
 
     this.is_only_cell_on = function(i, on_class, off_class) {
-        var cells = this.get_cells();
-        for (var j = 0; j < cells.length; j++) {
+        var cells_length = this.get_cells_length();
+        for (var j = 0; j < cells_length; j++) {
             if (j === i) {
-                if (this._has_cell_class(j, off_class) || !this._has_cell_class(j, on_class)) {
+                if (this.cell_has_class(j, off_class) || !this.cell_has_class(j, on_class)) {
                     return false;
                 }
             } else {
-                if (!this._has_cell_class(j, off_class) || this._has_cell_class(j, on_class)) {
+                if (!this.cell_has_class(j, off_class) || this.cell_has_class(j, on_class)) {
                     return false;
                 }
             }
@@ -358,7 +394,7 @@ casper.notebook_test(function () {
         return true;
     };
 
-    this._has_cell_class = function(index, classes) {
+    this.cell_has_class = function(index, classes) {
         return this.evaluate(function(i, c) {
             var cell = IPython.notebook.get_cell(i);
             if (cell) {

From 6efa0a4dae5f62db0f396e8d21756774cf0035d0 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Tue, 11 Mar 2014 12:30:10 -0700
Subject: [PATCH 17/58] Added get_cell_text

---
 IPython/html/tests/util.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/IPython/html/tests/util.js b/IPython/html/tests/util.js
index 8c49dd240..63f4ada53 100644
--- a/IPython/html/tests/util.js
+++ b/IPython/html/tests/util.js
@@ -153,6 +153,14 @@ casper.set_cell_text = function(index, text){
     }, index, text);
 };
 
+// Get the text content of a cell.
+casper.get_cell_text = function(index){
+    return this.evaluate(function (index) {
+        var cell = IPython.notebook.get_cell(index);
+        return cell.get_text();
+    }, index);
+};
+
 // Inserts a cell at the bottom of the notebook
 // Returns the new cell's index.
 casper.insert_cell_at_bottom = function(cell_type){

From 23ca387dd72dc0bb7a8588d53c4365ca2e2d0420 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Tue, 11 Mar 2014 12:38:08 -0700
Subject: [PATCH 18/58] cutcopyandpaste

---
 IPython/html/tests/notebook/dualmode.js | 31 ++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 2f7ce2e49..32454ef55 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -229,17 +229,42 @@ casper.notebook_test(function () {
         this.test.assertEquals(this.get_cell_text(3), '', 'b; New cell 3 text is empty');
         this.validate_state('b', 'command', 3);
 
-        // Copy/past/cut
+        // Copy/paste/cut
         var num_cells = this.get_cells_length();
         this.test.assertEquals(this.get_cell_text(1), a, 'Verify that cell 1 is a');
         this.select_cell(1);
         this.trigger_keydown('x'); // Cut
         this.validate_state('x', 'command', 1);
-        this.test.assertEquals(this.get_cells_length(), num_cells-1,  'Verify that the cell was removed.');
+        this.test.assertEquals(this.get_cells_length(), num_cells-1,  'Verify that a cell was removed.');
         this.test.assertEquals(this.get_cell_text(1), '', 'Verify that cell 2 is now where cell 1 was.');
         this.select_cell(2);
         this.trigger_keydown('v'); // Paste
-        this.validate_state('v', 'command', 3);
+        this.validate_state('v', 'command', 3); // Selection should move to pasted cell, below current cell.
+        this.test.assertEquals(this.get_cell_text(3), a, 'Verify that cell 3 has the cut contents.');
+        this.test.assertEquals(this.get_cells_length(), num_cells,  'Verify a the cell was added.');
+        this.trigger_keydown('v'); // Paste
+        this.validate_state('v', 'command', 4); // Selection should move to pasted cell, below current cell.
+        this.test.assertEquals(this.get_cell_text(4), a, 'Verify that cell 4 has the cut contents.');
+        this.test.assertEquals(this.get_cells_length(), num_cells+1,  'Verify a the cell was added.');
+        this.select_cell(5);
+        this.trigger_keydown('c'); // Copy
+        this.validate_state('c', 'command', 5);
+        this.test.assertEquals(this.get_cell_text(5), b, 'Verify that cell 5 is b');
+        this.select_cell(6);
+        this.trigger_keydown('c'); // Copy
+        this.validate_state('c', 'command', 6);
+        this.test.assertEquals(this.get_cell_text(6), c, 'Verify that cell 6 is c');
+        this.trigger_keydown('v'); // Paste
+        this.validate_state('v', 'command', 7);
+        this.test.assertEquals(this.get_cell_text(6), c, 'Verify that cell 6 still has the copied contents.');
+        this.test.assertEquals(this.get_cell_text(7), c, 'Verify that cell 7 has the copied contents.');
+        this.test.assertEquals(this.get_cells_length(), num_cells+2,  'Verify a the cell was added.');
+        this.select_cell(0);
+        this.trigger_keydown('shift+v'); // Paste
+        this.validate_state('shift+v', 'command', 0);
+        this.test.assertEquals(this.get_cell_text(0), c, 'Verify that cell 0 has the copied contents.');
+        this.test.assertEquals(this.get_cells_length(), num_cells+3,  'Verify a the cell was added.');
+        
 
     });
 

From c73bef017d24ff4153800d31af34edc8e9e62266 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Tue, 11 Mar 2014 12:56:05 -0700
Subject: [PATCH 19/58] Added split merge tests

---
 IPython/html/tests/notebook/dualmode.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 32454ef55..b04210e89 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -265,6 +265,22 @@ casper.notebook_test(function () {
         this.test.assertEquals(this.get_cell_text(0), c, 'Verify that cell 0 has the copied contents.');
         this.test.assertEquals(this.get_cells_length(), num_cells+3,  'Verify a the cell was added.');
         
+        // Split and merge cells
+        this.select_cell(0);
+        this.trigger_keydown('a', 'enter'); // Create cell above and enter edit mode.
+        this.validate_state('a, enter', 'edit', 0);
+        this.trigger_keydown('a', 'b', 'c', 'd', 'left', 'left'); // Type 'abcd' and place the cursor in the middle.
+        this.validate_state('a, enter', 'edit', 0);
+        this.test.assertEquals(this.get_cell_text(0), 'abcd', 'Verify that cell 0 has the new contents.');
+        this.trigger_keydown('alt+-'); // Split
+        this.test.assertEquals(this.get_cell_text(0), 'ab', 'split; Verify that cell 0 has the first half.');
+        this.test.assertEquals(this.get_cell_text(1), 'cd', 'split; Verify that cell 1 has the second half.');
+        this.validate_state('split', 'edit', 1);
+        this.select_cell(0); // Move up to cell 0
+        this.trigger_keydown('shift+m'); // Merge
+        this.validate_state('merge', 'command', 0);
+        this.test.assertEquals(this.get_cell_text(0), 'ab\ncd', 'merge; Verify that cell 0 has the merged contents.');
+        
 
     });
 

From daf40e9ec5a0f8536843156028312477221cdf08 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Tue, 11 Mar 2014 12:58:35 -0700
Subject: [PATCH 20/58] Moved util functions into util.js

---
 IPython/html/tests/notebook/dualmode.js | 104 ------------------------
 IPython/html/tests/util.js              |  99 ++++++++++++++++++++++
 2 files changed, 99 insertions(+), 104 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index b04210e89..0c1d0be4d 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -280,8 +280,6 @@ casper.notebook_test(function () {
         this.trigger_keydown('shift+m'); // Merge
         this.validate_state('merge', 'command', 0);
         this.test.assertEquals(this.get_cell_text(0), 'ab\ncd', 'merge; Verify that cell 0 has the merged contents.');
-        
-
     });
 
     // Utility functions.
@@ -342,106 +340,4 @@ casper.notebook_test(function () {
         }
         return true;
     };
-
-
-    /* TODO: MOVE EVERYTHING BELOW THIS LINE INTO THE BASE (utils.js) */
-
-
-    this.select_cell = function (index) {
-        this.evaluate(function (i) {
-            IPython.notebook.select(i);
-        }, {i: index});
-    };
-
-    this.click_cell_editor = function(index) {
-        // Code Mirror does not play nicely with emulated brower events.  
-        // Instead of trying to emulate a click, here we run code similar to
-        // the code used in Code Mirror that handles the mousedown event on a
-        // region of codemirror that the user can focus.
-        this.evaluate(function (i) {
-            cm = IPython.notebook.get_cell(i).code_mirror;
-            if (cm.options.readOnly != "nocursor" && (document.activeElement != cm.display.input))
-                cm.display.input.focus();
-        }, {i: index});
-    };
-
-    this.focus_notebook = function() {
-        this.evaluate(function (){
-            $('#notebook').focus();
-        }, {});
-    };
-
-    this.trigger_keydown = function() {
-        for (var i = 0; i < arguments.length; i++) {
-            this.evaluate(function (k) {
-                IPython.keyboard.trigger_keydown(k);
-            }, {k: arguments[i]});    
-        }
-    };
-
-    this.get_keyboard_mode = function() {
-        return this.evaluate(function() {
-            return IPython.keyboard_manager.mode;
-        }, {});
-    };
-
-    this.get_notebook_mode = function() {
-        return this.evaluate(function() {
-            return IPython.notebook.mode;
-        }, {});
-    };
-
-    this.get_cell = function(index) {
-        return this.evaluate(function(i) {
-            var cell = IPython.notebook.get_cell(i);
-            if (cell) {
-                return cell;
-            }
-            return null;
-        }, {i : index});
-    };
-
-    this.is_cell_editor_focused = function(index) {
-        return this.evaluate(function(i) {
-            var cell = IPython.notebook.get_cell(i);
-            if (cell) {
-                return $(cell.code_mirror.getInputField()).is('.CodeMirror-focused *');
-            }
-            return false;
-        }, {i : index});
-    };
-
-    this.is_only_cell_selected = function(index) {
-        return this.is_only_cell_on(index, 'selected', 'unselected');
-    };
-
-    this.is_only_cell_edit = function(index) {
-        return this.is_only_cell_on(index, 'edit_mode', 'command_mode');
-    };
-
-    this.is_only_cell_on = function(i, on_class, off_class) {
-        var cells_length = this.get_cells_length();
-        for (var j = 0; j < cells_length; j++) {
-            if (j === i) {
-                if (this.cell_has_class(j, off_class) || !this.cell_has_class(j, on_class)) {
-                    return false;
-                }
-            } else {
-                if (!this.cell_has_class(j, off_class) || this.cell_has_class(j, on_class)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    };
-
-    this.cell_has_class = function(index, classes) {
-        return this.evaluate(function(i, c) {
-            var cell = IPython.notebook.get_cell(i);
-            if (cell) {
-                return cell.element.hasClass(c);
-            }
-            return false;
-        }, {i : index, c: classes});
-    };
 });
diff --git a/IPython/html/tests/util.js b/IPython/html/tests/util.js
index 63f4ada53..eb40b7635 100644
--- a/IPython/html/tests/util.js
+++ b/IPython/html/tests/util.js
@@ -233,6 +233,105 @@ casper.cell_element_function = function(index, selector, function_name, function
     }, index, selector, function_name, function_args);
 };
 
+
+casper.select_cell = function(index) {
+    this.evaluate(function (i) {
+        IPython.notebook.select(i);
+    }, {i: index});
+};
+
+casper.click_cell_editor = function(index) {
+    // Code Mirror does not play nicely with emulated brower events.  
+    // Instead of trying to emulate a click, here we run code similar to
+    // the code used in Code Mirror that handles the mousedown event on a
+    // region of codemirror that the user can focus.
+    this.evaluate(function (i) {
+        cm = IPython.notebook.get_cell(i).code_mirror;
+        if (cm.options.readOnly != "nocursor" && (document.activeElement != cm.display.input))
+            cm.display.input.focus();
+    }, {i: index});
+};
+
+casper.focus_notebook = function() {
+    this.evaluate(function (){
+        $('#notebook').focus();
+    }, {});
+};
+
+casper.trigger_keydown = function() {
+    for (var i = 0; i < arguments.length; i++) {
+        this.evaluate(function (k) {
+            IPython.keyboard.trigger_keydown(k);
+        }, {k: arguments[i]});    
+    }
+};
+
+casper.get_keyboard_mode = function() {
+    return this.evaluate(function() {
+        return IPython.keyboard_manager.mode;
+    }, {});
+};
+
+casper.get_notebook_mode = function() {
+    return this.evaluate(function() {
+        return IPython.notebook.mode;
+    }, {});
+};
+
+casper.get_cell = function(index) {
+    return this.evaluate(function(i) {
+        var cell = IPython.notebook.get_cell(i);
+        if (cell) {
+            return cell;
+        }
+        return null;
+    }, {i : index});
+};
+
+casper.is_cell_editor_focused = function(index) {
+    return this.evaluate(function(i) {
+        var cell = IPython.notebook.get_cell(i);
+        if (cell) {
+            return $(cell.code_mirror.getInputField()).is('.CodeMirror-focused *');
+        }
+        return false;
+    }, {i : index});
+};
+
+casper.is_only_cell_selected = function(index) {
+    return this.is_only_cell_on(index, 'selected', 'unselected');
+};
+
+casper.is_only_cell_edit = function(index) {
+    return this.is_only_cell_on(index, 'edit_mode', 'command_mode');
+};
+
+casper.is_only_cell_on = function(i, on_class, off_class) {
+    var cells_length = this.get_cells_length();
+    for (var j = 0; j < cells_length; j++) {
+        if (j === i) {
+            if (this.cell_has_class(j, off_class) || !this.cell_has_class(j, on_class)) {
+                return false;
+            }
+        } else {
+            if (!this.cell_has_class(j, off_class) || this.cell_has_class(j, on_class)) {
+                return false;
+            }
+        }
+    }
+    return true;
+};
+
+casper.cell_has_class = function(index, classes) {
+    return this.evaluate(function(i, c) {
+        var cell = IPython.notebook.get_cell(i);
+        if (cell) {
+            return cell.element.hasClass(c);
+        }
+        return false;
+    }, {i : index, c: classes});
+};
+
 // Wrap a notebook test to reduce boilerplate.
 casper.notebook_test = function(test) {
     this.open_new_notebook();

From a7dcdddd5455d75858947af3a31e90dfbcb315bf Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Tue, 11 Mar 2014 13:31:02 -0700
Subject: [PATCH 21/58] Fixed problem with split tests, added new function that
 sets the codemirror instance cursor coords

---
 IPython/html/tests/notebook/dualmode.js | 4 ++--
 IPython/html/tests/util.js              | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 0c1d0be4d..8f7d54cae 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -269,8 +269,8 @@ casper.notebook_test(function () {
         this.select_cell(0);
         this.trigger_keydown('a', 'enter'); // Create cell above and enter edit mode.
         this.validate_state('a, enter', 'edit', 0);
-        this.trigger_keydown('a', 'b', 'c', 'd', 'left', 'left'); // Type 'abcd' and place the cursor in the middle.
-        this.validate_state('a, enter', 'edit', 0);
+        this.set_cell_text(0, 'abcd');
+        this.set_cell_editor_cursor(0, 0, 2);
         this.test.assertEquals(this.get_cell_text(0), 'abcd', 'Verify that cell 0 has the new contents.');
         this.trigger_keydown('alt+-'); // Split
         this.test.assertEquals(this.get_cell_text(0), 'ab', 'split; Verify that cell 0 has the first half.');
diff --git a/IPython/html/tests/util.js b/IPython/html/tests/util.js
index eb40b7635..2ebf112ad 100644
--- a/IPython/html/tests/util.js
+++ b/IPython/html/tests/util.js
@@ -246,12 +246,19 @@ casper.click_cell_editor = function(index) {
     // the code used in Code Mirror that handles the mousedown event on a
     // region of codemirror that the user can focus.
     this.evaluate(function (i) {
-        cm = IPython.notebook.get_cell(i).code_mirror;
+        var cm = IPython.notebook.get_cell(i).code_mirror;
         if (cm.options.readOnly != "nocursor" && (document.activeElement != cm.display.input))
             cm.display.input.focus();
     }, {i: index});
 };
 
+casper.set_cell_editor_cursor = function(index, line_index, char_index) {
+    // Set the Code Mirror instance cursor's location.
+    this.evaluate(function (i, l, c) {
+        IPython.notebook.get_cell(i).code_mirror.setCursor(l, c);
+    }, {i: index, l: line_index, c: char_index});
+};
+
 casper.focus_notebook = function() {
     this.evaluate(function (){
         $('#notebook').focus();

From b9872db82b0dd74899baf0247bd6dae1d9429f12 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Tue, 11 Mar 2014 14:59:17 -0700
Subject: [PATCH 22/58] HUGE speed improvements to dual mode tests

---
 IPython/html/tests/notebook/dualmode.js | 174 +++++++++++-------------
 IPython/html/tests/util.js              |  15 +-
 2 files changed, 89 insertions(+), 100 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 8f7d54cae..2eb2e2d26 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -15,25 +15,26 @@ casper.notebook_test(function () {
     this.execute_cell_then(index);
 
     this.then(function () {
-        this.validate_state('initial state', 'edit', 0);
+        this.print_log();
+        this.validate_notebook_state('initial state', 'edit', 0);
         this.trigger_keydown('esc');
-        this.validate_state('esc', 'command', 0);
+        this.validate_notebook_state('esc', 'command', 0);
         this.trigger_keydown('down');
-        this.validate_state('down', 'command', 1);
+        this.validate_notebook_state('down', 'command', 1);
         this.trigger_keydown('enter');
-        this.validate_state('enter', 'edit', 1);
+        this.validate_notebook_state('enter', 'edit', 1);
         this.trigger_keydown('j');
-        this.validate_state('j in edit mode', 'edit', 1);
+        this.validate_notebook_state('j in edit mode', 'edit', 1);
         this.trigger_keydown('esc');
-        this.validate_state('esc', 'command', 1);
+        this.validate_notebook_state('esc', 'command', 1);
         this.trigger_keydown('j');
-        this.validate_state('j in command mode', 'command', 2);
+        this.validate_notebook_state('j in command mode', 'command', 2);
         this.click_cell_editor(0);
-        this.validate_state('click cell 0', 'edit', 0);
+        this.validate_notebook_state('click cell 0', 'edit', 0);
         this.click_cell_editor(3);
-        this.validate_state('click cell 3', 'edit', 3);
+        this.validate_notebook_state('click cell 3', 'edit', 3);
         this.trigger_keydown('esc');
-        this.validate_state('esc', 'command', 3);
+        this.validate_notebook_state('esc', 'command', 3);
 
         // Open keyboard help
         this.evaluate(function(){
@@ -41,7 +42,7 @@ casper.notebook_test(function () {
         }, {});
 
         this.trigger_keydown('k');
-        this.validate_state('k in command mode while keyboard help is up', 'command', 3);
+        this.validate_notebook_state('k in command mode while keyboard help is up', 'command', 3);
 
         // Close keyboard help
         this.evaluate(function(){
@@ -49,69 +50,69 @@ casper.notebook_test(function () {
         }, {});
 
         this.trigger_keydown('k');
-        this.validate_state('k in command mode', 'command', 2);
+        this.validate_notebook_state('k in command mode', 'command', 2);
         this.click_cell_editor(0);
-        this.validate_state('click cell 0', 'edit', 0);
+        this.validate_notebook_state('click cell 0', 'edit', 0);
         this.focus_notebook();
-        this.validate_state('focus #notebook', 'command', 0);
+        this.validate_notebook_state('focus #notebook', 'command', 0);
         this.click_cell_editor(0);
-        this.validate_state('click cell 0', 'edit', 0);
+        this.validate_notebook_state('click cell 0', 'edit', 0);
         this.focus_notebook();
-        this.validate_state('focus #notebook', 'command', 0);
+        this.validate_notebook_state('focus #notebook', 'command', 0);
         this.click_cell_editor(3);
-        this.validate_state('click cell 3', 'edit', 3);
+        this.validate_notebook_state('click cell 3', 'edit', 3);
 
         // shift+enter
         // last cell in notebook
         var base_index = 3;
         this.trigger_keydown('shift+enter'); // Creates one cell
-        this.validate_state('shift+enter (no cell below)', 'edit', base_index + 1);
+        this.validate_notebook_state('shift+enter (no cell below)', 'edit', base_index + 1);
         // not last cell in notebook & starts in edit mode
         this.click_cell_editor(base_index);
-        this.validate_state('click cell ' + base_index, 'edit', base_index);
+        this.validate_notebook_state('click cell ' + base_index, 'edit', base_index);
         this.trigger_keydown('shift+enter');
-        this.validate_state('shift+enter (cell exists below)', 'command', base_index + 1);
+        this.validate_notebook_state('shift+enter (cell exists below)', 'command', base_index + 1);
         // starts in command mode
         this.trigger_keydown('k');
-        this.validate_state('k in comand mode', 'command', base_index);
+        this.validate_notebook_state('k in comand mode', 'command', base_index);
         this.trigger_keydown('shift+enter');
-        this.validate_state('shift+enter (start in command mode)', 'command', base_index + 1);
+        this.validate_notebook_state('shift+enter (start in command mode)', 'command', base_index + 1);
 
         // ctrl+enter
         // last cell in notebook
         base_index++;
         this.trigger_keydown('ctrl+enter');
-        this.validate_state('ctrl+enter (no cell below)', 'command', base_index);
+        this.validate_notebook_state('ctrl+enter (no cell below)', 'command', base_index);
         // not last cell in notebook & starts in edit mode
         this.click_cell_editor(base_index-1);
-        this.validate_state('click cell ' + (base_index-1), 'edit', base_index-1);
+        this.validate_notebook_state('click cell ' + (base_index-1), 'edit', base_index-1);
         this.trigger_keydown('ctrl+enter');
-        this.validate_state('ctrl+enter (cell exists below)', 'command', base_index-1);
+        this.validate_notebook_state('ctrl+enter (cell exists below)', 'command', base_index-1);
         // starts in command mode
         this.trigger_keydown('j');
-        this.validate_state('j in comand mode', 'command', base_index);
+        this.validate_notebook_state('j in comand mode', 'command', base_index);
         this.trigger_keydown('ctrl+enter');
-        this.validate_state('ctrl+enter (start in command mode)', 'command', base_index);
+        this.validate_notebook_state('ctrl+enter (start in command mode)', 'command', base_index);
 
         // alt+enter
         // last cell in notebook
         this.trigger_keydown('alt+enter'); // Creates one cell
-        this.validate_state('alt+enter (no cell below)', 'edit', base_index + 1);
+        this.validate_notebook_state('alt+enter (no cell below)', 'edit', base_index + 1);
         // not last cell in notebook & starts in edit mode
         this.click_cell_editor(base_index);
-        this.validate_state('click cell ' + base_index, 'edit', base_index);
+        this.validate_notebook_state('click cell ' + base_index, 'edit', base_index);
         this.trigger_keydown('alt+enter'); // Creates one cell
-        this.validate_state('alt+enter (cell exists below)', 'edit', base_index + 1);
+        this.validate_notebook_state('alt+enter (cell exists below)', 'edit', base_index + 1);
         // starts in command mode
         this.trigger_keydown('esc', 'k');
-        this.validate_state('k in comand mode', 'command', base_index);
+        this.validate_notebook_state('k in comand mode', 'command', base_index);
         this.trigger_keydown('alt+enter'); // Creates one cell
-        this.validate_state('alt+enter (start in command mode)', 'edit', base_index + 1);
+        this.validate_notebook_state('alt+enter (start in command mode)', 'edit', base_index + 1);
 
         // Notebook will now have 8 cells, the index of the last cell will be 7.
         this.test.assertEquals(this.get_cells_length(), 8, '*-enter commands added cells where needed.');
         this.select_cell(7);
-        this.validate_state('click cell ' + 7 + ' and esc', 'command', 7);
+        this.validate_notebook_state('click cell ' + 7 + ' and esc', 'command', 7);
 
         // Cell mode change
         this.trigger_keydown('r');
@@ -137,7 +138,7 @@ casper.notebook_test(function () {
         // Cell deletion
         this.trigger_keydown('d', 'd');
         this.test.assertEquals(this.get_cells_length(), 7, 'dd actually deletes a cell');
-        this.validate_state('dd', 'command', 6);
+        this.validate_notebook_state('dd', 'command', 6);
 
         // Make sure that if the time between d presses is too long, nothing gets removed.
         this.trigger_keydown('d');
@@ -146,66 +147,66 @@ casper.notebook_test(function () {
     this.then(function () {
         this.trigger_keydown('d');
         this.test.assertEquals(this.get_cells_length(), 7, "d, 1 second wait, d doesn't delete a cell");
-        this.validate_state('d, 1 second wait, d', 'command', 6);
+        this.validate_notebook_state('d, 1 second wait, d', 'command', 6);
 
         // Up and down in command mode
         this.trigger_keydown('j');
-        this.validate_state('j at end of notebook', 'command', 6);
+        this.validate_notebook_state('j at end of notebook', 'command', 6);
         this.trigger_keydown('down');
-        this.validate_state('down at end of notebook', 'command', 6);
+        this.validate_notebook_state('down at end of notebook', 'command', 6);
         this.trigger_keydown('up');
-        this.validate_state('up', 'command', 5);
+        this.validate_notebook_state('up', 'command', 5);
         this.select_cell(0);
-        this.validate_state('select 0', 'command', 0);
+        this.validate_notebook_state('select 0', 'command', 0);
         this.trigger_keydown('k');
-        this.validate_state('k at top of notebook', 'command', 0);
+        this.validate_notebook_state('k at top of notebook', 'command', 0);
         this.trigger_keydown('up');
-        this.validate_state('up at top of notebook', 'command', 0);
+        this.validate_notebook_state('up at top of notebook', 'command', 0);
         this.trigger_keydown('down');
-        this.validate_state('down', 'command', 1);
+        this.validate_notebook_state('down', 'command', 1);
 
         // Up and down in edit mode
         this.click_cell_editor(6);
-        this.validate_state('click cell 6', 'edit', 6);
+        this.validate_notebook_state('click cell 6', 'edit', 6);
         this.trigger_keydown('down');
-        this.validate_state('down at end of notebook', 'edit', 6);
+        this.validate_notebook_state('down at end of notebook', 'edit', 6);
         this.trigger_keydown('up');
-        this.validate_state('up', 'edit', 5);
+        this.validate_notebook_state('up', 'edit', 5);
         this.click_cell_editor(0);
-        this.validate_state('click 0', 'edit', 0);
+        this.validate_notebook_state('click 0', 'edit', 0);
         this.trigger_keydown('up');
-        this.validate_state('up at top of notebook', 'edit', 0);
+        this.validate_notebook_state('up at top of notebook', 'edit', 0);
         this.trigger_keydown('down');
-        this.validate_state('down', 'edit', 1);
+        this.validate_notebook_state('down', 'edit', 1);
 
         // Markdown rendering / unredering
         this.select_cell(6);
-        this.validate_state('select 6', 'command', 6);
+        this.validate_notebook_state('select 6', 'command', 6);
         this.trigger_keydown('m');
         this.test.assertEquals(this.get_cell(6).cell_type, 'markdown', 'm; cell is markdown');
         this.test.assertEquals(this.get_cell(6).rendered, false, 'm; cell is rendered');
         this.trigger_keydown('enter');
         this.test.assertEquals(this.get_cell(6).rendered, false, 'enter; cell is unrendered');
-        this.validate_state('enter', 'edit', 6);
+        this.validate_notebook_state('enter', 'edit', 6);
         this.trigger_keydown('ctrl+enter');
         this.test.assertEquals(this.get_cell(6).rendered, true, 'ctrl+enter; cell is rendered');
-        this.validate_state('enter', 'command', 6);
+        this.validate_notebook_state('enter', 'command', 6);
         this.trigger_keydown('enter');
         this.test.assertEquals(this.get_cell(6).rendered, false, 'enter; cell is unrendered');
         this.select_cell(5);
         this.test.assertEquals(this.get_cell(6).rendered, false, 'select 5; cell 6 is still unrendered');
-        this.validate_state('select 5', 'command', 5);
+        this.validate_notebook_state('select 5', 'command', 5);
         this.select_cell(6);
-        this.validate_state('select 6', 'command', 6);
+        this.validate_notebook_state('select 6', 'command', 6);
         this.trigger_keydown('ctrl+enter');
         this.test.assertEquals(this.get_cell(6).rendered, true, 'ctrl+enter; cell is rendered');
         this.select_cell(5);
-        this.validate_state('select 5', 'command', 5);
+        this.validate_notebook_state('select 5', 'command', 5);
         this.trigger_keydown('shift+enter');
-        this.validate_state('shift+enter', 'command', 6);
+        this.validate_notebook_state('shift+enter', 'command', 6);
         this.test.assertEquals(this.get_cell(6).rendered, true, 'shift+enter; cell is rendered');
         this.trigger_keydown('shift+enter'); // Creates one cell
-        this.validate_state('shift+enter', 'edit', 7);
+        this.validate_notebook_state('shift+enter', 'edit', 7);
         this.test.assertEquals(this.get_cell(6).rendered, true, 'shift+enter; cell is rendered');
 
         // Cell movement ( ctrl+(k or j) )
@@ -214,81 +215,79 @@ casper.notebook_test(function () {
         this.trigger_keydown('ctrl+k'); // Move cell 2 up one
         this.test.assertEquals(this.get_cell_text(1), b, 'ctrl+k; Cell 1 text is correct');
         this.test.assertEquals(this.get_cell_text(2), a, 'ctrl+k; Cell 2 text is correct');
-        this.validate_state('ctrl+k', 'command', 1);
+        this.validate_notebook_state('ctrl+k', 'command', 1);
         this.trigger_keydown('ctrl+j'); // Move cell 1 down one
         this.test.assertEquals(this.get_cell_text(1), a, 'ctrl+j; Cell 1 text is correct');
         this.test.assertEquals(this.get_cell_text(2), b, 'ctrl+j; Cell 2 text is correct');
-        this.validate_state('ctrl+j', 'command', 2);
+        this.validate_notebook_state('ctrl+j', 'command', 2);
 
         // Cell insertion
         this.trigger_keydown('a'); // Creates one cell
         this.test.assertEquals(this.get_cell_text(2), '', 'a; New cell 2 text is empty');
-        this.validate_state('a', 'command', 2);
+        this.validate_notebook_state('a', 'command', 2);
         this.trigger_keydown('b'); // Creates one cell
         this.test.assertEquals(this.get_cell_text(2), '', 'b; Cell 2 text is still empty');
         this.test.assertEquals(this.get_cell_text(3), '', 'b; New cell 3 text is empty');
-        this.validate_state('b', 'command', 3);
+        this.validate_notebook_state('b', 'command', 3);
 
         // Copy/paste/cut
         var num_cells = this.get_cells_length();
         this.test.assertEquals(this.get_cell_text(1), a, 'Verify that cell 1 is a');
         this.select_cell(1);
         this.trigger_keydown('x'); // Cut
-        this.validate_state('x', 'command', 1);
+        this.validate_notebook_state('x', 'command', 1);
         this.test.assertEquals(this.get_cells_length(), num_cells-1,  'Verify that a cell was removed.');
         this.test.assertEquals(this.get_cell_text(1), '', 'Verify that cell 2 is now where cell 1 was.');
         this.select_cell(2);
         this.trigger_keydown('v'); // Paste
-        this.validate_state('v', 'command', 3); // Selection should move to pasted cell, below current cell.
+        this.validate_notebook_state('v', 'command', 3); // Selection should move to pasted cell, below current cell.
         this.test.assertEquals(this.get_cell_text(3), a, 'Verify that cell 3 has the cut contents.');
         this.test.assertEquals(this.get_cells_length(), num_cells,  'Verify a the cell was added.');
         this.trigger_keydown('v'); // Paste
-        this.validate_state('v', 'command', 4); // Selection should move to pasted cell, below current cell.
+        this.validate_notebook_state('v', 'command', 4); // Selection should move to pasted cell, below current cell.
         this.test.assertEquals(this.get_cell_text(4), a, 'Verify that cell 4 has the cut contents.');
         this.test.assertEquals(this.get_cells_length(), num_cells+1,  'Verify a the cell was added.');
         this.select_cell(5);
         this.trigger_keydown('c'); // Copy
-        this.validate_state('c', 'command', 5);
+        this.validate_notebook_state('c', 'command', 5);
         this.test.assertEquals(this.get_cell_text(5), b, 'Verify that cell 5 is b');
         this.select_cell(6);
         this.trigger_keydown('c'); // Copy
-        this.validate_state('c', 'command', 6);
+        this.validate_notebook_state('c', 'command', 6);
         this.test.assertEquals(this.get_cell_text(6), c, 'Verify that cell 6 is c');
         this.trigger_keydown('v'); // Paste
-        this.validate_state('v', 'command', 7);
+        this.validate_notebook_state('v', 'command', 7);
         this.test.assertEquals(this.get_cell_text(6), c, 'Verify that cell 6 still has the copied contents.');
         this.test.assertEquals(this.get_cell_text(7), c, 'Verify that cell 7 has the copied contents.');
         this.test.assertEquals(this.get_cells_length(), num_cells+2,  'Verify a the cell was added.');
         this.select_cell(0);
         this.trigger_keydown('shift+v'); // Paste
-        this.validate_state('shift+v', 'command', 0);
+        this.validate_notebook_state('shift+v', 'command', 0);
         this.test.assertEquals(this.get_cell_text(0), c, 'Verify that cell 0 has the copied contents.');
         this.test.assertEquals(this.get_cells_length(), num_cells+3,  'Verify a the cell was added.');
         
         // Split and merge cells
         this.select_cell(0);
         this.trigger_keydown('a', 'enter'); // Create cell above and enter edit mode.
-        this.validate_state('a, enter', 'edit', 0);
+        this.validate_notebook_state('a, enter', 'edit', 0);
         this.set_cell_text(0, 'abcd');
         this.set_cell_editor_cursor(0, 0, 2);
         this.test.assertEquals(this.get_cell_text(0), 'abcd', 'Verify that cell 0 has the new contents.');
         this.trigger_keydown('alt+-'); // Split
         this.test.assertEquals(this.get_cell_text(0), 'ab', 'split; Verify that cell 0 has the first half.');
         this.test.assertEquals(this.get_cell_text(1), 'cd', 'split; Verify that cell 1 has the second half.');
-        this.validate_state('split', 'edit', 1);
+        this.validate_notebook_state('split', 'edit', 1);
         this.select_cell(0); // Move up to cell 0
         this.trigger_keydown('shift+m'); // Merge
-        this.validate_state('merge', 'command', 0);
+        this.validate_notebook_state('merge', 'command', 0);
         this.test.assertEquals(this.get_cell_text(0), 'ab\ncd', 'merge; Verify that cell 0 has the merged contents.');
     });
 
     // Utility functions.
-    this.validate_state = function(message, mode, cell_index) {
+    this.validate_notebook_state = function(message, mode, cell_index) {
         // General tests.
         this.test.assertEquals(this.get_keyboard_mode(), this.get_notebook_mode(),
             message + '; keyboard and notebook modes match');
-        // Is codemirror focused appropriately?
-        this.test.assert(this.is_editor_focus_valid(), message + '; cell editor focused appropriately');
         // Is the selected cell the only cell that is selected?
         if (cell_index!==undefined) {
             this.test.assert(this.is_only_cell_selected(cell_index),
@@ -303,41 +302,24 @@ casper.notebook_test(function () {
             // Make sure there isn't a single cell in edit mode.
             this.test.assert(this.is_only_cell_edit(null),
                 message + '; all cells in command mode');
+            this.test.assert(this.is_cell_editor_focused(null),
+                message + '; no cell editors are focused while in command mode');
 
         } else if (mode==='edit') {
             // Are the notebook and keyboard manager in edit mode?
             this.test.assertEquals(this.get_keyboard_mode(), 'edit',
                 message + '; in edit mode');
-            // Is the specified cell the only cell in edit mode?
             if (cell_index!==undefined) {
+                // Is the specified cell the only cell in edit mode?
                 this.test.assert(this.is_only_cell_edit(cell_index),
                     message + '; cell ' + cell_index + ' is the only cell in edit mode');
+                // Is the specified cell the only cell with a focused code mirror?
+                this.test.assert(this.is_cell_editor_focused(cell_index),
+                    message + '; cell ' + cell_index + '\'s editor is appropriately focused');
             }
 
         } else {
             this.test.assert(false, message + '; ' + mode + ' is an unknown mode');
         }
     };
-
-    this.is_editor_focus_valid = function() {
-        var cells_length = this.get_cells_length();
-        for (var i = 0; i < cells_length; i++) {
-            if (!this.is_cell_editor_focus_valid(i)) {
-                return false;
-            }
-        }
-        return true;
-    };
-
-    this.is_cell_editor_focus_valid = function(index) {
-        var cell = this.get_cell(index);
-        if (cell) {
-            if (cell.mode == 'edit') {
-                return this.is_cell_editor_focused(index);
-            } else {
-                return !this.is_cell_editor_focused(index);
-            }
-        }
-        return true;
-    };
 });
diff --git a/IPython/html/tests/util.js b/IPython/html/tests/util.js
index 2ebf112ad..6ee0341b3 100644
--- a/IPython/html/tests/util.js
+++ b/IPython/html/tests/util.js
@@ -296,10 +296,17 @@ casper.get_cell = function(index) {
 };
 
 casper.is_cell_editor_focused = function(index) {
+    // Make sure a cell's editor is the only editor focused on the page.
     return this.evaluate(function(i) {
-        var cell = IPython.notebook.get_cell(i);
-        if (cell) {
-            return $(cell.code_mirror.getInputField()).is('.CodeMirror-focused *');
+        var focused_textarea = $('#notebook .CodeMirror-focused textarea');
+        if (focused_textarea.length > 1) { throw 'More than one Code Mirror editor is focused at once!'; }
+        if (i === null) {
+            return focused_textarea.length === 0;
+        } else {
+            var cell = IPython.notebook.get_cell(i);
+            if (cell) {
+                return cell.code_mirror.getInputField() == focused_textarea[0];
+            }    
         }
         return false;
     }, {i : index});
@@ -399,7 +406,7 @@ casper.on('waitFor.timeout', function onWaitForTimeout(timeout) {
 });
 
 // Pass `console.log` calls from page JS to casper.
-casper.printLog = function () {
+casper.print_log = function () {
     this.on('remote.message', function(msg) {
         this.echo('Remote message caught: ' + msg);
     });

From 0262b724fc324a83d57810162348f228d260d229 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Tue, 11 Mar 2014 15:01:23 -0700
Subject: [PATCH 23/58] Move validate notebook state into utils

---
 IPython/html/tests/notebook/dualmode.js | 40 -------------------------
 IPython/html/tests/util.js              | 38 +++++++++++++++++++++++
 2 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 2eb2e2d26..8e218ea67 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -282,44 +282,4 @@ casper.notebook_test(function () {
         this.validate_notebook_state('merge', 'command', 0);
         this.test.assertEquals(this.get_cell_text(0), 'ab\ncd', 'merge; Verify that cell 0 has the merged contents.');
     });
-
-    // Utility functions.
-    this.validate_notebook_state = function(message, mode, cell_index) {
-        // General tests.
-        this.test.assertEquals(this.get_keyboard_mode(), this.get_notebook_mode(),
-            message + '; keyboard and notebook modes match');
-        // Is the selected cell the only cell that is selected?
-        if (cell_index!==undefined) {
-            this.test.assert(this.is_only_cell_selected(cell_index),
-                message + '; cell ' + cell_index + ' is the only cell selected');
-        }
-
-        // Mode specific tests.
-        if (mode==='command') {
-            // Are the notebook and keyboard manager in command mode?
-            this.test.assertEquals(this.get_keyboard_mode(), 'command',
-                message + '; in command mode');
-            // Make sure there isn't a single cell in edit mode.
-            this.test.assert(this.is_only_cell_edit(null),
-                message + '; all cells in command mode');
-            this.test.assert(this.is_cell_editor_focused(null),
-                message + '; no cell editors are focused while in command mode');
-
-        } else if (mode==='edit') {
-            // Are the notebook and keyboard manager in edit mode?
-            this.test.assertEquals(this.get_keyboard_mode(), 'edit',
-                message + '; in edit mode');
-            if (cell_index!==undefined) {
-                // Is the specified cell the only cell in edit mode?
-                this.test.assert(this.is_only_cell_edit(cell_index),
-                    message + '; cell ' + cell_index + ' is the only cell in edit mode');
-                // Is the specified cell the only cell with a focused code mirror?
-                this.test.assert(this.is_cell_editor_focused(cell_index),
-                    message + '; cell ' + cell_index + '\'s editor is appropriately focused');
-            }
-
-        } else {
-            this.test.assert(false, message + '; ' + mode + ' is an unknown mode');
-        }
-    };
 });
diff --git a/IPython/html/tests/util.js b/IPython/html/tests/util.js
index 6ee0341b3..836b717f2 100644
--- a/IPython/html/tests/util.js
+++ b/IPython/html/tests/util.js
@@ -233,6 +233,44 @@ casper.cell_element_function = function(index, selector, function_name, function
     }, index, selector, function_name, function_args);
 };
 
+casper.validate_notebook_state = function(message, mode, cell_index) {
+    // General tests.
+    this.test.assertEquals(this.get_keyboard_mode(), this.get_notebook_mode(),
+        message + '; keyboard and notebook modes match');
+    // Is the selected cell the only cell that is selected?
+    if (cell_index!==undefined) {
+        this.test.assert(this.is_only_cell_selected(cell_index),
+            message + '; cell ' + cell_index + ' is the only cell selected');
+    }
+
+    // Mode specific tests.
+    if (mode==='command') {
+        // Are the notebook and keyboard manager in command mode?
+        this.test.assertEquals(this.get_keyboard_mode(), 'command',
+            message + '; in command mode');
+        // Make sure there isn't a single cell in edit mode.
+        this.test.assert(this.is_only_cell_edit(null),
+            message + '; all cells in command mode');
+        this.test.assert(this.is_cell_editor_focused(null),
+            message + '; no cell editors are focused while in command mode');
+
+    } else if (mode==='edit') {
+        // Are the notebook and keyboard manager in edit mode?
+        this.test.assertEquals(this.get_keyboard_mode(), 'edit',
+            message + '; in edit mode');
+        if (cell_index!==undefined) {
+            // Is the specified cell the only cell in edit mode?
+            this.test.assert(this.is_only_cell_edit(cell_index),
+                message + '; cell ' + cell_index + ' is the only cell in edit mode');
+            // Is the specified cell the only cell with a focused code mirror?
+            this.test.assert(this.is_cell_editor_focused(cell_index),
+                message + '; cell ' + cell_index + '\'s editor is appropriately focused');
+        }
+
+    } else {
+        this.test.assert(false, message + '; ' + mode + ' is an unknown mode');
+    }
+};
 
 casper.select_cell = function(index) {
     this.evaluate(function (i) {

From 1f4db77aec540323ea68fdb7f9b0bea7ee1ed199 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Tue, 11 Mar 2014 17:00:46 -0700
Subject: [PATCH 24/58] Cleaned up test names and locations.

---
 IPython/html/tests/notebook/dualmode.js       | 217 +-----------------
 .../html/tests/notebook/dualmode_arrows.js    |  49 ++++
 .../tests/notebook/dualmode_cellinsert.js     |  27 +++
 .../html/tests/notebook/dualmode_cellmode.js  |  28 +++
 .../html/tests/notebook/dualmode_clipboard.js |  55 +++++
 .../html/tests/notebook/dualmode_execute.js   |  72 ++++++
 .../html/tests/notebook/dualmode_markdown.js  |  39 ++++
 IPython/html/tests/notebook/dualmode_merge.js |  21 ++
 .../{merge_cells.js => merge_cells_api.js}    |   0
 9 files changed, 296 insertions(+), 212 deletions(-)
 create mode 100644 IPython/html/tests/notebook/dualmode_arrows.js
 create mode 100644 IPython/html/tests/notebook/dualmode_cellinsert.js
 create mode 100644 IPython/html/tests/notebook/dualmode_cellmode.js
 create mode 100644 IPython/html/tests/notebook/dualmode_clipboard.js
 create mode 100644 IPython/html/tests/notebook/dualmode_execute.js
 create mode 100644 IPython/html/tests/notebook/dualmode_markdown.js
 create mode 100644 IPython/html/tests/notebook/dualmode_merge.js
 rename IPython/html/tests/notebook/{merge_cells.js => merge_cells_api.js} (100%)

diff --git a/IPython/html/tests/notebook/dualmode.js b/IPython/html/tests/notebook/dualmode.js
index 8e218ea67..87b556765 100644
--- a/IPython/html/tests/notebook/dualmode.js
+++ b/IPython/html/tests/notebook/dualmode.js
@@ -15,7 +15,6 @@ casper.notebook_test(function () {
     this.execute_cell_then(index);
 
     this.then(function () {
-        this.print_log();
         this.validate_notebook_state('initial state', 'edit', 0);
         this.trigger_keydown('esc');
         this.validate_notebook_state('esc', 'command', 0);
@@ -62,83 +61,10 @@ casper.notebook_test(function () {
         this.click_cell_editor(3);
         this.validate_notebook_state('click cell 3', 'edit', 3);
 
-        // shift+enter
-        // last cell in notebook
-        var base_index = 3;
-        this.trigger_keydown('shift+enter'); // Creates one cell
-        this.validate_notebook_state('shift+enter (no cell below)', 'edit', base_index + 1);
-        // not last cell in notebook & starts in edit mode
-        this.click_cell_editor(base_index);
-        this.validate_notebook_state('click cell ' + base_index, 'edit', base_index);
-        this.trigger_keydown('shift+enter');
-        this.validate_notebook_state('shift+enter (cell exists below)', 'command', base_index + 1);
-        // starts in command mode
-        this.trigger_keydown('k');
-        this.validate_notebook_state('k in comand mode', 'command', base_index);
-        this.trigger_keydown('shift+enter');
-        this.validate_notebook_state('shift+enter (start in command mode)', 'command', base_index + 1);
-
-        // ctrl+enter
-        // last cell in notebook
-        base_index++;
-        this.trigger_keydown('ctrl+enter');
-        this.validate_notebook_state('ctrl+enter (no cell below)', 'command', base_index);
-        // not last cell in notebook & starts in edit mode
-        this.click_cell_editor(base_index-1);
-        this.validate_notebook_state('click cell ' + (base_index-1), 'edit', base_index-1);
-        this.trigger_keydown('ctrl+enter');
-        this.validate_notebook_state('ctrl+enter (cell exists below)', 'command', base_index-1);
-        // starts in command mode
-        this.trigger_keydown('j');
-        this.validate_notebook_state('j in comand mode', 'command', base_index);
-        this.trigger_keydown('ctrl+enter');
-        this.validate_notebook_state('ctrl+enter (start in command mode)', 'command', base_index);
-
-        // alt+enter
-        // last cell in notebook
-        this.trigger_keydown('alt+enter'); // Creates one cell
-        this.validate_notebook_state('alt+enter (no cell below)', 'edit', base_index + 1);
-        // not last cell in notebook & starts in edit mode
-        this.click_cell_editor(base_index);
-        this.validate_notebook_state('click cell ' + base_index, 'edit', base_index);
-        this.trigger_keydown('alt+enter'); // Creates one cell
-        this.validate_notebook_state('alt+enter (cell exists below)', 'edit', base_index + 1);
-        // starts in command mode
-        this.trigger_keydown('esc', 'k');
-        this.validate_notebook_state('k in comand mode', 'command', base_index);
-        this.trigger_keydown('alt+enter'); // Creates one cell
-        this.validate_notebook_state('alt+enter (start in command mode)', 'edit', base_index + 1);
-
-        // Notebook will now have 8 cells, the index of the last cell will be 7.
-        this.test.assertEquals(this.get_cells_length(), 8, '*-enter commands added cells where needed.');
-        this.select_cell(7);
-        this.validate_notebook_state('click cell ' + 7 + ' and esc', 'command', 7);
-
-        // Cell mode change
-        this.trigger_keydown('r');
-        this.test.assertEquals(this.get_cell(7).cell_type, 'raw', 'r; cell is raw');
-        this.trigger_keydown('1');
-        this.test.assertEquals(this.get_cell(7).cell_type, 'heading', '1; cell is heading');
-        this.test.assertEquals(this.get_cell(7).level, 1, '1; cell is level 1 heading');
-        this.trigger_keydown('2');
-        this.test.assertEquals(this.get_cell(7).level, 2, '2; cell is level 2 heading');
-        this.trigger_keydown('3');
-        this.test.assertEquals(this.get_cell(7).level, 3, '3; cell is level 3 heading');
-        this.trigger_keydown('4');
-        this.test.assertEquals(this.get_cell(7).level, 4, '4; cell is level 4 heading');
-        this.trigger_keydown('5');
-        this.test.assertEquals(this.get_cell(7).level, 5, '5; cell is level 5 heading');
-        this.trigger_keydown('6');
-        this.test.assertEquals(this.get_cell(7).level, 6, '6; cell is level 6 heading');
-        this.trigger_keydown('m');
-        this.test.assertEquals(this.get_cell(7).cell_type, 'markdown', 'm; cell is markdown');
-        this.trigger_keydown('y');
-        this.test.assertEquals(this.get_cell(7).cell_type, 'code', 'y; cell is code');
-
         // Cell deletion
-        this.trigger_keydown('d', 'd');
-        this.test.assertEquals(this.get_cells_length(), 7, 'dd actually deletes a cell');
-        this.validate_notebook_state('dd', 'command', 6);
+        this.trigger_keydown('esc', 'd', 'd');
+        this.test.assertEquals(this.get_cells_length(), 3, 'dd actually deletes a cell');
+        this.validate_notebook_state('dd', 'command', 2);
 
         // Make sure that if the time between d presses is too long, nothing gets removed.
         this.trigger_keydown('d');
@@ -146,140 +72,7 @@ casper.notebook_test(function () {
     this.wait(1000);
     this.then(function () {
         this.trigger_keydown('d');
-        this.test.assertEquals(this.get_cells_length(), 7, "d, 1 second wait, d doesn't delete a cell");
-        this.validate_notebook_state('d, 1 second wait, d', 'command', 6);
-
-        // Up and down in command mode
-        this.trigger_keydown('j');
-        this.validate_notebook_state('j at end of notebook', 'command', 6);
-        this.trigger_keydown('down');
-        this.validate_notebook_state('down at end of notebook', 'command', 6);
-        this.trigger_keydown('up');
-        this.validate_notebook_state('up', 'command', 5);
-        this.select_cell(0);
-        this.validate_notebook_state('select 0', 'command', 0);
-        this.trigger_keydown('k');
-        this.validate_notebook_state('k at top of notebook', 'command', 0);
-        this.trigger_keydown('up');
-        this.validate_notebook_state('up at top of notebook', 'command', 0);
-        this.trigger_keydown('down');
-        this.validate_notebook_state('down', 'command', 1);
-
-        // Up and down in edit mode
-        this.click_cell_editor(6);
-        this.validate_notebook_state('click cell 6', 'edit', 6);
-        this.trigger_keydown('down');
-        this.validate_notebook_state('down at end of notebook', 'edit', 6);
-        this.trigger_keydown('up');
-        this.validate_notebook_state('up', 'edit', 5);
-        this.click_cell_editor(0);
-        this.validate_notebook_state('click 0', 'edit', 0);
-        this.trigger_keydown('up');
-        this.validate_notebook_state('up at top of notebook', 'edit', 0);
-        this.trigger_keydown('down');
-        this.validate_notebook_state('down', 'edit', 1);
-
-        // Markdown rendering / unredering
-        this.select_cell(6);
-        this.validate_notebook_state('select 6', 'command', 6);
-        this.trigger_keydown('m');
-        this.test.assertEquals(this.get_cell(6).cell_type, 'markdown', 'm; cell is markdown');
-        this.test.assertEquals(this.get_cell(6).rendered, false, 'm; cell is rendered');
-        this.trigger_keydown('enter');
-        this.test.assertEquals(this.get_cell(6).rendered, false, 'enter; cell is unrendered');
-        this.validate_notebook_state('enter', 'edit', 6);
-        this.trigger_keydown('ctrl+enter');
-        this.test.assertEquals(this.get_cell(6).rendered, true, 'ctrl+enter; cell is rendered');
-        this.validate_notebook_state('enter', 'command', 6);
-        this.trigger_keydown('enter');
-        this.test.assertEquals(this.get_cell(6).rendered, false, 'enter; cell is unrendered');
-        this.select_cell(5);
-        this.test.assertEquals(this.get_cell(6).rendered, false, 'select 5; cell 6 is still unrendered');
-        this.validate_notebook_state('select 5', 'command', 5);
-        this.select_cell(6);
-        this.validate_notebook_state('select 6', 'command', 6);
-        this.trigger_keydown('ctrl+enter');
-        this.test.assertEquals(this.get_cell(6).rendered, true, 'ctrl+enter; cell is rendered');
-        this.select_cell(5);
-        this.validate_notebook_state('select 5', 'command', 5);
-        this.trigger_keydown('shift+enter');
-        this.validate_notebook_state('shift+enter', 'command', 6);
-        this.test.assertEquals(this.get_cell(6).rendered, true, 'shift+enter; cell is rendered');
-        this.trigger_keydown('shift+enter'); // Creates one cell
-        this.validate_notebook_state('shift+enter', 'edit', 7);
-        this.test.assertEquals(this.get_cell(6).rendered, true, 'shift+enter; cell is rendered');
-
-        // Cell movement ( ctrl+(k or j) )
-        this.select_cell(2);
-        this.test.assertEquals(this.get_cell_text(2), b, 'select 2; Cell 2 text is correct');
-        this.trigger_keydown('ctrl+k'); // Move cell 2 up one
-        this.test.assertEquals(this.get_cell_text(1), b, 'ctrl+k; Cell 1 text is correct');
-        this.test.assertEquals(this.get_cell_text(2), a, 'ctrl+k; Cell 2 text is correct');
-        this.validate_notebook_state('ctrl+k', 'command', 1);
-        this.trigger_keydown('ctrl+j'); // Move cell 1 down one
-        this.test.assertEquals(this.get_cell_text(1), a, 'ctrl+j; Cell 1 text is correct');
-        this.test.assertEquals(this.get_cell_text(2), b, 'ctrl+j; Cell 2 text is correct');
-        this.validate_notebook_state('ctrl+j', 'command', 2);
-
-        // Cell insertion
-        this.trigger_keydown('a'); // Creates one cell
-        this.test.assertEquals(this.get_cell_text(2), '', 'a; New cell 2 text is empty');
-        this.validate_notebook_state('a', 'command', 2);
-        this.trigger_keydown('b'); // Creates one cell
-        this.test.assertEquals(this.get_cell_text(2), '', 'b; Cell 2 text is still empty');
-        this.test.assertEquals(this.get_cell_text(3), '', 'b; New cell 3 text is empty');
-        this.validate_notebook_state('b', 'command', 3);
-
-        // Copy/paste/cut
-        var num_cells = this.get_cells_length();
-        this.test.assertEquals(this.get_cell_text(1), a, 'Verify that cell 1 is a');
-        this.select_cell(1);
-        this.trigger_keydown('x'); // Cut
-        this.validate_notebook_state('x', 'command', 1);
-        this.test.assertEquals(this.get_cells_length(), num_cells-1,  'Verify that a cell was removed.');
-        this.test.assertEquals(this.get_cell_text(1), '', 'Verify that cell 2 is now where cell 1 was.');
-        this.select_cell(2);
-        this.trigger_keydown('v'); // Paste
-        this.validate_notebook_state('v', 'command', 3); // Selection should move to pasted cell, below current cell.
-        this.test.assertEquals(this.get_cell_text(3), a, 'Verify that cell 3 has the cut contents.');
-        this.test.assertEquals(this.get_cells_length(), num_cells,  'Verify a the cell was added.');
-        this.trigger_keydown('v'); // Paste
-        this.validate_notebook_state('v', 'command', 4); // Selection should move to pasted cell, below current cell.
-        this.test.assertEquals(this.get_cell_text(4), a, 'Verify that cell 4 has the cut contents.');
-        this.test.assertEquals(this.get_cells_length(), num_cells+1,  'Verify a the cell was added.');
-        this.select_cell(5);
-        this.trigger_keydown('c'); // Copy
-        this.validate_notebook_state('c', 'command', 5);
-        this.test.assertEquals(this.get_cell_text(5), b, 'Verify that cell 5 is b');
-        this.select_cell(6);
-        this.trigger_keydown('c'); // Copy
-        this.validate_notebook_state('c', 'command', 6);
-        this.test.assertEquals(this.get_cell_text(6), c, 'Verify that cell 6 is c');
-        this.trigger_keydown('v'); // Paste
-        this.validate_notebook_state('v', 'command', 7);
-        this.test.assertEquals(this.get_cell_text(6), c, 'Verify that cell 6 still has the copied contents.');
-        this.test.assertEquals(this.get_cell_text(7), c, 'Verify that cell 7 has the copied contents.');
-        this.test.assertEquals(this.get_cells_length(), num_cells+2,  'Verify a the cell was added.');
-        this.select_cell(0);
-        this.trigger_keydown('shift+v'); // Paste
-        this.validate_notebook_state('shift+v', 'command', 0);
-        this.test.assertEquals(this.get_cell_text(0), c, 'Verify that cell 0 has the copied contents.');
-        this.test.assertEquals(this.get_cells_length(), num_cells+3,  'Verify a the cell was added.');
-        
-        // Split and merge cells
-        this.select_cell(0);
-        this.trigger_keydown('a', 'enter'); // Create cell above and enter edit mode.
-        this.validate_notebook_state('a, enter', 'edit', 0);
-        this.set_cell_text(0, 'abcd');
-        this.set_cell_editor_cursor(0, 0, 2);
-        this.test.assertEquals(this.get_cell_text(0), 'abcd', 'Verify that cell 0 has the new contents.');
-        this.trigger_keydown('alt+-'); // Split
-        this.test.assertEquals(this.get_cell_text(0), 'ab', 'split; Verify that cell 0 has the first half.');
-        this.test.assertEquals(this.get_cell_text(1), 'cd', 'split; Verify that cell 1 has the second half.');
-        this.validate_notebook_state('split', 'edit', 1);
-        this.select_cell(0); // Move up to cell 0
-        this.trigger_keydown('shift+m'); // Merge
-        this.validate_notebook_state('merge', 'command', 0);
-        this.test.assertEquals(this.get_cell_text(0), 'ab\ncd', 'merge; Verify that cell 0 has the merged contents.');
+        this.test.assertEquals(this.get_cells_length(), 3, "d, 1 second wait, d doesn't delete a cell");
+        this.validate_notebook_state('d, 1 second wait, d', 'command', 2);
     });
 });
diff --git a/IPython/html/tests/notebook/dualmode_arrows.js b/IPython/html/tests/notebook/dualmode_arrows.js
new file mode 100644
index 000000000..4b839ac8a
--- /dev/null
+++ b/IPython/html/tests/notebook/dualmode_arrows.js
@@ -0,0 +1,49 @@
+
+// Test
+casper.notebook_test(function () {
+    var a = 'print("a")';
+    var index = this.append_cell(a);
+    this.execute_cell_then(index);
+
+    var b = 'print("b")';
+    index = this.append_cell(b);
+    this.execute_cell_then(index);
+
+    var c = 'print("c")';
+    index = this.append_cell(c);
+    this.execute_cell_then(index);
+
+    this.then(function () {
+
+        // Up and down in command mode
+        this.select_cell(3);
+        this.trigger_keydown('j');
+        this.validate_notebook_state('j at end of notebook', 'command', 3);
+        this.trigger_keydown('down');
+        this.validate_notebook_state('down at end of notebook', 'command', 3);
+        this.trigger_keydown('up');
+        this.validate_notebook_state('up', 'command', 2);
+        this.select_cell(0);
+        this.validate_notebook_state('select 0', 'command', 0);
+        this.trigger_keydown('k');
+        this.validate_notebook_state('k at top of notebook', 'command', 0);
+        this.trigger_keydown('up');
+        this.validate_notebook_state('up at top of notebook', 'command', 0);
+        this.trigger_keydown('down');
+        this.validate_notebook_state('down', 'command', 1);
+
+        // Up and down in edit mode
+        this.click_cell_editor(3);
+        this.validate_notebook_state('click cell 3', 'edit', 3);
+        this.trigger_keydown('down');
+        this.validate_notebook_state('down at end of notebook', 'edit', 3);
+        this.trigger_keydown('up');
+        this.validate_notebook_state('up', 'edit', 2);
+        this.click_cell_editor(0);
+        this.validate_notebook_state('click 0', 'edit', 0);
+        this.trigger_keydown('up');
+        this.validate_notebook_state('up at top of notebook', 'edit', 0);
+        this.trigger_keydown('down');
+        this.validate_notebook_state('down', 'edit', 1);
+    });
+});
diff --git a/IPython/html/tests/notebook/dualmode_cellinsert.js b/IPython/html/tests/notebook/dualmode_cellinsert.js
new file mode 100644
index 000000000..59b89a329
--- /dev/null
+++ b/IPython/html/tests/notebook/dualmode_cellinsert.js
@@ -0,0 +1,27 @@
+
+// Test
+casper.notebook_test(function () {
+    var a = 'print("a")';
+    var index = this.append_cell(a);
+    this.execute_cell_then(index);
+
+    var b = 'print("b")';
+    index = this.append_cell(b);
+    this.execute_cell_then(index);
+
+    var c = 'print("c")';
+    index = this.append_cell(c);
+    this.execute_cell_then(index);
+
+    this.then(function () {
+        // Cell insertion
+        this.select_cell(2);
+        this.trigger_keydown('a'); // Creates one cell
+        this.test.assertEquals(this.get_cell_text(2), '', 'a; New cell 2 text is empty');
+        this.validate_notebook_state('a', 'command', 2);
+        this.trigger_keydown('b'); // Creates one cell
+        this.test.assertEquals(this.get_cell_text(2), '', 'b; Cell 2 text is still empty');
+        this.test.assertEquals(this.get_cell_text(3), '', 'b; New cell 3 text is empty');
+        this.validate_notebook_state('b', 'command', 3);
+    });
+});
\ No newline at end of file
diff --git a/IPython/html/tests/notebook/dualmode_cellmode.js b/IPython/html/tests/notebook/dualmode_cellmode.js
new file mode 100644
index 000000000..d4bf5f018
--- /dev/null
+++ b/IPython/html/tests/notebook/dualmode_cellmode.js
@@ -0,0 +1,28 @@
+// Test keyboard shortcuts that change the cell's mode.
+
+// Test
+casper.notebook_test(function () {
+    this.then(function () {
+        // Cell mode change
+        this.select_cell(0);
+        this.trigger_keydown('esc','r');
+        this.test.assertEquals(this.get_cell(0).cell_type, 'raw', 'r; cell is raw');
+        this.trigger_keydown('1');
+        this.test.assertEquals(this.get_cell(0).cell_type, 'heading', '1; cell is heading');
+        this.test.assertEquals(this.get_cell(0).level, 1, '1; cell is level 1 heading');
+        this.trigger_keydown('2');
+        this.test.assertEquals(this.get_cell(0).level, 2, '2; cell is level 2 heading');
+        this.trigger_keydown('3');
+        this.test.assertEquals(this.get_cell(0).level, 3, '3; cell is level 3 heading');
+        this.trigger_keydown('4');
+        this.test.assertEquals(this.get_cell(0).level, 4, '4; cell is level 4 heading');
+        this.trigger_keydown('5');
+        this.test.assertEquals(this.get_cell(0).level, 5, '5; cell is level 5 heading');
+        this.trigger_keydown('6');
+        this.test.assertEquals(this.get_cell(0).level, 6, '6; cell is level 6 heading');
+        this.trigger_keydown('m');
+        this.test.assertEquals(this.get_cell(0).cell_type, 'markdown', 'm; cell is markdown');
+        this.trigger_keydown('y');
+        this.test.assertEquals(this.get_cell(0).cell_type, 'code', 'y; cell is code');
+    });
+});
\ No newline at end of file
diff --git a/IPython/html/tests/notebook/dualmode_clipboard.js b/IPython/html/tests/notebook/dualmode_clipboard.js
new file mode 100644
index 000000000..3bda68dba
--- /dev/null
+++ b/IPython/html/tests/notebook/dualmode_clipboard.js
@@ -0,0 +1,55 @@
+
+       
+// Test
+casper.notebook_test(function () {
+    var a = 'print("a")';
+    var index = this.append_cell(a);
+    this.execute_cell_then(index);
+
+    var b = 'print("b")';
+    index = this.append_cell(b);
+    this.execute_cell_then(index);
+
+    var c = 'print("c")';
+    index = this.append_cell(c);
+    this.execute_cell_then(index);
+
+    this.then(function () {
+         // Copy/paste/cut
+        var num_cells = this.get_cells_length();
+        this.test.assertEquals(this.get_cell_text(1), a, 'Verify that cell 1 is a');
+        this.select_cell(1);
+        this.trigger_keydown('x'); // Cut
+        this.validate_notebook_state('x', 'command', 1);
+        this.test.assertEquals(this.get_cells_length(), num_cells-1,  'Verify that a cell was removed.');
+        this.test.assertEquals(this.get_cell_text(1), b, 'Verify that cell 2 is now where cell 1 was.');
+        this.select_cell(2);
+        this.trigger_keydown('v'); // Paste
+        this.validate_notebook_state('v', 'command', 3); // Selection should move to pasted cell, below current cell.
+        this.test.assertEquals(this.get_cell_text(3), a, 'Verify that cell 3 has the cut contents.');
+        this.test.assertEquals(this.get_cells_length(), num_cells,  'Verify a the cell was added.');
+        this.trigger_keydown('v'); // Paste
+        this.validate_notebook_state('v', 'command', 4); // Selection should move to pasted cell, below current cell.
+        this.test.assertEquals(this.get_cell_text(4), a, 'Verify that cell 4 has the cut contents.');
+        this.test.assertEquals(this.get_cells_length(), num_cells+1,  'Verify a the cell was added.');
+        this.select_cell(1);
+        this.trigger_keydown('c'); // Copy
+        this.validate_notebook_state('c', 'command', 1);
+        this.test.assertEquals(this.get_cell_text(1), b, 'Verify that cell 1 is b');
+        this.select_cell(2);
+        this.trigger_keydown('c'); // Copy
+        this.validate_notebook_state('c', 'command', 2);
+        this.test.assertEquals(this.get_cell_text(2), c, 'Verify that cell 2 is c');
+        this.select_cell(4);
+        this.trigger_keydown('v'); // Paste
+        this.validate_notebook_state('v', 'command', 5);
+        this.test.assertEquals(this.get_cell_text(2), c, 'Verify that cell 2 still has the copied contents.');
+        this.test.assertEquals(this.get_cell_text(5), c, 'Verify that cell 5 has the copied contents.');
+        this.test.assertEquals(this.get_cells_length(), num_cells+2,  'Verify a the cell was added.');
+        this.select_cell(0);
+        this.trigger_keydown('shift+v'); // Paste
+        this.validate_notebook_state('shift+v', 'command', 0);
+        this.test.assertEquals(this.get_cell_text(0), c, 'Verify that cell 0 has the copied contents.');
+        this.test.assertEquals(this.get_cells_length(), num_cells+3,  'Verify a the cell was added.');
+    });
+});
\ No newline at end of file
diff --git a/IPython/html/tests/notebook/dualmode_execute.js b/IPython/html/tests/notebook/dualmode_execute.js
new file mode 100644
index 000000000..750486efb
--- /dev/null
+++ b/IPython/html/tests/notebook/dualmode_execute.js
@@ -0,0 +1,72 @@
+// Test keyboard invoked execution.
+
+// Test
+casper.notebook_test(function () {
+    var a = 'print("a")';
+    var index = this.append_cell(a);
+    this.execute_cell_then(index);
+
+    var b = 'print("b")';
+    index = this.append_cell(b);
+    this.execute_cell_then(index);
+
+    var c = 'print("c")';
+    index = this.append_cell(c);
+    this.execute_cell_then(index);
+
+    this.then(function () {
+
+        // shift+enter
+        // last cell in notebook
+        var base_index = 3;
+        this.select_cell(base_index);
+        this.trigger_keydown('shift+enter'); // Creates one cell
+        this.validate_notebook_state('shift+enter (no cell below)', 'edit', base_index + 1);
+        // not last cell in notebook & starts in edit mode
+        this.click_cell_editor(base_index);
+        this.validate_notebook_state('click cell ' + base_index, 'edit', base_index);
+        this.trigger_keydown('shift+enter');
+        this.validate_notebook_state('shift+enter (cell exists below)', 'command', base_index + 1);
+        // starts in command mode
+        this.trigger_keydown('k');
+        this.validate_notebook_state('k in comand mode', 'command', base_index);
+        this.trigger_keydown('shift+enter');
+        this.validate_notebook_state('shift+enter (start in command mode)', 'command', base_index + 1);
+
+        // ctrl+enter
+        // last cell in notebook
+        base_index++;
+        this.trigger_keydown('ctrl+enter');
+        this.validate_notebook_state('ctrl+enter (no cell below)', 'command', base_index);
+        // not last cell in notebook & starts in edit mode
+        this.click_cell_editor(base_index-1);
+        this.validate_notebook_state('click cell ' + (base_index-1), 'edit', base_index-1);
+        this.trigger_keydown('ctrl+enter');
+        this.validate_notebook_state('ctrl+enter (cell exists below)', 'command', base_index-1);
+        // starts in command mode
+        this.trigger_keydown('j');
+        this.validate_notebook_state('j in comand mode', 'command', base_index);
+        this.trigger_keydown('ctrl+enter');
+        this.validate_notebook_state('ctrl+enter (start in command mode)', 'command', base_index);
+
+        // alt+enter
+        // last cell in notebook
+        this.trigger_keydown('alt+enter'); // Creates one cell
+        this.validate_notebook_state('alt+enter (no cell below)', 'edit', base_index + 1);
+        // not last cell in notebook & starts in edit mode
+        this.click_cell_editor(base_index);
+        this.validate_notebook_state('click cell ' + base_index, 'edit', base_index);
+        this.trigger_keydown('alt+enter'); // Creates one cell
+        this.validate_notebook_state('alt+enter (cell exists below)', 'edit', base_index + 1);
+        // starts in command mode
+        this.trigger_keydown('esc', 'k');
+        this.validate_notebook_state('k in comand mode', 'command', base_index);
+        this.trigger_keydown('alt+enter'); // Creates one cell
+        this.validate_notebook_state('alt+enter (start in command mode)', 'edit', base_index + 1);
+
+        // Notebook will now have 8 cells, the index of the last cell will be 7.
+        this.test.assertEquals(this.get_cells_length(), 8, '*-enter commands added cells where needed.');
+        this.select_cell(7);
+        this.validate_notebook_state('click cell ' + 7 + ' and esc', 'command', 7);
+    });
+});
\ No newline at end of file
diff --git a/IPython/html/tests/notebook/dualmode_markdown.js b/IPython/html/tests/notebook/dualmode_markdown.js
new file mode 100644
index 000000000..924ff8cf8
--- /dev/null
+++ b/IPython/html/tests/notebook/dualmode_markdown.js
@@ -0,0 +1,39 @@
+
+// Test
+casper.notebook_test(function () {
+    var a = 'print("a")';
+    var index = this.append_cell(a);
+    this.execute_cell_then(index);
+
+    this.then(function () {
+        // Markdown rendering / unredering
+        this.select_cell(1);
+        this.validate_notebook_state('select 1', 'command', 1);
+        this.trigger_keydown('m');
+        this.test.assertEquals(this.get_cell(1).cell_type, 'markdown', 'm; cell is markdown');
+        this.test.assertEquals(this.get_cell(1).rendered, false, 'm; cell is rendered');
+        this.trigger_keydown('enter');
+        this.test.assertEquals(this.get_cell(1).rendered, false, 'enter; cell is unrendered');
+        this.validate_notebook_state('enter', 'edit', 1);
+        this.trigger_keydown('ctrl+enter');
+        this.test.assertEquals(this.get_cell(1).rendered, true, 'ctrl+enter; cell is rendered');
+        this.validate_notebook_state('enter', 'command', 1);
+        this.trigger_keydown('enter');
+        this.test.assertEquals(this.get_cell(1).rendered, false, 'enter; cell is unrendered');
+        this.select_cell(0);
+        this.test.assertEquals(this.get_cell(1).rendered, false, 'select 0; cell 1 is still unrendered');
+        this.validate_notebook_state('select 0', 'command', 0);
+        this.select_cell(1);
+        this.validate_notebook_state('select 1', 'command', 1);
+        this.trigger_keydown('ctrl+enter');
+        this.test.assertEquals(this.get_cell(1).rendered, true, 'ctrl+enter; cell is rendered');
+        this.select_cell(0);
+        this.validate_notebook_state('select 0', 'command', 0);
+        this.trigger_keydown('shift+enter');
+        this.validate_notebook_state('shift+enter', 'command', 1);
+        this.test.assertEquals(this.get_cell(1).rendered, true, 'shift+enter; cell is rendered');
+        this.trigger_keydown('shift+enter'); // Creates one cell
+        this.validate_notebook_state('shift+enter', 'edit', 2);
+        this.test.assertEquals(this.get_cell(1).rendered, true, 'shift+enter; cell is rendered');
+    });
+});
\ No newline at end of file
diff --git a/IPython/html/tests/notebook/dualmode_merge.js b/IPython/html/tests/notebook/dualmode_merge.js
new file mode 100644
index 000000000..5d8279815
--- /dev/null
+++ b/IPython/html/tests/notebook/dualmode_merge.js
@@ -0,0 +1,21 @@
+
+// Test
+casper.notebook_test(function () {
+    this.then(function () {
+        // Split and merge cells
+        this.select_cell(0);
+        this.trigger_keydown('a', 'enter'); // Create cell above and enter edit mode.
+        this.validate_notebook_state('a, enter', 'edit', 0);
+        this.set_cell_text(0, 'abcd');
+        this.set_cell_editor_cursor(0, 0, 2);
+        this.test.assertEquals(this.get_cell_text(0), 'abcd', 'Verify that cell 0 has the new contents.');
+        this.trigger_keydown('alt+-'); // Split
+        this.test.assertEquals(this.get_cell_text(0), 'ab', 'split; Verify that cell 0 has the first half.');
+        this.test.assertEquals(this.get_cell_text(1), 'cd', 'split; Verify that cell 1 has the second half.');
+        this.validate_notebook_state('split', 'edit', 1);
+        this.select_cell(0); // Move up to cell 0
+        this.trigger_keydown('shift+m'); // Merge
+        this.validate_notebook_state('merge', 'command', 0);
+        this.test.assertEquals(this.get_cell_text(0), 'ab\ncd', 'merge; Verify that cell 0 has the merged contents.');
+    });
+});
\ No newline at end of file
diff --git a/IPython/html/tests/notebook/merge_cells.js b/IPython/html/tests/notebook/merge_cells_api.js
similarity index 100%
rename from IPython/html/tests/notebook/merge_cells.js
rename to IPython/html/tests/notebook/merge_cells_api.js

From 1b46a777fb795b1a8be340b1ddd6cd99550cb71e Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Wed, 12 Mar 2014 10:42:46 -0700
Subject: [PATCH 25/58] Removed trigger keydown from keyboard.js, also added a
 bunch of missing semicolons (jshint)

---
 IPython/html/static/base/js/keyboard.js | 6 +++---
 IPython/html/tests/util.js              | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/IPython/html/static/base/js/keyboard.js b/IPython/html/static/base/js/keyboard.js
index 4fa77d5c9..37ab3e35e 100644
--- a/IPython/html/static/base/js/keyboard.js
+++ b/IPython/html/static/base/js/keyboard.js
@@ -134,7 +134,7 @@ IPython.keyboard = (function (IPython) {
         element = $(element);
         var event = shortcut_to_event(shortcut, 'keydown');
         element.trigger(event);
-    };
+    }
 
 
     // Shortcut manager class
@@ -192,7 +192,7 @@ IPython.keyboard = (function (IPython) {
         if (!suppress_help_update) {
             // update the keyboard shortcuts notebook help
             $([IPython.events]).trigger('rebuild.QuickHelp');
-        }
+    }
     };
 
     ShortcutManager.prototype.add_shortcuts = function (data) {
@@ -210,7 +210,7 @@ IPython.keyboard = (function (IPython) {
         if (!suppress_help_update) {
             // update the keyboard shortcuts notebook help
             $([IPython.events]).trigger('rebuild.QuickHelp');
-        }
+    }
     };
 
     ShortcutManager.prototype.count_handler = function (shortcut, event, data) {
diff --git a/IPython/html/tests/util.js b/IPython/html/tests/util.js
index 836b717f2..c197a7cc5 100644
--- a/IPython/html/tests/util.js
+++ b/IPython/html/tests/util.js
@@ -306,7 +306,9 @@ casper.focus_notebook = function() {
 casper.trigger_keydown = function() {
     for (var i = 0; i < arguments.length; i++) {
         this.evaluate(function (k) {
-            IPython.keyboard.trigger_keydown(k);
+            var element = $(document);
+            var event = IPython.keyboard.shortcut_to_event(k, 'keydown');
+            element.trigger(event);
         }, {k: arguments[i]});    
     }
 };

From a8783c45cbc2f84ca3bdc9350788b595018261e0 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Wed, 12 Mar 2014 10:51:03 -0700
Subject: [PATCH 26/58] Add comments

---
 IPython/html/tests/util.js | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/IPython/html/tests/util.js b/IPython/html/tests/util.js
index c197a7cc5..55af7ceca 100644
--- a/IPython/html/tests/util.js
+++ b/IPython/html/tests/util.js
@@ -233,6 +233,8 @@ casper.cell_element_function = function(index, selector, function_name, function
     }, index, selector, function_name, function_args);
 };
 
+// Validate the entire dual mode state of the notebook.  Make sure no more than
+// one cell is selected, focused, in edit mode, etc...
 casper.validate_notebook_state = function(message, mode, cell_index) {
     // General tests.
     this.test.assertEquals(this.get_keyboard_mode(), this.get_notebook_mode(),
@@ -272,12 +274,14 @@ casper.validate_notebook_state = function(message, mode, cell_index) {
     }
 };
 
+// Select a cell in the notebook.
 casper.select_cell = function(index) {
     this.evaluate(function (i) {
         IPython.notebook.select(i);
     }, {i: index});
 };
 
+// Emulate a click on a cell's editor.
 casper.click_cell_editor = function(index) {
     // Code Mirror does not play nicely with emulated brower events.  
     // Instead of trying to emulate a click, here we run code similar to
@@ -290,19 +294,21 @@ casper.click_cell_editor = function(index) {
     }, {i: index});
 };
 
+// Set the Code Mirror instance cursor's location.
 casper.set_cell_editor_cursor = function(index, line_index, char_index) {
-    // Set the Code Mirror instance cursor's location.
     this.evaluate(function (i, l, c) {
         IPython.notebook.get_cell(i).code_mirror.setCursor(l, c);
     }, {i: index, l: line_index, c: char_index});
 };
 
+// Focus the notebook div.
 casper.focus_notebook = function() {
     this.evaluate(function (){
         $('#notebook').focus();
     }, {});
 };
 
+// Emulate a keydown in the notebook.
 casper.trigger_keydown = function() {
     for (var i = 0; i < arguments.length; i++) {
         this.evaluate(function (k) {
@@ -313,18 +319,24 @@ casper.trigger_keydown = function() {
     }
 };
 
+// Get the mode of the keyboard manager.
 casper.get_keyboard_mode = function() {
     return this.evaluate(function() {
         return IPython.keyboard_manager.mode;
     }, {});
 };
 
+// Get the mode of the notebook.
 casper.get_notebook_mode = function() {
     return this.evaluate(function() {
         return IPython.notebook.mode;
     }, {});
 };
 
+// Get a single cell.
+//
+// Note: Handles to DOM elements stored in the cell will be useless once in
+//       CasperJS context.
 casper.get_cell = function(index) {
     return this.evaluate(function(i) {
         var cell = IPython.notebook.get_cell(i);
@@ -335,8 +347,8 @@ casper.get_cell = function(index) {
     }, {i : index});
 };
 
+// Make sure a cell's editor is the only editor focused on the page.
 casper.is_cell_editor_focused = function(index) {
-    // Make sure a cell's editor is the only editor focused on the page.
     return this.evaluate(function(i) {
         var focused_textarea = $('#notebook .CodeMirror-focused textarea');
         if (focused_textarea.length > 1) { throw 'More than one Code Mirror editor is focused at once!'; }
@@ -352,14 +364,21 @@ casper.is_cell_editor_focused = function(index) {
     }, {i : index});
 };
 
+// Check if a cell is the only cell selected.
+// Pass null as the index to check if no cells are selected.
 casper.is_only_cell_selected = function(index) {
     return this.is_only_cell_on(index, 'selected', 'unselected');
 };
 
+// Check if a cell is the only cell in edit mode.
+// Pass null as the index to check if all of the cells are in command mode.
 casper.is_only_cell_edit = function(index) {
     return this.is_only_cell_on(index, 'edit_mode', 'command_mode');
 };
 
+// Check if a cell is the only cell with the `on_class` DOM class applied to it.
+// All of the other cells are checked for the `off_class` DOM class.
+// Pass null as the index to check if all of the cells have the `off_class`.
 casper.is_only_cell_on = function(i, on_class, off_class) {
     var cells_length = this.get_cells_length();
     for (var j = 0; j < cells_length; j++) {
@@ -376,6 +395,7 @@ casper.is_only_cell_on = function(i, on_class, off_class) {
     return true;
 };
 
+// Check if a cell has a class.
 casper.cell_has_class = function(index, classes) {
     return this.evaluate(function(i, c) {
         var cell = IPython.notebook.get_cell(i);

From 147f35d899299dfb3bfd23c30554fcc396be0280 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Wed, 12 Mar 2014 10:53:28 -0700
Subject: [PATCH 27/58] demsemicolons

---
 IPython/html/tests/util.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/IPython/html/tests/util.js b/IPython/html/tests/util.js
index 55af7ceca..1636474c3 100644
--- a/IPython/html/tests/util.js
+++ b/IPython/html/tests/util.js
@@ -4,9 +4,9 @@
 
 // Get the URL of a notebook server on which to run tests.
 casper.get_notebook_server = function () {
-    port = casper.cli.get("port")
+    port = casper.cli.get("port");
     port = (typeof port === 'undefined') ? '8888' : port;
-    return 'http://127.0.0.1:' + port
+    return 'http://127.0.0.1:' + port;
 };
 
 // Create and open a new notebook.
@@ -107,13 +107,13 @@ casper.wait_for_widget = function (widget_info) {
             return IPython.notebook.kernel.widget_manager.get_model(m).pending_msgs;
         }, {m: widget_info.model_id});
 
-        if (pending == 0) {
+        if (pending === 0) {
             return true;
         } else {
             return false;
         }
     });
-}
+};
 
 // return an output of a given cell
 casper.get_output_cell = function (cell_num, out_num) {
@@ -141,7 +141,7 @@ casper.get_output_cell = function (cell_num, out_num) {
 casper.get_cells_length = function () {
     var result = casper.evaluate(function () {
         return IPython.notebook.get_cells().length;
-    })
+    });
     return result;
 };
 
@@ -434,14 +434,14 @@ casper.notebook_test = function(test) {
 casper.wait_for_dashboard = function () {
     // Wait for the dashboard list to load.
     casper.waitForSelector('.list_item');
-}
+};
 
 casper.open_dashboard = function () {
     // Start casper by opening the dashboard page.
     var baseUrl = this.get_notebook_server();
     this.start(baseUrl);
     this.wait_for_dashboard();
-}
+};
 
 casper.dashboard_test = function (test) {
     // Open the dashboard page and run a test.
@@ -457,9 +457,9 @@ casper.dashboard_test = function (test) {
     this.run(function() {
         this.test.done();
     });
-}
+};
 
-casper.options.waitTimeout=10000
+casper.options.waitTimeout=10000;
 casper.on('waitFor.timeout', function onWaitForTimeout(timeout) {
     this.echo("Timeout for " + casper.get_notebook_server());
     this.echo("Is the notebook server running?");

From ae2b0800cf39d8e425d2690848d1459d1a664b87 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Thu, 13 Mar 2014 09:59:42 -0700
Subject: [PATCH 28/58] Partial fix of problems b/c keydown move

---
 IPython/html/static/base/js/keyboard.js         |  3 +--
 IPython/html/tests/notebook/empty_arrow_keys.js | 10 +++++-----
 IPython/html/tests/notebook/execute_code.js     |  4 ++++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/IPython/html/static/base/js/keyboard.js b/IPython/html/static/base/js/keyboard.js
index 37ab3e35e..a5c8a69de 100644
--- a/IPython/html/static/base/js/keyboard.js
+++ b/IPython/html/static/base/js/keyboard.js
@@ -262,8 +262,7 @@ IPython.keyboard = (function (IPython) {
         normalize_key : normalize_key,
         normalize_shortcut : normalize_shortcut,
         shortcut_to_event : shortcut_to_event,
-        event_to_shortcut : event_to_shortcut,
-        trigger_keydown : trigger_keydown
+        event_to_shortcut : event_to_shortcut
     };
 
 }(IPython));
diff --git a/IPython/html/tests/notebook/empty_arrow_keys.js b/IPython/html/tests/notebook/empty_arrow_keys.js
index 6abed3a96..a949ce53a 100644
--- a/IPython/html/tests/notebook/empty_arrow_keys.js
+++ b/IPython/html/tests/notebook/empty_arrow_keys.js
@@ -10,12 +10,12 @@ casper.notebook_test(function () {
         for (i = 0; i < ncells; i++) {
             IPython.notebook.delete_cell();
         }
-        
-        // Simulate the "up arrow" and "down arrow" keys.
-        //
-        IPython.keyboard.trigger_keydown('up');
-        IPython.keyboard.trigger_keydown('down');
+            
         return true;
     });
+    
+    // Simulate the "up arrow" and "down arrow" keys.
+    this.trigger_keydown('up');
+    this.trigger_keydown('down');
     this.test.assertTrue(result, 'Up/down arrow okay in empty notebook.');
 });
diff --git a/IPython/html/tests/notebook/execute_code.js b/IPython/html/tests/notebook/execute_code.js
index 1af684f25..b3cc7c9a2 100644
--- a/IPython/html/tests/notebook/execute_code.js
+++ b/IPython/html/tests/notebook/execute_code.js
@@ -25,6 +25,10 @@ casper.notebook_test(function () {
         IPython.keyboard.trigger_keydown('shift-enter');
     });
 
+    this.then(function(){
+        
+    });
+
     this.wait_for_output(0);
 
     this.then(function () {

From baa28a0b81f7935b047fdf29b65da2696b31f4b6 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Thu, 13 Mar 2014 10:22:09 -0700
Subject: [PATCH 29/58] Final fixes?

---
 IPython/html/tests/notebook/execute_code.js    | 7 +++++--
 IPython/html/tests/notebook/interrupt.js       | 4 ++--
 IPython/html/tests/notebook/merge_cells_api.js | 6 +++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/IPython/html/tests/notebook/execute_code.js b/IPython/html/tests/notebook/execute_code.js
index b3cc7c9a2..076d3b70a 100644
--- a/IPython/html/tests/notebook/execute_code.js
+++ b/IPython/html/tests/notebook/execute_code.js
@@ -22,11 +22,11 @@ casper.notebook_test(function () {
         var cell = IPython.notebook.get_cell(0);
         cell.set_text('a=11; print(a)');
         cell.clear_output();
-        IPython.keyboard.trigger_keydown('shift-enter');
     });
 
     this.then(function(){
         
+        this.trigger_keydown('shift-enter');
     });
 
     this.wait_for_output(0);
@@ -45,7 +45,10 @@ casper.notebook_test(function () {
         var cell = IPython.notebook.get_cell(0);
         cell.set_text('a=12; print(a)');
         cell.clear_output();
-        IPython.keyboard.trigger_keydown('ctrl-enter');
+    });
+
+    this.then(function(){
+        this.trigger_keydown('ctrl-enter');
     });
 
     this.wait_for_output(0);
diff --git a/IPython/html/tests/notebook/interrupt.js b/IPython/html/tests/notebook/interrupt.js
index 2bb87f8a5..7c2912c4c 100644
--- a/IPython/html/tests/notebook/interrupt.js
+++ b/IPython/html/tests/notebook/interrupt.js
@@ -31,8 +31,8 @@ casper.notebook_test(function () {
     });
 
     // interrupt using Ctrl-M I keyboard shortcut
-    this.thenEvaluate( function() {
-        IPython.keyboard.trigger_keydown('i');
+    this.then(function(){
+        this.trigger_keydown('i');
     });
     
     this.wait_for_output(0);
diff --git a/IPython/html/tests/notebook/merge_cells_api.js b/IPython/html/tests/notebook/merge_cells_api.js
index 2d8561433..de01a000d 100644
--- a/IPython/html/tests/notebook/merge_cells_api.js
+++ b/IPython/html/tests/notebook/merge_cells_api.js
@@ -2,6 +2,7 @@
 // Test merging two notebook cells.
 //
 casper.notebook_test(function() {
+    var that = this;
     var output = this.evaluate(function () {
         // Fill in test data.
         IPython.notebook.command_mode();
@@ -9,7 +10,10 @@ casper.notebook_test(function() {
             var cell_one = IPython.notebook.get_selected_cell();
             cell_one.set_text('a = 5');
             
-            IPython.keyboard.trigger_keydown('b');
+            var element = $(document);
+            var event = IPython.keyboard.shortcut_to_event('b', 'keydown');
+            element.trigger(event);
+
             var cell_two = IPython.notebook.get_selected_cell();
             cell_two.set_text('print(a)');
         };

From 7c6c0b22b8a670abf9043db506fe7bf5ae9fc0cc Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Fri, 14 Mar 2014 11:35:43 -0700
Subject: [PATCH 30/58] Pythonize me captin' Made the method comments more
 pythonic by moving them within the method definitions.

---
 IPython/html/tests/util.js | 115 +++++++++++++++++++------------------
 1 file changed, 60 insertions(+), 55 deletions(-)

diff --git a/IPython/html/tests/util.js b/IPython/html/tests/util.js
index 1636474c3..a572190bc 100644
--- a/IPython/html/tests/util.js
+++ b/IPython/html/tests/util.js
@@ -2,15 +2,15 @@
 // Utility functions for the HTML notebook's CasperJS tests.
 //
 
-// Get the URL of a notebook server on which to run tests.
 casper.get_notebook_server = function () {
+    // Get the URL of a notebook server on which to run tests.
     port = casper.cli.get("port");
     port = (typeof port === 'undefined') ? '8888' : port;
     return 'http://127.0.0.1:' + port;
 };
 
-// Create and open a new notebook.
 casper.open_new_notebook = function () {
+    // Create and open a new notebook.
     var baseUrl = this.get_notebook_server();
     this.start(baseUrl);
     this.thenClick('button#new_notebook');
@@ -34,15 +34,15 @@ casper.open_new_notebook = function () {
     });
 };
 
-// Return whether or not the kernel is running.
 casper.kernel_running = function kernel_running() {
+    // Return whether or not the kernel is running.
     return this.evaluate(function kernel_running() {
         return IPython.notebook.kernel.running;
     });
 };
 
-// Shut down the current notebook's kernel.
 casper.shutdown_current_kernel = function () {
+    // Shut down the current notebook's kernel.
     this.thenEvaluate(function() {
         IPython.notebook.kernel.kill();
     });
@@ -50,8 +50,9 @@ casper.shutdown_current_kernel = function () {
     this.wait(1000);
 };
 
-// Delete created notebook.
 casper.delete_current_notebook = function () {
+    // Delete created notebook.
+
     // For some unknown reason, this doesn't work?!?
     this.thenEvaluate(function() {
         IPython.notebook.delete();
@@ -59,6 +60,7 @@ casper.delete_current_notebook = function () {
 };
 
 casper.wait_for_busy = function () {
+    // Waits for the notebook to enter a busy state.
     this.waitFor(function () {
         return this.evaluate(function () {
             return IPython._status == 'busy';
@@ -67,6 +69,7 @@ casper.wait_for_busy = function () {
 };
 
 casper.wait_for_idle = function () {
+    // Waits for the notebook to idle.
     this.waitFor(function () {
         return this.evaluate(function () {
             return IPython._status == 'idle';
@@ -74,8 +77,8 @@ casper.wait_for_idle = function () {
     });
 };
 
-// wait for the nth output in a given cell
 casper.wait_for_output = function (cell_num, out_num) {
+    // wait for the nth output in a given cell
     this.wait_for_idle();
     out_num = out_num || 0;
     this.then(function() {
@@ -94,14 +97,14 @@ casper.wait_for_output = function (cell_num, out_num) {
     });
 };
 
-// wait for a widget msg que to reach 0
-//
-// Parameters
-// ----------
-// widget_info : object
-//      Object which contains info related to the widget.  The model_id property
-//      is used to identify the widget.
 casper.wait_for_widget = function (widget_info) {
+    // wait for a widget msg que to reach 0
+    //
+    // Parameters
+    // ----------
+    // widget_info : object
+    //      Object which contains info related to the widget.  The model_id property
+    //      is used to identify the widget.
     this.waitFor(function () {
         var pending = this.evaluate(function (m) {
             return IPython.notebook.kernel.widget_manager.get_model(m).pending_msgs;
@@ -115,8 +118,8 @@ casper.wait_for_widget = function (widget_info) {
     });
 };
 
-// return an output of a given cell
 casper.get_output_cell = function (cell_num, out_num) {
+    // return an output of a given cell
     out_num = out_num || 0;
     var result = casper.evaluate(function (c, o) {
         var cell = IPython.notebook.get_cell(c);
@@ -137,33 +140,33 @@ casper.get_output_cell = function (cell_num, out_num) {
     }
 };
 
-// return the number of cells in the notebook
 casper.get_cells_length = function () {
+    // return the number of cells in the notebook
     var result = casper.evaluate(function () {
         return IPython.notebook.get_cells().length;
     });
     return result;
 };
 
-// Set the text content of a cell.
 casper.set_cell_text = function(index, text){
+    // Set the text content of a cell.
     this.evaluate(function (index, text) {
         var cell = IPython.notebook.get_cell(index);
         cell.set_text(text);
     }, index, text);
 };
 
-// Get the text content of a cell.
 casper.get_cell_text = function(index){
+    // Get the text content of a cell.
     return this.evaluate(function (index) {
         var cell = IPython.notebook.get_cell(index);
         return cell.get_text();
     }, index);
 };
 
-// Inserts a cell at the bottom of the notebook
-// Returns the new cell's index.
 casper.insert_cell_at_bottom = function(cell_type){
+    // Inserts a cell at the bottom of the notebook
+    // Returns the new cell's index.
     cell_type = cell_type || 'code';
 
     return this.evaluate(function (cell_type) {
@@ -172,9 +175,9 @@ casper.insert_cell_at_bottom = function(cell_type){
     }, cell_type);
 };
 
-// Insert a cell at the bottom of the notebook and set the cells text.
-// Returns the new cell's index.
 casper.append_cell = function(text, cell_type) { 
+    // Insert a cell at the bottom of the notebook and set the cells text.
+    // Returns the new cell's index.
     var index = this.insert_cell_at_bottom(cell_type);
     if (text !== undefined) {
         this.set_cell_text(index, text);
@@ -182,9 +185,9 @@ casper.append_cell = function(text, cell_type) {
     return index;
 };
 
-// Asynchronously executes a cell by index.
-// Returns the cell's index.
 casper.execute_cell = function(index){
+    // Asynchronously executes a cell by index.
+    // Returns the cell's index.
     var that = this;
     this.then(function(){
         that.evaluate(function (index) {
@@ -195,11 +198,11 @@ casper.execute_cell = function(index){
     return index;
 };
 
-// Synchronously executes a cell by index.
-// Optionally accepts a then_callback parameter.  then_callback will get called
-// when the cell  has finished executing.
-// Returns the cell's index.
 casper.execute_cell_then = function(index, then_callback) {
+    // Synchronously executes a cell by index.
+    // Optionally accepts a then_callback parameter.  then_callback will get called
+    // when the cell  has finished executing.
+    // Returns the cell's index.
     var return_val = this.execute_cell(index);
 
     this.wait_for_idle();
@@ -214,18 +217,18 @@ casper.execute_cell_then = function(index, then_callback) {
     return return_val;
 };
 
-// Utility function that allows us to easily check if an element exists 
-// within a cell.  Uses JQuery selector to look for the element.
 casper.cell_element_exists = function(index, selector){
+    // Utility function that allows us to easily check if an element exists 
+    // within a cell.  Uses JQuery selector to look for the element.
     return casper.evaluate(function (index, selector) {
         var $cell = IPython.notebook.get_cell(index).element;
         return $cell.find(selector).length > 0;
     }, index, selector);
 };
 
-// Utility function that allows us to execute a jQuery function on an 
-// element within a cell.
 casper.cell_element_function = function(index, selector, function_name, function_args){
+    // Utility function that allows us to execute a jQuery function on an 
+    // element within a cell.
     return casper.evaluate(function (index, selector, function_name, function_args) {
         var $cell = IPython.notebook.get_cell(index).element;
         var $el = $cell.find(selector);
@@ -233,9 +236,10 @@ casper.cell_element_function = function(index, selector, function_name, function
     }, index, selector, function_name, function_args);
 };
 
-// Validate the entire dual mode state of the notebook.  Make sure no more than
-// one cell is selected, focused, in edit mode, etc...
 casper.validate_notebook_state = function(message, mode, cell_index) {
+    // Validate the entire dual mode state of the notebook.  Make sure no more than
+    // one cell is selected, focused, in edit mode, etc...
+
     // General tests.
     this.test.assertEquals(this.get_keyboard_mode(), this.get_notebook_mode(),
         message + '; keyboard and notebook modes match');
@@ -274,15 +278,16 @@ casper.validate_notebook_state = function(message, mode, cell_index) {
     }
 };
 
-// Select a cell in the notebook.
 casper.select_cell = function(index) {
+    // Select a cell in the notebook.
     this.evaluate(function (i) {
         IPython.notebook.select(i);
     }, {i: index});
 };
 
-// Emulate a click on a cell's editor.
 casper.click_cell_editor = function(index) {
+    // Emulate a click on a cell's editor.
+    
     // Code Mirror does not play nicely with emulated brower events.  
     // Instead of trying to emulate a click, here we run code similar to
     // the code used in Code Mirror that handles the mousedown event on a
@@ -294,22 +299,22 @@ casper.click_cell_editor = function(index) {
     }, {i: index});
 };
 
-// Set the Code Mirror instance cursor's location.
 casper.set_cell_editor_cursor = function(index, line_index, char_index) {
+    // Set the Code Mirror instance cursor's location.
     this.evaluate(function (i, l, c) {
         IPython.notebook.get_cell(i).code_mirror.setCursor(l, c);
     }, {i: index, l: line_index, c: char_index});
 };
 
-// Focus the notebook div.
 casper.focus_notebook = function() {
+    // Focus the notebook div.
     this.evaluate(function (){
         $('#notebook').focus();
     }, {});
 };
 
-// Emulate a keydown in the notebook.
 casper.trigger_keydown = function() {
+    // Emulate a keydown in the notebook.
     for (var i = 0; i < arguments.length; i++) {
         this.evaluate(function (k) {
             var element = $(document);
@@ -319,25 +324,25 @@ casper.trigger_keydown = function() {
     }
 };
 
-// Get the mode of the keyboard manager.
 casper.get_keyboard_mode = function() {
+    // Get the mode of the keyboard manager.
     return this.evaluate(function() {
         return IPython.keyboard_manager.mode;
     }, {});
 };
 
-// Get the mode of the notebook.
 casper.get_notebook_mode = function() {
+    // Get the mode of the notebook.
     return this.evaluate(function() {
         return IPython.notebook.mode;
     }, {});
 };
 
-// Get a single cell.
-//
-// Note: Handles to DOM elements stored in the cell will be useless once in
-//       CasperJS context.
 casper.get_cell = function(index) {
+    // Get a single cell.
+    //
+    // Note: Handles to DOM elements stored in the cell will be useless once in
+    //       CasperJS context.
     return this.evaluate(function(i) {
         var cell = IPython.notebook.get_cell(i);
         if (cell) {
@@ -347,8 +352,8 @@ casper.get_cell = function(index) {
     }, {i : index});
 };
 
-// Make sure a cell's editor is the only editor focused on the page.
 casper.is_cell_editor_focused = function(index) {
+    // Make sure a cell's editor is the only editor focused on the page.
     return this.evaluate(function(i) {
         var focused_textarea = $('#notebook .CodeMirror-focused textarea');
         if (focused_textarea.length > 1) { throw 'More than one Code Mirror editor is focused at once!'; }
@@ -364,22 +369,22 @@ casper.is_cell_editor_focused = function(index) {
     }, {i : index});
 };
 
-// Check if a cell is the only cell selected.
-// Pass null as the index to check if no cells are selected.
 casper.is_only_cell_selected = function(index) {
+    // Check if a cell is the only cell selected.
+    // Pass null as the index to check if no cells are selected.
     return this.is_only_cell_on(index, 'selected', 'unselected');
 };
 
-// Check if a cell is the only cell in edit mode.
-// Pass null as the index to check if all of the cells are in command mode.
 casper.is_only_cell_edit = function(index) {
+    // Check if a cell is the only cell in edit mode.
+    // Pass null as the index to check if all of the cells are in command mode.
     return this.is_only_cell_on(index, 'edit_mode', 'command_mode');
 };
 
-// Check if a cell is the only cell with the `on_class` DOM class applied to it.
-// All of the other cells are checked for the `off_class` DOM class.
-// Pass null as the index to check if all of the cells have the `off_class`.
 casper.is_only_cell_on = function(i, on_class, off_class) {
+    // Check if a cell is the only cell with the `on_class` DOM class applied to it.
+    // All of the other cells are checked for the `off_class` DOM class.
+    // Pass null as the index to check if all of the cells have the `off_class`.
     var cells_length = this.get_cells_length();
     for (var j = 0; j < cells_length; j++) {
         if (j === i) {
@@ -395,8 +400,8 @@ casper.is_only_cell_on = function(i, on_class, off_class) {
     return true;
 };
 
-// Check if a cell has a class.
 casper.cell_has_class = function(index, classes) {
+    // Check if a cell has a class.
     return this.evaluate(function(i, c) {
         var cell = IPython.notebook.get_cell(i);
         if (cell) {
@@ -406,8 +411,8 @@ casper.cell_has_class = function(index, classes) {
     }, {i : index, c: classes});
 };
 
-// Wrap a notebook test to reduce boilerplate.
 casper.notebook_test = function(test) {
+    // Wrap a notebook test to reduce boilerplate.
     this.open_new_notebook();
     this.then(test);
 
@@ -465,8 +470,8 @@ casper.on('waitFor.timeout', function onWaitForTimeout(timeout) {
     this.echo("Is the notebook server running?");
 });
 
-// Pass `console.log` calls from page JS to casper.
 casper.print_log = function () {
+    // Pass `console.log` calls from page JS to casper.
     this.on('remote.message', function(msg) {
         this.echo('Remote message caught: ' + msg);
     });

From 1754e3291a0fa3f88d6c20ca2147b57970435297 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Thu, 20 Mar 2014 15:08:55 -0700
Subject: [PATCH 31/58] Call trigger_keydown in merge_cells_api test

---
 .../html/tests/notebook/merge_cells_api.js    | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/IPython/html/tests/notebook/merge_cells_api.js b/IPython/html/tests/notebook/merge_cells_api.js
index de01a000d..e6f844caa 100644
--- a/IPython/html/tests/notebook/merge_cells_api.js
+++ b/IPython/html/tests/notebook/merge_cells_api.js
@@ -3,40 +3,41 @@
 //
 casper.notebook_test(function() {
     var that = this;
-    var output = this.evaluate(function () {
-        // Fill in test data.
-        IPython.notebook.command_mode();
-        var set_cell_text = function () {
+    var set_cells_text =  function () {
+        that.evaluate(function() {
             var cell_one = IPython.notebook.get_selected_cell();
             cell_one.set_text('a = 5');
-            
-            var element = $(document);
-            var event = IPython.keyboard.shortcut_to_event('b', 'keydown');
-            element.trigger(event);
+        });
+
+        that.trigger_keydown('b');
 
+        that.evaluate(function() {
             var cell_two = IPython.notebook.get_selected_cell();
             cell_two.set_text('print(a)');
-        };
+        });
+    };
+
+    this.evaluate(function () {
+        IPython.notebook.command_mode();
+    });
         
-        // merge_cell_above()
-        set_cell_text();
+    // merge_cell_above()
+    set_cell_text();
+    var output_above = this.evaluate(function () {
         IPython.notebook.merge_cell_above();
-        var merged_above = IPython.notebook.get_selected_cell();
+        return IPython.notebook.get_selected_cell();
+    });
         
-        // merge_cell_below()
-        set_cell_text();
+    // merge_cell_below()
+    set_cell_text();
+    var output_below = this.evaluate(function() {
         IPython.notebook.select(0);
         IPython.notebook.merge_cell_below();
-        var merged_below = IPython.notebook.get_selected_cell();
-        
-        return {
-            above: merged_above.get_text(),
-            below: merged_below.get_text()
-        };
+        return IPython.notebook.get_selected_cell();    
     });
     
-    this.test.assertEquals(output.above, 'a = 5\nprint(a)',
+    this.test.assertEquals(output_above, 'a = 5\nprint(a)',
                            'Successful merge_cell_above().');
-    this.test.assertEquals(output.below, 'a = 5\nprint(a)',
+    this.test.assertEquals(output_below, 'a = 5\nprint(a)',
                            'Successful merge_cell_below().');
 });

From ca71afc5ea71d8123381f696d758bd598521e24e Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Thu, 20 Mar 2014 15:46:04 -0700
Subject: [PATCH 32/58] Note to self

---
 IPython/html/tests/notebook/dualmode_arrows.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/html/tests/notebook/dualmode_arrows.js b/IPython/html/tests/notebook/dualmode_arrows.js
index 4b839ac8a..5c00836a5 100644
--- a/IPython/html/tests/notebook/dualmode_arrows.js
+++ b/IPython/html/tests/notebook/dualmode_arrows.js
@@ -37,12 +37,14 @@ casper.notebook_test(function () {
         this.validate_notebook_state('click cell 3', 'edit', 3);
         this.trigger_keydown('down');
         this.validate_notebook_state('down at end of notebook', 'edit', 3);
+        // cursor
         this.trigger_keydown('up');
         this.validate_notebook_state('up', 'edit', 2);
         this.click_cell_editor(0);
         this.validate_notebook_state('click 0', 'edit', 0);
         this.trigger_keydown('up');
         this.validate_notebook_state('up at top of notebook', 'edit', 0);
+        // cursor
         this.trigger_keydown('down');
         this.validate_notebook_state('down', 'edit', 1);
     });

From 9c6d904f714a8269b8f8cd54387fc27c98a0d32a Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Thu, 20 Mar 2014 16:02:33 -0700
Subject: [PATCH 33/58] Set cursor pos in edit mode before attempting to jump
 cells.

---
 IPython/html/tests/notebook/dualmode_arrows.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode_arrows.js b/IPython/html/tests/notebook/dualmode_arrows.js
index 5c00836a5..034929b5f 100644
--- a/IPython/html/tests/notebook/dualmode_arrows.js
+++ b/IPython/html/tests/notebook/dualmode_arrows.js
@@ -37,14 +37,14 @@ casper.notebook_test(function () {
         this.validate_notebook_state('click cell 3', 'edit', 3);
         this.trigger_keydown('down');
         this.validate_notebook_state('down at end of notebook', 'edit', 3);
-        // cursor
+        this.set_cell_editor_cursor(3, 0, 0);
         this.trigger_keydown('up');
         this.validate_notebook_state('up', 'edit', 2);
         this.click_cell_editor(0);
         this.validate_notebook_state('click 0', 'edit', 0);
         this.trigger_keydown('up');
         this.validate_notebook_state('up at top of notebook', 'edit', 0);
-        // cursor
+        this.set_cell_editor_cursor(0, 0, 10);
         this.trigger_keydown('down');
         this.validate_notebook_state('down', 'edit', 1);
     });

From b80e11d3ceeb8c6be98aae600435abdae916892b Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Thu, 20 Mar 2014 16:08:37 -0700
Subject: [PATCH 34/58] Plus to minus shortcuts rebase fixes

---
 .../html/tests/notebook/dualmode_clipboard.js |  4 +-
 .../html/tests/notebook/dualmode_execute.js   | 42 +++++++++----------
 .../html/tests/notebook/dualmode_markdown.js  | 20 ++++-----
 IPython/html/tests/notebook/dualmode_merge.js |  4 +-
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/IPython/html/tests/notebook/dualmode_clipboard.js b/IPython/html/tests/notebook/dualmode_clipboard.js
index 3bda68dba..5068c49c6 100644
--- a/IPython/html/tests/notebook/dualmode_clipboard.js
+++ b/IPython/html/tests/notebook/dualmode_clipboard.js
@@ -47,8 +47,8 @@ casper.notebook_test(function () {
         this.test.assertEquals(this.get_cell_text(5), c, 'Verify that cell 5 has the copied contents.');
         this.test.assertEquals(this.get_cells_length(), num_cells+2,  'Verify a the cell was added.');
         this.select_cell(0);
-        this.trigger_keydown('shift+v'); // Paste
-        this.validate_notebook_state('shift+v', 'command', 0);
+        this.trigger_keydown('shift-v'); // Paste
+        this.validate_notebook_state('shift-v', 'command', 0);
         this.test.assertEquals(this.get_cell_text(0), c, 'Verify that cell 0 has the copied contents.');
         this.test.assertEquals(this.get_cells_length(), num_cells+3,  'Verify a the cell was added.');
     });
diff --git a/IPython/html/tests/notebook/dualmode_execute.js b/IPython/html/tests/notebook/dualmode_execute.js
index 750486efb..f4cd9542f 100644
--- a/IPython/html/tests/notebook/dualmode_execute.js
+++ b/IPython/html/tests/notebook/dualmode_execute.js
@@ -16,53 +16,53 @@ casper.notebook_test(function () {
 
     this.then(function () {
 
-        // shift+enter
+        // shift-enter
         // last cell in notebook
         var base_index = 3;
         this.select_cell(base_index);
-        this.trigger_keydown('shift+enter'); // Creates one cell
-        this.validate_notebook_state('shift+enter (no cell below)', 'edit', base_index + 1);
+        this.trigger_keydown('shift-enter'); // Creates one cell
+        this.validate_notebook_state('shift-enter (no cell below)', 'edit', base_index + 1);
         // not last cell in notebook & starts in edit mode
         this.click_cell_editor(base_index);
         this.validate_notebook_state('click cell ' + base_index, 'edit', base_index);
-        this.trigger_keydown('shift+enter');
-        this.validate_notebook_state('shift+enter (cell exists below)', 'command', base_index + 1);
+        this.trigger_keydown('shift-enter');
+        this.validate_notebook_state('shift-enter (cell exists below)', 'command', base_index + 1);
         // starts in command mode
         this.trigger_keydown('k');
         this.validate_notebook_state('k in comand mode', 'command', base_index);
-        this.trigger_keydown('shift+enter');
-        this.validate_notebook_state('shift+enter (start in command mode)', 'command', base_index + 1);
+        this.trigger_keydown('shift-enter');
+        this.validate_notebook_state('shift-enter (start in command mode)', 'command', base_index + 1);
 
-        // ctrl+enter
+        // ctrl-enter
         // last cell in notebook
         base_index++;
-        this.trigger_keydown('ctrl+enter');
-        this.validate_notebook_state('ctrl+enter (no cell below)', 'command', base_index);
+        this.trigger_keydown('ctrl-enter');
+        this.validate_notebook_state('ctrl-enter (no cell below)', 'command', base_index);
         // not last cell in notebook & starts in edit mode
         this.click_cell_editor(base_index-1);
         this.validate_notebook_state('click cell ' + (base_index-1), 'edit', base_index-1);
-        this.trigger_keydown('ctrl+enter');
-        this.validate_notebook_state('ctrl+enter (cell exists below)', 'command', base_index-1);
+        this.trigger_keydown('ctrl-enter');
+        this.validate_notebook_state('ctrl-enter (cell exists below)', 'command', base_index-1);
         // starts in command mode
         this.trigger_keydown('j');
         this.validate_notebook_state('j in comand mode', 'command', base_index);
-        this.trigger_keydown('ctrl+enter');
-        this.validate_notebook_state('ctrl+enter (start in command mode)', 'command', base_index);
+        this.trigger_keydown('ctrl-enter');
+        this.validate_notebook_state('ctrl-enter (start in command mode)', 'command', base_index);
 
-        // alt+enter
+        // alt-enter
         // last cell in notebook
-        this.trigger_keydown('alt+enter'); // Creates one cell
-        this.validate_notebook_state('alt+enter (no cell below)', 'edit', base_index + 1);
+        this.trigger_keydown('alt-enter'); // Creates one cell
+        this.validate_notebook_state('alt-enter (no cell below)', 'edit', base_index + 1);
         // not last cell in notebook & starts in edit mode
         this.click_cell_editor(base_index);
         this.validate_notebook_state('click cell ' + base_index, 'edit', base_index);
-        this.trigger_keydown('alt+enter'); // Creates one cell
-        this.validate_notebook_state('alt+enter (cell exists below)', 'edit', base_index + 1);
+        this.trigger_keydown('alt-enter'); // Creates one cell
+        this.validate_notebook_state('alt-enter (cell exists below)', 'edit', base_index + 1);
         // starts in command mode
         this.trigger_keydown('esc', 'k');
         this.validate_notebook_state('k in comand mode', 'command', base_index);
-        this.trigger_keydown('alt+enter'); // Creates one cell
-        this.validate_notebook_state('alt+enter (start in command mode)', 'edit', base_index + 1);
+        this.trigger_keydown('alt-enter'); // Creates one cell
+        this.validate_notebook_state('alt-enter (start in command mode)', 'edit', base_index + 1);
 
         // Notebook will now have 8 cells, the index of the last cell will be 7.
         this.test.assertEquals(this.get_cells_length(), 8, '*-enter commands added cells where needed.');
diff --git a/IPython/html/tests/notebook/dualmode_markdown.js b/IPython/html/tests/notebook/dualmode_markdown.js
index 924ff8cf8..d97405723 100644
--- a/IPython/html/tests/notebook/dualmode_markdown.js
+++ b/IPython/html/tests/notebook/dualmode_markdown.js
@@ -15,8 +15,8 @@ casper.notebook_test(function () {
         this.trigger_keydown('enter');
         this.test.assertEquals(this.get_cell(1).rendered, false, 'enter; cell is unrendered');
         this.validate_notebook_state('enter', 'edit', 1);
-        this.trigger_keydown('ctrl+enter');
-        this.test.assertEquals(this.get_cell(1).rendered, true, 'ctrl+enter; cell is rendered');
+        this.trigger_keydown('ctrl-enter');
+        this.test.assertEquals(this.get_cell(1).rendered, true, 'ctrl-enter; cell is rendered');
         this.validate_notebook_state('enter', 'command', 1);
         this.trigger_keydown('enter');
         this.test.assertEquals(this.get_cell(1).rendered, false, 'enter; cell is unrendered');
@@ -25,15 +25,15 @@ casper.notebook_test(function () {
         this.validate_notebook_state('select 0', 'command', 0);
         this.select_cell(1);
         this.validate_notebook_state('select 1', 'command', 1);
-        this.trigger_keydown('ctrl+enter');
-        this.test.assertEquals(this.get_cell(1).rendered, true, 'ctrl+enter; cell is rendered');
+        this.trigger_keydown('ctrl-enter');
+        this.test.assertEquals(this.get_cell(1).rendered, true, 'ctrl-enter; cell is rendered');
         this.select_cell(0);
         this.validate_notebook_state('select 0', 'command', 0);
-        this.trigger_keydown('shift+enter');
-        this.validate_notebook_state('shift+enter', 'command', 1);
-        this.test.assertEquals(this.get_cell(1).rendered, true, 'shift+enter; cell is rendered');
-        this.trigger_keydown('shift+enter'); // Creates one cell
-        this.validate_notebook_state('shift+enter', 'edit', 2);
-        this.test.assertEquals(this.get_cell(1).rendered, true, 'shift+enter; cell is rendered');
+        this.trigger_keydown('shift-enter');
+        this.validate_notebook_state('shift-enter', 'command', 1);
+        this.test.assertEquals(this.get_cell(1).rendered, true, 'shift-enter; cell is rendered');
+        this.trigger_keydown('shift-enter'); // Creates one cell
+        this.validate_notebook_state('shift-enter', 'edit', 2);
+        this.test.assertEquals(this.get_cell(1).rendered, true, 'shift-enter; cell is rendered');
     });
 });
\ No newline at end of file
diff --git a/IPython/html/tests/notebook/dualmode_merge.js b/IPython/html/tests/notebook/dualmode_merge.js
index 5d8279815..93bd2381b 100644
--- a/IPython/html/tests/notebook/dualmode_merge.js
+++ b/IPython/html/tests/notebook/dualmode_merge.js
@@ -9,12 +9,12 @@ casper.notebook_test(function () {
         this.set_cell_text(0, 'abcd');
         this.set_cell_editor_cursor(0, 0, 2);
         this.test.assertEquals(this.get_cell_text(0), 'abcd', 'Verify that cell 0 has the new contents.');
-        this.trigger_keydown('alt+-'); // Split
+        this.trigger_keydown('ctrl-shift-minus'); // Split
         this.test.assertEquals(this.get_cell_text(0), 'ab', 'split; Verify that cell 0 has the first half.');
         this.test.assertEquals(this.get_cell_text(1), 'cd', 'split; Verify that cell 1 has the second half.');
         this.validate_notebook_state('split', 'edit', 1);
         this.select_cell(0); // Move up to cell 0
-        this.trigger_keydown('shift+m'); // Merge
+        this.trigger_keydown('shift-m'); // Merge
         this.validate_notebook_state('merge', 'command', 0);
         this.test.assertEquals(this.get_cell_text(0), 'ab\ncd', 'merge; Verify that cell 0 has the merged contents.');
     });

From 42fa5831721c63aa43f40af232ccba146e4cfbbb Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Thu, 20 Mar 2014 16:12:42 -0700
Subject: [PATCH 35/58] Fix split shortcut

---
 IPython/html/tests/notebook/dualmode_merge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/html/tests/notebook/dualmode_merge.js b/IPython/html/tests/notebook/dualmode_merge.js
index 93bd2381b..573b4575d 100644
--- a/IPython/html/tests/notebook/dualmode_merge.js
+++ b/IPython/html/tests/notebook/dualmode_merge.js
@@ -9,7 +9,7 @@ casper.notebook_test(function () {
         this.set_cell_text(0, 'abcd');
         this.set_cell_editor_cursor(0, 0, 2);
         this.test.assertEquals(this.get_cell_text(0), 'abcd', 'Verify that cell 0 has the new contents.');
-        this.trigger_keydown('ctrl-shift-minus'); // Split
+        this.trigger_keydown('ctrl-shift-subtract'); // Split
         this.test.assertEquals(this.get_cell_text(0), 'ab', 'split; Verify that cell 0 has the first half.');
         this.test.assertEquals(this.get_cell_text(1), 'cd', 'split; Verify that cell 1 has the second half.');
         this.validate_notebook_state('split', 'edit', 1);

From af03114ef6d565f2b1bf96e742d9dc75941cb606 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Thu, 20 Mar 2014 16:15:24 -0700
Subject: [PATCH 36/58] s/set_cell_text/set_cells_text

---
 IPython/html/tests/notebook/merge_cells_api.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/html/tests/notebook/merge_cells_api.js b/IPython/html/tests/notebook/merge_cells_api.js
index e6f844caa..5329b6f0d 100644
--- a/IPython/html/tests/notebook/merge_cells_api.js
+++ b/IPython/html/tests/notebook/merge_cells_api.js
@@ -22,14 +22,14 @@ casper.notebook_test(function() {
     });
         
     // merge_cell_above()
-    set_cell_text();
+    set_cells_text();
     var output_above = this.evaluate(function () {
         IPython.notebook.merge_cell_above();
         return IPython.notebook.get_selected_cell();
     });
         
     // merge_cell_below()
-    set_cell_text();
+    set_cells_text();
     var output_below = this.evaluate(function() {
         IPython.notebook.select(0);
         IPython.notebook.merge_cell_below();

From 744f057cabd215dc8e9f40ba22bd828107f74d9c Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Thu, 20 Mar 2014 16:22:54 -0700
Subject: [PATCH 37/58] get_text() before returning results

---
 IPython/html/tests/notebook/merge_cells_api.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/html/tests/notebook/merge_cells_api.js b/IPython/html/tests/notebook/merge_cells_api.js
index 5329b6f0d..9dd2fbdcb 100644
--- a/IPython/html/tests/notebook/merge_cells_api.js
+++ b/IPython/html/tests/notebook/merge_cells_api.js
@@ -25,7 +25,7 @@ casper.notebook_test(function() {
     set_cells_text();
     var output_above = this.evaluate(function () {
         IPython.notebook.merge_cell_above();
-        return IPython.notebook.get_selected_cell();
+        return IPython.notebook.get_selected_cell().get_text();
     });
         
     // merge_cell_below()
@@ -33,7 +33,7 @@ casper.notebook_test(function() {
     var output_below = this.evaluate(function() {
         IPython.notebook.select(0);
         IPython.notebook.merge_cell_below();
-        return IPython.notebook.get_selected_cell();    
+        return IPython.notebook.get_selected_cell().get_text();
     });
     
     this.test.assertEquals(output_above, 'a = 5\nprint(a)',

From 607b96b19a1a14be07d9eee01791bfc47b52aef5 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Thu, 20 Mar 2014 18:45:06 -0700
Subject: [PATCH 38/58] Actually remove the trigger keydown method

---
 IPython/html/static/base/js/keyboard.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/IPython/html/static/base/js/keyboard.js b/IPython/html/static/base/js/keyboard.js
index a5c8a69de..e3c74b74b 100644
--- a/IPython/html/static/base/js/keyboard.js
+++ b/IPython/html/static/base/js/keyboard.js
@@ -128,15 +128,6 @@ IPython.keyboard = (function (IPython) {
         return shortcut;
     };
 
-    var trigger_keydown = function (shortcut, element) {
-        // Trigger shortcut keydown on an element
-        element = element || document;
-        element = $(element);
-        var event = shortcut_to_event(shortcut, 'keydown');
-        element.trigger(event);
-    }
-
-
     // Shortcut manager class
 
     var ShortcutManager = function (delay) {

From f5ad1cc398adf49c10c09146aa75c7d74e1c2352 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Mon, 24 Mar 2014 11:30:12 -0700
Subject: [PATCH 39/58] move prompts from margin to main column on small
 screens

This is mainly for nbviewer, but the relevant CSS lives in IPython.
---
 IPython/html/static/notebook/less/cell.less       |  8 ++++++++
 IPython/html/static/notebook/less/codecell.less   |  8 +++++++-
 IPython/html/static/notebook/less/notebook.less   |  8 ++++++++
 IPython/html/static/notebook/less/outputarea.less |  7 +++++++
 IPython/html/static/notebook/less/textcell.less   |  6 ++++++
 IPython/html/static/style/ipython.min.css         |  8 ++++----
 IPython/html/static/style/style.min.css           | 10 +++++-----
 7 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/IPython/html/static/notebook/less/cell.less b/IPython/html/static/notebook/less/cell.less
index 5514360d0..3cecbdf1b 100644
--- a/IPython/html/static/notebook/less/cell.less
+++ b/IPython/html/static/notebook/less/cell.less
@@ -33,6 +33,14 @@ div.prompt {
     line-height: @code_line_height;
 }
 
+@media (max-width: 480px) {
+    // prompts are in the main column on small screens,
+    // so text should be left-aligned
+    div.prompt {
+        text-align: left;
+    }
+}
+
 div.inner_cell {
     .vbox();
     .box-flex1();
diff --git a/IPython/html/static/notebook/less/codecell.less b/IPython/html/static/notebook/less/codecell.less
index 777f18584..8fc60b537 100644
--- a/IPython/html/static/notebook/less/codecell.less
+++ b/IPython/html/static/notebook/less/codecell.less
@@ -10,13 +10,19 @@ div.input {
     .hbox();
 }
 
+@media (max-width: 480px) {
+    // move prompts above code on small screens
+    div.input {
+        .vbox();
+    }
+}
+
 /* input_area and input_prompt must match in top border and margin for alignment */
 div.input_prompt {
     color: navy;
     border-top: 1px solid transparent;
 }
 
-
 // The styles related to div.highlight are for nbconvert HTML output only. This works
 // because the .highlight div isn't present in the live notebook. We could put this into
 // nbconvert, but it easily falls out of sync, can't use our less variables and doesn't
diff --git a/IPython/html/static/notebook/less/notebook.less b/IPython/html/static/notebook/less/notebook.less
index 8c6589e47..f7345d0a2 100644
--- a/IPython/html/static/notebook/less/notebook.less
+++ b/IPython/html/static/notebook/less/notebook.less
@@ -7,6 +7,14 @@ body.notebook_app {
     overflow: hidden;
 }
 
+@media (max-width: 767px) {
+    // remove bootstrap-responsive's body padding on small screens
+    body.notebook_app {
+        padding-left: 0px;
+        padding-right: 0px;
+    }
+}
+
 span#notebook_name {
     height: 1em;
     line-height: 1em;
diff --git a/IPython/html/static/notebook/less/outputarea.less b/IPython/html/static/notebook/less/outputarea.less
index e129385a2..5dd1614fa 100644
--- a/IPython/html/static/notebook/less/outputarea.less
+++ b/IPython/html/static/notebook/less/outputarea.less
@@ -72,6 +72,13 @@ div.output_area {
     .vbox();
 }
 
+@media (max-width: 480px) {
+    // move prompts above output on small screens
+    div.output_area {
+        .vbox();
+    }
+}
+
 div.output_area pre {
     margin: 0;
     padding: 0;
diff --git a/IPython/html/static/notebook/less/textcell.less b/IPython/html/static/notebook/less/textcell.less
index 0ec35bffc..7abe33924 100644
--- a/IPython/html/static/notebook/less/textcell.less
+++ b/IPython/html/static/notebook/less/textcell.less
@@ -2,6 +2,12 @@ div.text_cell {
     padding: 5px 5px 5px 0px;
     .hbox();
 }
+@media (max-width: 480px) {
+    // remove prompt indentation on small screens
+    div.text_cell > div.prompt {
+        display: none;
+    }
+}
 
 div.text_cell_render {
     /*font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;*/
diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css
index b608f6945..06e5ec568 100644
--- a/IPython/html/static/style/ipython.min.css
+++ b/IPython/html/static/style/ipython.min.css
@@ -73,11 +73,11 @@ div.cell{border:1px solid transparent;display:-webkit-box;-webkit-box-orient:ver
 div.cell.edit_mode{border-radius:4px;border:thin #008000 solid}
 div.cell{width:100%;padding:5px 5px 5px 0;margin:0;outline:none}
 div.prompt{min-width:11ex;padding:.4em;margin:0;font-family:monospace;text-align:right;line-height:1.21429em}
-div.inner_cell{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
+@media (max-width:480px){div.prompt{text-align:left}}div.inner_cell{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
 div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7}
 div.prompt:empty{padding-top:0;padding-bottom:0}
 div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;display:flex;flex-direction:row;align-items:stretch}
-div.input_prompt{color:#000080;border-top:1px solid transparent}
+@media (max-width:480px){div.input{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;display:flex;flex-direction:column;align-items:stretch}}div.input_prompt{color:#000080;border-top:1px solid transparent}
 div.input_area>div.highlight{margin:.4em;border:none;padding:0;background-color:transparent}
 div.input_area>div.highlight>pre{margin:0;border:0;padding:0;background-color:transparent;font-size:14px;line-height:1.21429em}
 .CodeMirror{line-height:1.21429em;height:auto;background:none;}
@@ -117,7 +117,7 @@ div.output_area{padding:0;page-break-inside:avoid;display:-webkit-box;-webkit-bo
 div.output_area .rendered_html table{margin-left:0;margin-right:0}
 div.output_area .rendered_html img{margin-left:0;margin-right:0}
 .output{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;display:flex;flex-direction:column;align-items:stretch}
-div.output_area pre{margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:#000;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit}
+@media (max-width:480px){div.output_area{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;display:flex;flex-direction:column;align-items:stretch}}div.output_area pre{margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:#000;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit}
 div.output_subarea{padding:.4em .4em 0 .4em;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
 div.output_text{text-align:left;color:#000;line-height:1.21429em}
 div.output_stderr{background:#fdd;}
@@ -170,7 +170,7 @@ p.p-space{margin-bottom:10px}
 .rendered_html img{display:block;margin-left:auto;margin-right:auto}
 .rendered_html *+img{margin-top:1em}
 div.text_cell{padding:5px 5px 5px 0;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;display:flex;flex-direction:row;align-items:stretch}
-div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:.5em .5em .5em .4em;color:#000}
+@media (max-width:480px){div.text_cell>div.prompt{display:none}}div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:.5em .5em .5em .4em;color:#000}
 a.anchor-link:link{text-decoration:none;padding:0 20px;visibility:hidden}
 h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible}
 div.cell.text_cell.rendered{padding:0}
diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index 3c01e1d82..7c367dd3a 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -1350,11 +1350,11 @@ div.cell{border:1px solid transparent;display:-webkit-box;-webkit-box-orient:ver
 div.cell.edit_mode{border-radius:4px;border:thin #008000 solid}
 div.cell{width:100%;padding:5px 5px 5px 0;margin:0;outline:none}
 div.prompt{min-width:11ex;padding:.4em;margin:0;font-family:monospace;text-align:right;line-height:1.21429em}
-div.inner_cell{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
+@media (max-width:480px){div.prompt{text-align:left}}div.inner_cell{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
 div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7}
 div.prompt:empty{padding-top:0;padding-bottom:0}
 div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;display:flex;flex-direction:row;align-items:stretch}
-div.input_prompt{color:#000080;border-top:1px solid transparent}
+@media (max-width:480px){div.input{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;display:flex;flex-direction:column;align-items:stretch}}div.input_prompt{color:#000080;border-top:1px solid transparent}
 div.input_area>div.highlight{margin:.4em;border:none;padding:0;background-color:transparent}
 div.input_area>div.highlight>pre{margin:0;border:0;padding:0;background-color:transparent;font-size:14px;line-height:1.21429em}
 .CodeMirror{line-height:1.21429em;height:auto;background:none;}
@@ -1394,7 +1394,7 @@ div.output_area{padding:0;page-break-inside:avoid;display:-webkit-box;-webkit-bo
 div.output_area .rendered_html table{margin-left:0;margin-right:0}
 div.output_area .rendered_html img{margin-left:0;margin-right:0}
 .output{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;display:flex;flex-direction:column;align-items:stretch}
-div.output_area pre{margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:#000;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit}
+@media (max-width:480px){div.output_area{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;display:flex;flex-direction:column;align-items:stretch}}div.output_area pre{margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:#000;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit}
 div.output_subarea{padding:.4em .4em 0 .4em;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
 div.output_text{text-align:left;color:#000;line-height:1.21429em}
 div.output_stderr{background:#fdd;}
@@ -1447,7 +1447,7 @@ p.p-space{margin-bottom:10px}
 .rendered_html img{display:block;margin-left:auto;margin-right:auto}
 .rendered_html *+img{margin-top:1em}
 div.text_cell{padding:5px 5px 5px 0;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;display:flex;flex-direction:row;align-items:stretch}
-div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:.5em .5em .5em .4em;color:#000}
+@media (max-width:480px){div.text_cell>div.prompt{display:none}}div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:.5em .5em .5em .4em;color:#000}
 a.anchor-link:link{text-decoration:none;padding:0 20px;visibility:hidden}
 h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible}
 div.cell.text_cell.rendered{padding:0}
@@ -1476,7 +1476,7 @@ div.cell.text_cell.rendered{padding:0}
 .docked-widget-modal{overflow:hidden;position:relative !important;top:0 !important;left:0 !important;margin-left:0 !important}
 body{background-color:#fff}
 body.notebook_app{overflow:hidden}
-span#notebook_name{height:1em;line-height:1em;padding:3px;border:none;font-size:146.5%}
+@media (max-width:767px){body.notebook_app{padding-left:0;padding-right:0}}span#notebook_name{height:1em;line-height:1em;padding:3px;border:none;font-size:146.5%}
 div#notebook_panel{margin:0 0 0 0;padding:0;-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,0.1);box-shadow:0 -1px 10px rgba(0,0,0,0.1)}
 div#notebook{font-size:14px;line-height:20px;overflow-y:scroll;overflow-x:auto;width:100%;padding:1em 0 1em 0;margin:0;border-top:1px solid #ababab;outline:none;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}
 div.ui-widget-content{border:1px solid #ababab;outline:none}

From e1daedf95bd6dc5d38f65f653a7e32f831e6055c Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Mon, 24 Mar 2014 15:43:10 -0700
Subject: [PATCH 40/58] Fixed keyboard.js indent break

---
 IPython/html/static/base/js/keyboard.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/html/static/base/js/keyboard.js b/IPython/html/static/base/js/keyboard.js
index e3c74b74b..edfd7da07 100644
--- a/IPython/html/static/base/js/keyboard.js
+++ b/IPython/html/static/base/js/keyboard.js
@@ -183,7 +183,7 @@ IPython.keyboard = (function (IPython) {
         if (!suppress_help_update) {
             // update the keyboard shortcuts notebook help
             $([IPython.events]).trigger('rebuild.QuickHelp');
-    }
+        }
     };
 
     ShortcutManager.prototype.add_shortcuts = function (data) {
@@ -201,7 +201,7 @@ IPython.keyboard = (function (IPython) {
         if (!suppress_help_update) {
             // update the keyboard shortcuts notebook help
             $([IPython.events]).trigger('rebuild.QuickHelp');
-    }
+        }
     };
 
     ShortcutManager.prototype.count_handler = function (shortcut, event, data) {

From bb06f92705642568ac208334d3e8350baf566335 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Tue, 25 Mar 2014 12:57:41 -0700
Subject: [PATCH 41/58] add notebook security doc

---
 docs/source/notebook/security.rst | 148 ++++++++++++++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100644 docs/source/notebook/security.rst

diff --git a/docs/source/notebook/security.rst b/docs/source/notebook/security.rst
new file mode 100644
index 000000000..ca05c573e
--- /dev/null
+++ b/docs/source/notebook/security.rst
@@ -0,0 +1,148 @@
+Security in IPython notebooks
+=============================
+
+As IPython notebooks become more popular for sharing and collaboration,
+the potential for malicious people to attempt to exploit the notebook
+for their nefarious purposes increases. IPython 2.0 introduces a
+security model to prevent execution of untrusted code without explicit
+user input.
+
+The problem
+-----------
+
+The whole point of IPython is arbitrary code execution. We have no
+desire to limit what can be done with a notebook, which would negatively
+impact its utility.
+
+Unlike other programs, an IPython notebook document includes output.
+Unlike other documents, that output exists in a context that can execute
+code (via Javascript).
+
+The security problem we need to solve is that no code should execute
+just because a user has **opened** a notebook that **they did not
+write**. Like any other program, once a user decides to execute code in
+a notebook, it is considered trusted, and should be allowed to do
+anything.
+
+Our security model
+------------------
+
+-  Untrusted HTML is always sanitized
+-  Untrusted Javascript is never executed
+-  HTML and Javascript in Markdown cells are never trusted
+-  **Outputs** generated by the user are trusted
+-  Any other HTML or Javascript (in Markdown cells, output generated by
+   others) is never trusted
+-  The central question of trust is "Did the current user do this?"
+
+The details of trust
+--------------------
+
+IPython notebooks store a signature in metadata, which is used to answer
+the question "Did the current user do this?"
+
+This signature is a digest of the notebooks contents plus a secret key,
+known only to the user. The secret key is a user-only readable file in
+the IPython profile's security directory. By default, this is::
+
+    ~/.ipython/profile_default/security/notebook_secret
+
+When a notebook is opened by a user, the server computes a signature
+with the user's key, and compares it with the signature stored in the
+notebook's metadata. If the signature matches, HTML and Javascript
+output in the notebook will be trusted at load, otherwise it will be
+untrusted.
+
+Any output generated during an interactive session is trusted.
+
+Updating trust
+**************
+
+A notebook's trust is updated when the notebook is saved. If there are
+any untrusted outputs still in the notebook, the notebook will not be
+trusted, and no signature will be stored. If all untrusted outputs have
+been removed (either via ``Clear Output`` or re-execution), then the
+notebook will become trusted.
+
+While trust is updated per output, this is only for the duration of a
+single session. A notebook file on disk is either trusted or not in its
+entirety.
+
+Explicit trust
+**************
+
+Sometimes re-executing a notebook to generate trusted output is not an
+option, either because dependencies are unavailable, or it would take a
+long time. Users can explicitly trust a notebook in two ways:
+
+-  At the command-line, with::
+
+    ipython trust /path/to/notebook.ipynb
+
+-  After loading the untrusted notebook, with ``File / Trust Notebook``
+
+These two methods simply load the notebook, compute a new signature with
+the user's key, and then store the newly signed notebook.
+
+Reporting security issues
+-------------------------
+
+If you find a security vulnerability in IPython, either a failure of the
+code to properly implement the model described here, or a failure of the
+model itself, please report it to security@ipython.org.
+
+If you prefer to encrypt your security reports,
+you can use this PGP public key:
+
+.. literalinclude:: ipython_security.asc
+
+Affected use cases
+------------------
+
+Some use cases that work in IPython 1.0 will become less convenient in
+2.0 as a result of the security changes. We do our best to minimize
+these annoyance, but security is always at odds with convenience.
+
+Javascript and CSS in Markdown cells
+************************************
+
+While never officially supported, it had become common practice to put
+hidden Javascript or CSS styling in Markdown cells, so that they would
+not be visible on the page. Since Markdown cells are now sanitized (by
+`Google Caja <https://developers.google.com/caja>`__), all Javascript
+(including click event handlers, etc.) and CSS will be stripped.
+
+We plan to provide a mechanism for notebook themes, but in the meantime
+styling the notebook can only be done via either ``custom.css`` or CSS
+in HTML output. The latter only have an effect if the notebook is
+trusted, because otherwise the output will be sanitized just like
+Markdown.
+
+Collaboration
+*************
+
+When collaborating on a notebook, people probably want to see the
+outputs produced by their colleagues' most recent executions. Since each
+collaborator's key will differ, this will result in each share starting
+in an untrusted state. There are three basic approaches to this:
+
+-  re-run notebooks when you get them (not always viable)
+-  explicitly trust notebooks via ``ipython trust`` or the notebook menu
+   (annoying, but easy)
+-  share a notebook secret, and use an IPython profile dedicated to the
+   collaboration while working on the project.
+
+Multiple profiles or machines
+*****************************
+
+Since the notebook secret is stored in a profile directory by default,
+opening a notebook with a different profile or on a different machine
+will result in a different key, and thus be untrusted. The only current
+way to address this is by sharing the notebook secret. This can be
+facilitated by setting the configurable:
+
+.. sourcecode:: python
+
+    c.NotebookApp.secret_file = "/path/to/notebook_secret"
+
+in each profile, and only sharing the secret once per machine.

From 322c6431b85b10848bde9ee2a51f92a612398ba6 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Tue, 25 Mar 2014 12:57:50 -0700
Subject: [PATCH 42/58] add ipython_security public key

---
 docs/source/notebook/ipython_security.asc | 52 +++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 docs/source/notebook/ipython_security.asc

diff --git a/docs/source/notebook/ipython_security.asc b/docs/source/notebook/ipython_security.asc
new file mode 100644
index 000000000..95436812a
--- /dev/null
+++ b/docs/source/notebook/ipython_security.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+mQINBFMx2LoBEAC9xU8JiKI1VlCJ4PT9zqhU5nChQZ06/bj1BBftiMJG07fdGVO0
+ibOn4TrCoRYaeRlet0UpHzxT4zDa5h3/usJaJNTSRwtWePw2o7Lik8J+F3LionRf
+8Jz81WpJ+81Klg4UWKErXjBHsu/50aoQm6ZNYG4S2nwOmMVEC4nc44IAA0bb+6kW
+saFKKzEDsASGyuvyutdyUHiCfvvh5GOC2h9mXYvl4FaMW7K+d2UgCYERcXDNy7C1
+Bw+uepQ9ELKdG4ZpvonO6BNr1BWLln3wk93AQfD5qhfsYRJIyj0hJlaRLtBU3i6c
+xs+gQNF4mPmybpPSGuOyUr4FYC7NfoG7IUMLj+DYa6d8LcMJO+9px4IbdhQvzGtC
+qz5av1TX7/+gnS4L8C9i1g8xgI+MtvogngPmPY4repOlK6y3l/WtxUPkGkyYkn3s
+RzYyE/GJgTwuxFXzMQs91s+/iELFQq/QwmEJf+g/QYfSAuM+lVGajEDNBYVAQkxf
+gau4s8Gm0GzTZmINilk+7TxpXtKbFc/Yr4A/fMIHmaQ7KmJB84zKwONsQdVv7Jjj
+0dpwu8EIQdHxX3k7/Q+KKubEivgoSkVwuoQTG15X9xrOsDZNwfOVQh+JKazPvJtd
+SNfep96r9t/8gnXv9JI95CGCQ8lNhXBUSBM3BDPTbudc4b6lFUyMXN0mKQARAQAB
+tCxJUHl0aG9uIFNlY3VyaXR5IFRlYW0gPHNlY3VyaXR5QGlweXRob24ub3JnPokC
+OAQTAQIAIgUCUzHYugIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQEwJc
+LcmZYkjuXg//R/t6nMNQmf9W1h52IVfUbRAVmvZ5d063hQHKV2dssxtnA2dRm/x5
+JZu8Wz7ZrEZpyqwRJO14sxN1/lC3v+zs9XzYXr2lBTZuKCPIBypYVGIynCuWJBQJ
+rWnfG4+u1RHahnjqlTWTY1C/le6v7SjAvCb6GbdA6k4ZL2EJjQlRaHDmzw3rV/+l
+LLx6/tYzIsotuflm/bFumyOMmpQQpJjnCkWIVjnRICZvuAn97jLgtTI0+0Rzf4Zb
+k2BwmHwDRqWCTTcRI9QvTl8AzjW+dNImN22TpGOBPfYj8BCZ9twrpKUbf+jNqJ1K
+THQzFtpdJ6SzqiFVm74xW4TKqCLkbCQ/HtVjTGMGGz/y7KTtaLpGutQ6XE8SSy6P
+EffSb5u+kKlQOWaH7Mc3B0yAojz6T3j5RSI8ts6pFi6pZhDg9hBfPK2dT0v/7Mkv
+E1Z7q2IdjZnhhtGWjDAMtDDn2NbY2wuGoa5jAWAR0WvIbEZ3kOxuLE5/ZOG1FyYm
+noJRliBz7038nT92EoD5g1pdzuxgXtGCpYyyjRZwaLmmi4CvA+oThKmnqWNY5lyY
+ricdNHDiyEXK0YafJL1oZgM86MSb0jKJMp5U11nUkUGzkroFfpGDmzBwAzEPgeiF
+40+qgsKB9lqwb3G7PxvfSi3XwxfXgpm1cTyEaPSzsVzve3d1xeqb7Yq5Ag0EUzHY
+ugEQALQ5FtLdNoxTxMsgvrRr1ejLiUeRNUfXtN1TYttOfvAhfBVnszjtkpIW8DCB
+JF/bA7ETiH8OYYn/Fm6MPI5H64IHEncpzxjf57jgpXd9CA9U2OMk/P1nve5zYchP
+QmP2fJxeAWr0aRH0Mse5JS5nCkh8Xv4nAjsBYeLTJEVOb1gPQFXOiFcVp3gaKAzX
+GWOZ/mtG/uaNsabH/3TkcQQEgJefd11DWgMB7575GU+eME7c6hn3FPITA5TC5HUX
+azvjv/PsWGTTVAJluJ3fUDvhpbGwYOh1uV0rB68lPpqVIro18IIJhNDnccM/xqko
+4fpJdokdg4L1wih+B04OEXnwgjWG8OIphR/oL/+M37VV2U7Om/GE6LGefaYccC9c
+tIaacRQJmZpG/8RsimFIY2wJ07z8xYBITmhMmOt0bLBv0mU0ym5KH9Dnru1m9QDO
+AHwcKrDgL85f9MCn+YYw0d1lYxjOXjf+moaeW3izXCJ5brM+MqVtixY6aos3YO29
+J7SzQ4aEDv3h/oKdDfZny21jcVPQxGDui8sqaZCi8usCcyqWsKvFHcr6vkwaufcm
+3Knr2HKVotOUF5CDZybopIz1sJvY/5Dx9yfRmtivJtglrxoDKsLi1rQTlEQcFhCS
+ACjf7txLtv03vWHxmp4YKQFkkOlbyhIcvfPVLTvqGerdT2FHABEBAAGJAh8EGAEC
+AAkFAlMx2LoCGwwACgkQEwJcLcmZYkgK0BAAny0YUugpZldiHzYNf8I6p2OpiDWv
+ZHaguTTPg2LJSKaTd+5UHZwRFIWjcSiFu+qTGLNtZAdcr0D5f991CPvyDSLYgOwb
+Jm2p3GM2KxfECWzFbB/n/PjbZ5iky3+5sPlOdBR4TkfG4fcu5GwUgCkVe5u3USAk
+C6W5lpeaspDz39HAPRSIOFEX70+xV+6FZ17B7nixFGN+giTpGYOEdGFxtUNmHmf+
+waJoPECyImDwJvmlMTeP9jfahlB6Pzaxt6TBZYHetI/JR9FU69EmA+XfCSGt5S+0
+Eoc330gpsSzo2VlxwRCVNrcuKmG7PsFFANok05ssFq1/Djv5rJ++3lYb88b8HSP2
+3pQJPrM7cQNU8iPku9yLXkY5qsoZOH+3yAia554Dgc8WBhp6fWh58R0dIONQxbbo
+apNdwvlI8hKFB7TiUL6PNShE1yL+XD201iNkGAJXbLMIC1ImGLirUfU267A3Cop5
+hoGs179HGBcyj/sKA3uUIFdNtP+NndaP3v4iYhCitdVCvBJMm6K3tW88qkyRGzOk
+4PW422oyWKwbAPeMk5PubvEFuFAIoBAFn1zecrcOg85RzRnEeXaiemmmH8GOe1Xu
+Kh+7h8XXyG6RPFy8tCcLOTk+miTqX+4VWy+kVqoS2cQ5IV8WsJ3S7aeIy0H89Z8n
+5vmLc+Ibz+eT+rM=
+=XVDe
+-----END PGP PUBLIC KEY BLOCK-----

From b9c5eec22f62786ce405a269b32bb4b2e01566d3 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Tue, 25 Mar 2014 13:09:26 -0700
Subject: [PATCH 43/58] move notebook docs to source/notebook

---
 docs/source/notebook/index.rst                      | 13 +++++++++++++
 docs/source/{interactive => notebook}/nbconvert.rst |  0
 docs/source/{interactive => notebook}/notebook.rst  |  0
 .../{interactive => notebook}/public_server.rst     |  0
 4 files changed, 13 insertions(+)
 create mode 100644 docs/source/notebook/index.rst
 rename docs/source/{interactive => notebook}/nbconvert.rst (100%)
 rename docs/source/{interactive => notebook}/notebook.rst (100%)
 rename docs/source/{interactive => notebook}/public_server.rst (100%)

diff --git a/docs/source/notebook/index.rst b/docs/source/notebook/index.rst
new file mode 100644
index 000000000..2191fda40
--- /dev/null
+++ b/docs/source/notebook/index.rst
@@ -0,0 +1,13 @@
+====================
+The IPython notebook
+====================
+
+.. toctree::
+    :maxdepth: 2
+
+    notebook
+    cm_keyboard
+    nbconvert
+    public_server
+    security
+
diff --git a/docs/source/interactive/nbconvert.rst b/docs/source/notebook/nbconvert.rst
similarity index 100%
rename from docs/source/interactive/nbconvert.rst
rename to docs/source/notebook/nbconvert.rst
diff --git a/docs/source/interactive/notebook.rst b/docs/source/notebook/notebook.rst
similarity index 100%
rename from docs/source/interactive/notebook.rst
rename to docs/source/notebook/notebook.rst
diff --git a/docs/source/interactive/public_server.rst b/docs/source/notebook/public_server.rst
similarity index 100%
rename from docs/source/interactive/public_server.rst
rename to docs/source/notebook/public_server.rst

From 76424aff09c931941216455af240195c453003f9 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Tue, 25 Mar 2014 13:10:51 -0700
Subject: [PATCH 44/58] fix now-confusing section name in public server doc

---
 docs/source/notebook/public_server.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/notebook/public_server.rst b/docs/source/notebook/public_server.rst
index aae62c8e7..9454cd05c 100644
--- a/docs/source/notebook/public_server.rst
+++ b/docs/source/notebook/public_server.rst
@@ -19,8 +19,8 @@ a public interface <notebook_public_server>`.
 
 .. _notebook_security:
 
-Notebook security
------------------
+Securing a notebook server
+--------------------------
 
 You can protect your notebook server with a simple single password by
 setting the :attr:`NotebookApp.password` configurable. You can prepare a

From 97565e3771603b27acf6ecf883b73bfe92b579d5 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Tue, 25 Mar 2014 14:40:55 -0700
Subject: [PATCH 45/58] move PGP key to download link

---
 docs/source/notebook/security.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/source/notebook/security.rst b/docs/source/notebook/security.rst
index ca05c573e..fa68579bc 100644
--- a/docs/source/notebook/security.rst
+++ b/docs/source/notebook/security.rst
@@ -92,9 +92,7 @@ code to properly implement the model described here, or a failure of the
 model itself, please report it to security@ipython.org.
 
 If you prefer to encrypt your security reports,
-you can use this PGP public key:
-
-.. literalinclude:: ipython_security.asc
+you can use :download:`this PGP public key <ipython_security.asc>`.
 
 Affected use cases
 ------------------

From b4099518f805b86344296cfb4f97e17a805679d4 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Tue, 25 Mar 2014 15:05:09 -0700
Subject: [PATCH 46/58] Fix tooltip pager feature

Updates to tooltip.js for msg spec changes.
---
 IPython/html/static/notebook/js/tooltip.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/IPython/html/static/notebook/js/tooltip.js b/IPython/html/static/notebook/js/tooltip.js
index 915cca4a0..af5cbe683 100644
--- a/IPython/html/static/notebook/js/tooltip.js
+++ b/IPython/html/static/notebook/js/tooltip.js
@@ -131,17 +131,13 @@ var IPython = (function (IPython) {
     Tooltip.prototype.showInPager = function (cell) {
         // reexecute last call in pager by appending ? to show back in pager
         var that = this;
-        var empty = function () {};
-        cell.kernel.execute(
-        that.name + '?', {
-            'execute_reply': empty,
-            'output': empty,
-            'clear_output': empty,
-            'cell': cell
-        }, {
-            'silent': false,
-            'store_history': true
-        });
+        var callbacks = {'shell' : {
+                'payload' : {
+                    'page' : $.proxy(cell._open_with_pager, cell)
+                }
+            }
+        };
+        cell.kernel.execute(that.name + '?', callbacks, {'silent': false, 'store_history': true});
         this.remove_and_cancel_tooltip();
     };
 

From bd0bfad2617470ce6cabe7b12eeb7db913db5b2c Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Tue, 25 Mar 2014 13:55:08 -0700
Subject: [PATCH 47/58] s/COPYING.txt/COPYING.rst

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 07ea5a5d4..7ef9289ff 100755
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ requires utilities which are not available under Windows."""
 #
 #  Distributed under the terms of the Modified BSD License.
 #
-#  The full license is in the file COPYING.txt, distributed with this software.
+#  The full license is in the file COPYING.rst, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------

From 1235c2f6389860b33d3f62037db29ee97b6700e7 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Tue, 25 Mar 2014 15:54:20 -0700
Subject: [PATCH 48/58] Make sure `element` is correct in the context of
 displayed JS

closes #5293
---
 IPython/html/static/notebook/js/outputarea.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IPython/html/static/notebook/js/outputarea.js b/IPython/html/static/notebook/js/outputarea.js
index 47f239f3c..79b902e14 100644
--- a/IPython/html/static/notebook/js/outputarea.js
+++ b/IPython/html/static/notebook/js/outputarea.js
@@ -541,6 +541,10 @@ var IPython = (function (IPython) {
         var container = element;
         container.show = function(){console.log('Warning "container.show()" is deprecated.')};
         // end backward compat
+
+        // Fix for ipython/issues/5293, make sure `element` is the area which
+        // output can be inserted into at the time of JS execution.
+        element = toinsert;
         try {
             eval(js);
         } catch(err) {

From f41750ca6b7855728cafe8500809516565a0d02a Mon Sep 17 00:00:00 2001
From: Paul Ivanov <pi@berkeley.edu>
Date: Tue, 25 Mar 2014 16:31:29 -0700
Subject: [PATCH 49/58] address PR feedback

---
 IPython/html/static/notebook/js/notebook.js         | 2 +-
 IPython/html/static/notebook/js/notificationarea.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index 6681aa2c3..8b7a69a1a 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -59,7 +59,7 @@ var IPython = (function (IPython) {
         this.create_elements();
         this.bind_events();
         this.save_notebook = function() { // don't allow save until notebook_loaded
-            this.save_notebook_error(null, null, "Notebook was not fully loaded.");
+            this.save_notebook_error(null, null, "Load failed, save is disabled");
         };
     };
 
diff --git a/IPython/html/static/notebook/js/notificationarea.js b/IPython/html/static/notebook/js/notificationarea.js
index 9cc5db26f..a2ecad1dc 100644
--- a/IPython/html/static/notebook/js/notificationarea.js
+++ b/IPython/html/static/notebook/js/notificationarea.js
@@ -189,7 +189,7 @@ var IPython = (function (IPython) {
             nnw.set_message("Notebook saved",2000);
         });
         $([IPython.events]).on('notebook_save_failed.Notebook', function (evt, xhr, status, data) {
-            nnw.set_message("Notebook save failed:" + data);
+            nnw.set_message(data || "Notebook save failed");
         });
         
         // Checkpoint events

From 2daf2fe293f770d7f894fcbb3e2b1ec9bd0e368b Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Tue, 25 Mar 2014 17:03:37 -0700
Subject: [PATCH 50/58] update links in notebook help menu

---
 IPython/html/templates/notebook.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html
index 097a416f1..79c60f5dd 100644
--- a/IPython/html/templates/notebook.html
+++ b/IPython/html/templates/notebook.html
@@ -227,8 +227,8 @@ class="notebook_app"
                         (
                             ("http://ipython.org/documentation.html","IPython Help",True),
                             ("http://nbviewer.ipython.org/github/ipython/ipython/tree/master/examples/notebooks/", "Notebook Examples", True),
-                            ("http://ipython.org/ipython-doc/stable/interactive/notebook.html","Notebook Help",True),
-                            ("http://ipython.org/ipython-doc/dev/interactive/cm_keyboard.html","Editor Shortcuts",True),
+                            ("http://ipython.org/ipython-doc/2/notebook/notebook.html","Notebook Help",True),
+                            ("http://ipython.org/ipython-doc/2/notebook/cm_keyboard.html","Editor Shortcuts",True),
                         ),(
                             ("http://docs.python.org","Python",True),
                             ("http://docs.scipy.org/doc/numpy/reference/","NumPy",True),

From 2adfb5254c198a461bc7c033dcb864a62d198040 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Tue, 25 Mar 2014 20:16:54 -0700
Subject: [PATCH 51/58] 2.0.0-rc1

---
 IPython/html/static/base/js/namespace.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/html/static/base/js/namespace.js b/IPython/html/static/base/js/namespace.js
index e865afdaf..e0fdf7574 100644
--- a/IPython/html/static/base/js/namespace.js
+++ b/IPython/html/static/base/js/namespace.js
@@ -7,7 +7,7 @@
 
 var IPython = IPython || {};
 
-IPython.version = "2.0.0-dev";
+IPython.version = "2.0.0-rc1";
 
 IPython.namespace = function (ns_string) {
     "use strict";

From 248695cb8e08b6a4ed0b88d9b8de867588ff2822 Mon Sep 17 00:00:00 2001
From: cgohlke <cgohlke@uci.edu>
Date: Tue, 25 Mar 2014 21:52:09 -0700
Subject: [PATCH 52/58] Install ui-bg_glass_75_e6e6e6_1x400.png

---
 setupbase.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setupbase.py b/setupbase.py
index 1d474e46e..d48806df2 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -161,6 +161,7 @@ def find_package_data():
         pjoin(components, "jquery", "jquery.min.js"),
         pjoin(components, "jquery-ui", "ui", "minified", "jquery-ui.min.js"),
         pjoin(components, "jquery-ui", "themes", "smoothness", "jquery-ui.min.css"),
+        pjoin(components, "jquery-ui", "themes", "smoothness", "images", "ui-bg_glass_75_e6e6e6_1x400.png"),
         pjoin(components, "marked", "lib", "marked.js"),
         pjoin(components, "requirejs", "require.js"),
         pjoin(components, "underscore", "underscore-min.js"),

From 8644bf3d84616ea219c45f77edc1cdf19ab06d89 Mon Sep 17 00:00:00 2001
From: cgohlke <cgohlke@uci.edu>
Date: Tue, 25 Mar 2014 22:20:18 -0700
Subject: [PATCH 53/58] Install jquery-ui theme images

---
 setupbase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setupbase.py b/setupbase.py
index d48806df2..21a285781 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -161,7 +161,7 @@ def find_package_data():
         pjoin(components, "jquery", "jquery.min.js"),
         pjoin(components, "jquery-ui", "ui", "minified", "jquery-ui.min.js"),
         pjoin(components, "jquery-ui", "themes", "smoothness", "jquery-ui.min.css"),
-        pjoin(components, "jquery-ui", "themes", "smoothness", "images", "ui-bg_glass_75_e6e6e6_1x400.png"),
+        pjoin(components, "jquery-ui", "themes", "smoothness", "images", "*"),
         pjoin(components, "marked", "lib", "marked.js"),
         pjoin(components, "requirejs", "require.js"),
         pjoin(components, "underscore", "underscore-min.js"),

From 9552688a71231eaa2a2c447bf035a4976791b3fa Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Tue, 25 Mar 2014 22:46:06 -0700
Subject: [PATCH 54/58] back to dev

---
 IPython/html/static/base/js/namespace.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/html/static/base/js/namespace.js b/IPython/html/static/base/js/namespace.js
index e0fdf7574..e865afdaf 100644
--- a/IPython/html/static/base/js/namespace.js
+++ b/IPython/html/static/base/js/namespace.js
@@ -7,7 +7,7 @@
 
 var IPython = IPython || {};
 
-IPython.version = "2.0.0-rc1";
+IPython.version = "2.0.0-dev";
 
 IPython.namespace = function (ns_string) {
     "use strict";

From 75d4947e819dc147800938f7ed94bdd55326f50b Mon Sep 17 00:00:00 2001
From: Aaron Meurer <asmeurer@gmail.com>
Date: Wed, 26 Mar 2014 18:00:01 -0500
Subject: [PATCH 55/58] Point to the stable SymPy docs, not the dev docs

---
 IPython/html/templates/notebook.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html
index 79c60f5dd..eebd652fd 100644
--- a/IPython/html/templates/notebook.html
+++ b/IPython/html/templates/notebook.html
@@ -234,7 +234,7 @@ class="notebook_app"
                             ("http://docs.scipy.org/doc/numpy/reference/","NumPy",True),
                             ("http://docs.scipy.org/doc/scipy/reference/","SciPy",True),
                             ("http://matplotlib.org/contents.html","Matplotlib",True),
-                            ("http://docs.sympy.org/dev/index.html","SymPy",True),
+                            ("http://docs.sympy.org/latest/index.html","SymPy",True),
                             ("http://pandas.pydata.org/pandas-docs/stable/","pandas", True)
                         )
                     )

From bfb3d8ec30395b55ca5c3f5f17204b1cf5f8da5c Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Thu, 27 Mar 2014 14:31:07 -0700
Subject: [PATCH 56/58] check that a handler is actually registered in
 ShortcutManager.handles

there are a few shortcuts that do not specify handlers
(just for quick help contents),
and this was preventing the actual events from ever firing.
---
 IPython/html/static/base/js/keyboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/html/static/base/js/keyboard.js b/IPython/html/static/base/js/keyboard.js
index 4fa77d5c9..8210ad7ea 100644
--- a/IPython/html/static/base/js/keyboard.js
+++ b/IPython/html/static/base/js/keyboard.js
@@ -252,7 +252,7 @@ IPython.keyboard = (function (IPython) {
     ShortcutManager.prototype.handles = function (event) {
         var shortcut = event_to_shortcut(event);
         var data = this._shortcuts[shortcut];
-        return !( data === undefined )
+        return !( data === undefined || data.handler === undefined )
     }
 
     return {

From b878696a95ba6d00a3a8accd4330029cf79e6e8f Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <takowl@gmail.com>
Date: Fri, 28 Mar 2014 11:51:21 -0700
Subject: [PATCH 57/58] Fix starting notebook server with file/directory at
 command line.

The base class implementation of parse_command_line uses update_config,
which ensures that the change event fires for the config traitlet. This
copies that.

Closes gh-5460
---
 IPython/html/notebookapp.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/IPython/html/notebookapp.py b/IPython/html/notebookapp.py
index 3cd81f563..81fda2dc2 100644
--- a/IPython/html/notebookapp.py
+++ b/IPython/html/notebookapp.py
@@ -73,6 +73,7 @@ from .services.sessions.sessionmanager import SessionManager
 
 from .base.handlers import AuthenticatedFileHandler, FileFindHandler
 
+from IPython.config import Config
 from IPython.config.application import catch_config_error, boolean_flag
 from IPython.core.application import BaseIPythonApplication
 from IPython.core.profiledir import ProfileDir
@@ -554,10 +555,12 @@ class NotebookApp(BaseIPythonApplication):
             
             # Use config here, to ensure that it takes higher priority than
             # anything that comes from the profile.
+            c = Config()
             if os.path.isdir(f):
-                self.config.NotebookApp.notebook_dir = f
+                c.NotebookApp.notebook_dir = f
             elif os.path.isfile(f):
-                self.config.NotebookApp.file_to_run = f
+                c.NotebookApp.file_to_run = f
+            self.update_config(c)
 
     def init_kernel_argv(self):
         """construct the kernel arguments"""

From 78bc36ec38b5ad6b6c0727f4e0b3156585fcc8c9 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Fri, 28 Mar 2014 14:41:10 -0700
Subject: [PATCH 58/58] update link

The page is in the sphinx docs, not on the main website.
---
 IPython/html/static/notebook/js/notebook.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index 8b7a69a1a..e9f7a78de 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -1833,7 +1833,7 @@ var IPython = (function (IPython) {
                 " Selecting trust will immediately reload this notebook in a trusted state."
             ).append(
                 " For more information, see the "
-            ).append($("<a>").attr("href", "http://ipython.org/security.html")
+            ).append($("<a>").attr("href", "http://ipython.org/ipython-doc/2/notebook/security.html")
                 .text("IPython security documentation")
             ).append(".")
         );