Show More
@@ -245,7 +245,10 b' var IPython = (function (IPython) {' | |||
|
245 | 245 | // how fun! '-' is 189 in Chrome, but 173 in FF and Opera |
|
246 | 246 | // Split cell = - |
|
247 | 247 | notebook.split_cell(); |
|
248 |
return false; |
|
|
248 | return false; | |
|
249 | } else if ((event.which === 61 || event.which === 187) && event.shiftKey) { | |
|
250 | notebook.merge_cell_below(); | |
|
251 | return false; | |
|
249 | 252 | }; |
|
250 | 253 | // If we havn't handled it, let someone else. |
|
251 | 254 | return true; |
@@ -1046,6 +1046,7 b' var IPython = (function (IPython) {' | |||
|
1046 | 1046 | new_cell.set_text(texta); |
|
1047 | 1047 | this.select_next(); |
|
1048 | 1048 | } else if (cell instanceof IPython.MarkdownCell) { |
|
1049 | var render = cell.rendered; | |
|
1049 | 1050 | cell.set_text(textb); |
|
1050 | 1051 | cell.render(); |
|
1051 | 1052 | var new_cell = this.insert_cell_above('markdown'); |
@@ -1053,6 +1054,13 b' var IPython = (function (IPython) {' | |||
|
1053 | 1054 | new_cell.set_text(texta); |
|
1054 | 1055 | new_cell.render(); |
|
1055 | 1056 | this.select_next(); |
|
1057 | if (!render) { | |
|
1058 | // The final rendered state of the split cells should | |
|
1059 | // match the original cell's state. The order matters | |
|
1060 | // here as we want the lower cell (cell) to be selected. | |
|
1061 | new_cell.unrender(); | |
|
1062 | cell.unrender(); | |
|
1063 | } | |
|
1056 | 1064 | } |
|
1057 | 1065 | }; |
|
1058 | 1066 | }; |
General Comments 0
You need to be logged in to leave comments.
Login now