From e6e7d41f5b507d1c522e8d9f677243bf559c7cf0 Mon Sep 17 00:00:00 2001
From: Brian Granger <ellisonbg@gmail.com>
Date: Mon, 23 Jan 2012 11:32:42 -0800
Subject: [PATCH] Fixing bugs in CodeMirror refreshing.

---
 IPython/frontend/html/notebook/static/js/notebook.js | 4 +---
 IPython/frontend/html/notebook/static/js/textcell.js | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/js/notebook.js b/IPython/frontend/html/notebook/static/js/notebook.js
index b1fb9f348..b4a67fbcd 100644
--- a/IPython/frontend/html/notebook/static/js/notebook.js
+++ b/IPython/frontend/html/notebook/static/js/notebook.js
@@ -550,7 +550,6 @@ var IPython = (function (IPython) {
                     text = '';
                 };
                 if (target_cell !== null) {
-                    //if (text === "") {text = target_cell.placeholder;};
                     // The edit must come before the set_text.
                     target_cell.edit();
                     target_cell.set_text(text);
@@ -575,7 +574,6 @@ var IPython = (function (IPython) {
                     text = '';
                 };
                 if (target_cell !== null) {
-                    if (text === "") {text = target_cell.placeholder;};
                     // The edit must come before the set_text.
                     target_cell.edit();
                     target_cell.set_text(text);
@@ -1167,7 +1165,7 @@ var IPython = (function (IPython) {
             this.start_kernel();
         }
         this.select(0);
-        this.notebook.scroll_to_top();
+        this.scroll_to_top();
         IPython.save_widget.update_url();
         IPython.layout_manager.do_resize();
     };
diff --git a/IPython/frontend/html/notebook/static/js/textcell.js b/IPython/frontend/html/notebook/static/js/textcell.js
index c5421b893..eb8bdbfe3 100644
--- a/IPython/frontend/html/notebook/static/js/textcell.js
+++ b/IPython/frontend/html/notebook/static/js/textcell.js
@@ -100,7 +100,8 @@ var IPython = (function (IPython) {
             // refresh/focus/refresh, the to_markdown method won't work.
             this.code_mirror.refresh();
             this.code_mirror.focus();
-            this.code_mirror.refresh();
+            // In some wierd cases we seem to need this extra refresh.
+            //this.code_mirror.refresh();
             this.rendered = false;
             if (this.get_text() === this.placeholder) {
                 this.set_text('');