mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-30 12:11:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1326 from ellisonbg/removeace

Browse Source 
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.
This commit is contained in:
Fernando Perez 2012-01-25 20:30:36 -08:00
commit 219ba77482
6 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IPython/frontend/html/notebook/static/css/notebook.css
View File

@ -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;

3
IPython/frontend/html/notebook/static/js/menubar.js
View File

@ -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();
});

5
IPython/frontend/html/notebook/static/js/notebook.js
View File

@ -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;

1
IPython/frontend/html/notebook/static/js/notebookmain.js
View File

@ -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();

1
IPython/frontend/html/notebook/static/js/quickhelp.js
View File

@ -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'},

18
IPython/frontend/html/notebook/templates/notebook.html
View File

@ -107,8 +107,6 @@
</li>
<li><a href="#">Cell</a>
<ul>
<li id="full_edit_cell"><a href="#">Edit in Ace</a></li>
<hr/>
<li id="run_cell"><a href="#">Run</a></li>
<li id="run_cell_in_place"><a href="#">Run in Place</a></li>
<li id="run_all_cells"><a href="#">Run All</a></li>
@ -132,8 +130,6 @@
<li><a href="http://ipython.org/ipython-doc/stable/interactive/htmlnotebook.html" target="_blank">Notebook Help</a></li>
<li id="keyboard_shortcuts"><a href="#">Keyboard Shortcuts</a></li>
<hr/>
<li><a href="https://github.com/ajaxorg/ace/wiki/Default-Keyboard-Shortcuts" target="_blank">Ace Keyboard Shortcuts</a></li>
<hr/>
<li><a href="http://docs.python.org" target="_blank">Python</a></li>
<li><a href="http://docs.scipy.org/doc/numpy/reference/" target="_blank">NumPy</a></li>
<li><a href="http://docs.scipy.org/doc/scipy/reference/" target="_blank">SciPy</a></li>
@ -155,13 +151,6 @@
</div>
<div id="fulledit_widget" >
<div id="fulledit_header">
<button id="close_fulledit">Close</button>
</div>
<div id="fulledit_editor">some text</div>
</div>
<script src="/static/jquery/js/jquery-1.7.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/static/jquery/js/jquery-ui.min.js" type="text/javascript" charset="utf-8"></script>
@ -174,12 +163,6 @@
<script src="/static/codemirror/mode/rst/rst.js" charset="utf-8"></script>
<script src="/static/codemirror/mode/markdown/markdown.js" charset="utf-8"></script>
<script src="/static/ace/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="/static/ace/mode-python.js" type="text/javascript" charset="utf-8"></script>
<script src="/static/ace/mode-markdown.js" type="text/javascript" charset="utf-8"></script>
<script src="/static/ace/mode-html.js" type="text/javascript" charset="utf-8"></script>
<script src="/static/ace/theme-textmate.js" type="text/javascript" charset="utf-8"></script>
<script src="/static/pagedown/Markdown.Converter.js" charset="utf-8"></script>
<script src="/static/prettify/prettify.js" charset="utf-8"></script>
@ -200,7 +183,6 @@
<script src="/static/js/menubar.js" type="text/javascript" charset="utf-8"></script>
<script src="/static/js/notebook.js" type="text/javascript" charset="utf-8"></script>
<script src="/static/js/notebookmain.js" type="text/javascript" charset="utf-8"></script>
<script src="/static/js/fulleditwidget.js" type="text/javascript" charset="utf-8"></script>
</body>