From c29e928054bbafe45d87729d8eb0f1f73affbfdb Mon Sep 17 00:00:00 2001 From: Brian Granger Date: Wed, 25 Jan 2012 12:32:06 -0800 Subject: [PATCH] Removing Ace edit capability. We have fixed some of the problems with CodeMirror and feel that the differences between Ace and CodeMirror are not great enough to justify having both. We may reintroduce a full-window edit mode using CodeMirror, but that will come separately. --- .../html/notebook/static/css/notebook.css | 16 ---------------- .../html/notebook/static/js/menubar.js | 3 --- .../html/notebook/static/js/notebook.js | 5 ----- .../html/notebook/static/js/notebookmain.js | 1 - .../html/notebook/static/js/quickhelp.js | 1 - .../html/notebook/templates/notebook.html | 18 ------------------ 6 files changed, 44 deletions(-) diff --git a/IPython/frontend/html/notebook/static/css/notebook.css b/IPython/frontend/html/notebook/static/css/notebook.css index 6b7913303..5055677a1 100644 --- a/IPython/frontend/html/notebook/static/css/notebook.css +++ b/IPython/frontend/html/notebook/static/css/notebook.css @@ -55,22 +55,6 @@ span#notebook_name { margin: 0.3em 0; } -#fulledit_widget { - /* Initially hidden to prevent FLOUC */ - display: none; - width: 920px; - margin: 0px auto; -} - -#fulledit_editor { - height: 577px; - width: 920px; -} - -#fulledit_header { - width: 920px; -} - span#quick_help_area { position: static; padding: 5px 0px; diff --git a/IPython/frontend/html/notebook/static/js/menubar.js b/IPython/frontend/html/notebook/static/js/menubar.js index 0eb989fbc..367744beb 100644 --- a/IPython/frontend/html/notebook/static/js/menubar.js +++ b/IPython/frontend/html/notebook/static/js/menubar.js @@ -106,9 +106,6 @@ var IPython = (function (IPython) { IPython.notebook.insert_cell_below('code'); }); // Cell - this.element.find('#full_edit_cell').click(function () { - IPython.fulledit_widget.open(); - }); this.element.find('#run_cell').click(function () { IPython.notebook.execute_selected_cell(); }); diff --git a/IPython/frontend/html/notebook/static/js/notebook.js b/IPython/frontend/html/notebook/static/js/notebook.js index d6bde5133..b207ad31b 100644 --- a/IPython/frontend/html/notebook/static/js/notebook.js +++ b/IPython/frontend/html/notebook/static/js/notebook.js @@ -178,11 +178,6 @@ var IPython = (function (IPython) { IPython.quick_help.show_keyboard_shortcuts(); that.control_key_active = false; return false; - } else if (event.which === 69 && that.control_key_active) { - // Edit in Ace = e - IPython.fulledit_widget.toggle(); - that.control_key_active = false; - return false; } else if (that.control_key_active) { that.control_key_active = false; return true; diff --git a/IPython/frontend/html/notebook/static/js/notebookmain.js b/IPython/frontend/html/notebook/static/js/notebookmain.js index 868f482fc..007a89fc8 100644 --- a/IPython/frontend/html/notebook/static/js/notebookmain.js +++ b/IPython/frontend/html/notebook/static/js/notebookmain.js @@ -89,7 +89,6 @@ $(document).ready(function () { IPython.kernel_status_widget = new IPython.KernelStatusWidget('#kernel_status'); IPython.menubar = new IPython.MenuBar('#menubar') IPython.kernel_status_widget.status_idle(); - IPython.fulledit_widget = new IPython.FullEditWidget('#fulledit_widget'); IPython.layout_manager.do_resize(); diff --git a/IPython/frontend/html/notebook/static/js/quickhelp.js b/IPython/frontend/html/notebook/static/js/quickhelp.js index 41aa3ef98..8e2954158 100644 --- a/IPython/frontend/html/notebook/static/js/quickhelp.js +++ b/IPython/frontend/html/notebook/static/js/quickhelp.js @@ -32,7 +32,6 @@ var IPython = (function (IPython) { {key: 'Ctrl-m c', help: 'copy cell'}, {key: 'Ctrl-m v', help: 'paste cell'}, {key: 'Ctrl-m d', help: 'delete cell'}, - {key: 'Ctrl-m e', help: 'toggle edit cell in Ace'}, {key: 'Ctrl-m a', help: 'insert cell above'}, {key: 'Ctrl-m b', help: 'insert cell below'}, {key: 'Ctrl-m t', help: 'toggle output'}, diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html index ceac0ad18..23f6fc187 100644 --- a/IPython/frontend/html/notebook/templates/notebook.html +++ b/IPython/frontend/html/notebook/templates/notebook.html @@ -107,8 +107,6 @@
  • Cell