##// END OF EJS Templates
Removing Ace edit capability....
Brian Granger -
Show More
@@ -55,22 +55,6 b' span#notebook_name {'
55 margin: 0.3em 0;
55 margin: 0.3em 0;
56 }
56 }
57
57
58 #fulledit_widget {
59 /* Initially hidden to prevent FLOUC */
60 display: none;
61 width: 920px;
62 margin: 0px auto;
63 }
64
65 #fulledit_editor {
66 height: 577px;
67 width: 920px;
68 }
69
70 #fulledit_header {
71 width: 920px;
72 }
73
74 span#quick_help_area {
58 span#quick_help_area {
75 position: static;
59 position: static;
76 padding: 5px 0px;
60 padding: 5px 0px;
@@ -106,9 +106,6 b' var IPython = (function (IPython) {'
106 IPython.notebook.insert_cell_below('code');
106 IPython.notebook.insert_cell_below('code');
107 });
107 });
108 // Cell
108 // Cell
109 this.element.find('#full_edit_cell').click(function () {
110 IPython.fulledit_widget.open();
111 });
112 this.element.find('#run_cell').click(function () {
109 this.element.find('#run_cell').click(function () {
113 IPython.notebook.execute_selected_cell();
110 IPython.notebook.execute_selected_cell();
114 });
111 });
@@ -178,11 +178,6 b' var IPython = (function (IPython) {'
178 IPython.quick_help.show_keyboard_shortcuts();
178 IPython.quick_help.show_keyboard_shortcuts();
179 that.control_key_active = false;
179 that.control_key_active = false;
180 return false;
180 return false;
181 } else if (event.which === 69 && that.control_key_active) {
182 // Edit in Ace = e
183 IPython.fulledit_widget.toggle();
184 that.control_key_active = false;
185 return false;
186 } else if (that.control_key_active) {
181 } else if (that.control_key_active) {
187 that.control_key_active = false;
182 that.control_key_active = false;
188 return true;
183 return true;
@@ -89,7 +89,6 b' $(document).ready(function () {'
89 IPython.kernel_status_widget = new IPython.KernelStatusWidget('#kernel_status');
89 IPython.kernel_status_widget = new IPython.KernelStatusWidget('#kernel_status');
90 IPython.menubar = new IPython.MenuBar('#menubar')
90 IPython.menubar = new IPython.MenuBar('#menubar')
91 IPython.kernel_status_widget.status_idle();
91 IPython.kernel_status_widget.status_idle();
92 IPython.fulledit_widget = new IPython.FullEditWidget('#fulledit_widget');
93
92
94 IPython.layout_manager.do_resize();
93 IPython.layout_manager.do_resize();
95
94
@@ -32,7 +32,6 b' var IPython = (function (IPython) {'
32 {key: 'Ctrl-m c', help: 'copy cell'},
32 {key: 'Ctrl-m c', help: 'copy cell'},
33 {key: 'Ctrl-m v', help: 'paste cell'},
33 {key: 'Ctrl-m v', help: 'paste cell'},
34 {key: 'Ctrl-m d', help: 'delete cell'},
34 {key: 'Ctrl-m d', help: 'delete cell'},
35 {key: 'Ctrl-m e', help: 'toggle edit cell in Ace'},
36 {key: 'Ctrl-m a', help: 'insert cell above'},
35 {key: 'Ctrl-m a', help: 'insert cell above'},
37 {key: 'Ctrl-m b', help: 'insert cell below'},
36 {key: 'Ctrl-m b', help: 'insert cell below'},
38 {key: 'Ctrl-m t', help: 'toggle output'},
37 {key: 'Ctrl-m t', help: 'toggle output'},
@@ -107,8 +107,6 b''
107 </li>
107 </li>
108 <li><a href="#">Cell</a>
108 <li><a href="#">Cell</a>
109 <ul>
109 <ul>
110 <li id="full_edit_cell"><a href="#">Edit in Ace</a></li>
111 <hr/>
112 <li id="run_cell"><a href="#">Run</a></li>
110 <li id="run_cell"><a href="#">Run</a></li>
113 <li id="run_cell_in_place"><a href="#">Run in Place</a></li>
111 <li id="run_cell_in_place"><a href="#">Run in Place</a></li>
114 <li id="run_all_cells"><a href="#">Run All</a></li>
112 <li id="run_all_cells"><a href="#">Run All</a></li>
@@ -132,8 +130,6 b''
132 <li><a href="http://ipython.org/ipython-doc/stable/interactive/htmlnotebook.html" target="_blank">Notebook Help</a></li>
130 <li><a href="http://ipython.org/ipython-doc/stable/interactive/htmlnotebook.html" target="_blank">Notebook Help</a></li>
133 <li id="keyboard_shortcuts"><a href="#">Keyboard Shortcuts</a></li>
131 <li id="keyboard_shortcuts"><a href="#">Keyboard Shortcuts</a></li>
134 <hr/>
132 <hr/>
135 <li><a href="https://github.com/ajaxorg/ace/wiki/Default-Keyboard-Shortcuts" target="_blank">Ace Keyboard Shortcuts</a></li>
136 <hr/>
137 <li><a href="http://docs.python.org" target="_blank">Python</a></li>
133 <li><a href="http://docs.python.org" target="_blank">Python</a></li>
138 <li><a href="http://docs.scipy.org/doc/numpy/reference/" target="_blank">NumPy</a></li>
134 <li><a href="http://docs.scipy.org/doc/numpy/reference/" target="_blank">NumPy</a></li>
139 <li><a href="http://docs.scipy.org/doc/scipy/reference/" target="_blank">SciPy</a></li>
135 <li><a href="http://docs.scipy.org/doc/scipy/reference/" target="_blank">SciPy</a></li>
@@ -155,13 +151,6 b''
155
151
156 </div>
152 </div>
157
153
158 <div id="fulledit_widget" >
159 <div id="fulledit_header">
160 <button id="close_fulledit">Close</button>
161 </div>
162 <div id="fulledit_editor">some text</div>
163 </div>
164
165 <script src="/static/jquery/js/jquery-1.7.1.min.js" type="text/javascript" charset="utf-8"></script>
154 <script src="/static/jquery/js/jquery-1.7.1.min.js" type="text/javascript" charset="utf-8"></script>
166 <script src="/static/jquery/js/jquery-ui.min.js" type="text/javascript" charset="utf-8"></script>
155 <script src="/static/jquery/js/jquery-ui.min.js" type="text/javascript" charset="utf-8"></script>
167
156
@@ -174,12 +163,6 b''
174 <script src="/static/codemirror/mode/rst/rst.js" charset="utf-8"></script>
163 <script src="/static/codemirror/mode/rst/rst.js" charset="utf-8"></script>
175 <script src="/static/codemirror/mode/markdown/markdown.js" charset="utf-8"></script>
164 <script src="/static/codemirror/mode/markdown/markdown.js" charset="utf-8"></script>
176
165
177 <script src="/static/ace/ace.js" type="text/javascript" charset="utf-8"></script>
178 <script src="/static/ace/mode-python.js" type="text/javascript" charset="utf-8"></script>
179 <script src="/static/ace/mode-markdown.js" type="text/javascript" charset="utf-8"></script>
180 <script src="/static/ace/mode-html.js" type="text/javascript" charset="utf-8"></script>
181 <script src="/static/ace/theme-textmate.js" type="text/javascript" charset="utf-8"></script>
182
183 <script src="/static/pagedown/Markdown.Converter.js" charset="utf-8"></script>
166 <script src="/static/pagedown/Markdown.Converter.js" charset="utf-8"></script>
184
167
185 <script src="/static/prettify/prettify.js" charset="utf-8"></script>
168 <script src="/static/prettify/prettify.js" charset="utf-8"></script>
@@ -200,7 +183,6 b''
200 <script src="/static/js/menubar.js" type="text/javascript" charset="utf-8"></script>
183 <script src="/static/js/menubar.js" type="text/javascript" charset="utf-8"></script>
201 <script src="/static/js/notebook.js" type="text/javascript" charset="utf-8"></script>
184 <script src="/static/js/notebook.js" type="text/javascript" charset="utf-8"></script>
202 <script src="/static/js/notebookmain.js" type="text/javascript" charset="utf-8"></script>
185 <script src="/static/js/notebookmain.js" type="text/javascript" charset="utf-8"></script>
203 <script src="/static/js/fulleditwidget.js" type="text/javascript" charset="utf-8"></script>
204
186
205 </body>
187 </body>
206
188
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now