##// END OF EJS Templates
upstream » ipython
RSS

Clone from https://github.com/ipython/ipython.git

Add scrollmanager
Jonathan Frederic -
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,78 b''
1 // Copyright (c) IPython Development Team.
2 // Distributed under the terms of the Modified BSD License.
3 define([], function(){
4 "use strict";
5
6 var ScrollManager = function (notebook) {
7 // Public constructor.
8 this.notebook = notebook;
9 };
10
11 ScrollManager.prototype.scroll = function (delta) {
12 // Scroll the document.
13 //
14 // Parameters
15 // ----------
16 // delta: integer
17 // direction to scroll the document. Positive is downwards.
18
19 // If one or more slides exist, scroll to the slide.
20 var $slide_cells = $('.slideshow-slide');
21 if ($slide_cells.length > 0) {
22 var i, cell;
23
24 // Get the active slide cell index.
25 var selected_index = this.notebook.find_cell_index(this.notebook.get_selected_cell());
26 var active_slide = -1;
27 var cells = this.notebook.get_cells();
28 for (i = selected_index; i >= 0; i--) {
29 cell = cells[i];
30 var ns = cell.metadata.slideshow;
31 if (ns && ns.slide_type == 'slide') {
32 active_slide = i;
33 break;
34 }
35 }
36
37 // Translate cell index into slide cell index.
38 if (active_slide != -1) {
39 for (i = 0; i < $slide_cells.length; i++) {
40 if (cells[active_slide].element[0] == $slide_cells[i]) {
41 active_slide = i;
42 break;
43 }
44 }
45 }
46
47 // Scroll.
48 if (active_slide != -1 || delta > 0) {
49 active_slide += delta;
50 active_slide = Math.max(0, Math.min($slide_cells.length-1, active_slide));
51
52 var cell_element = $slide_cells[active_slide];
53 cell = $(cell_element).data('cell');
54 this.notebook.select(this.notebook.find_cell_index(cell));
55
56 this.scroll_to(cell_element);
57 //cell_element.scrollIntoView(true);
58 }
59
60 // Cancel browser keyboard scroll.
61 return false;
62
63 // No slides exist, default browser scroll
64 } else {
65 return true;
66 }
67 };
68
69 ScrollManager.prototype.scroll_to = function(destination) {
70 $('html, body').animate({'scrollTop': element.offset().top}, 'slow', 'swing');
71 };
72
73 // For convinience, add the ScrollManager class to the global namespace
74 IPython.ScrollManager = ScrollManager;
75 // Return naemspace for require.js loads
76 return ScrollManager;
77
78 });
Show file before | Show file after | Hide comments
This diff has been collapsed as it changes many lines, (715 lines changed) Show them Hide them
@@ -1,14 +1,17 b''
1 // Copyright (c) IPython Development Team.
2 // Distributed under the terms of the Modified BSD License.
1 //----------------------------------------------------------------------------
2 // Copyright (C) 2011 The IPython Development Team
3 //
4 // Distributed under the terms of the BSD License. The full license is in
5 // the file COPYING, distributed as part of this software.
6 //----------------------------------------------------------------------------
3 7
4 define([
5 'base/js/namespace',
6 'jquery',
7 'base/js/utils',
8 'base/js/keyboard',
9 ], function(IPython, $, utils, keyboard) {
8 //============================================================================
9 // Keyboard management
10 //============================================================================
11
12 var IPython = (function (IPython) {
10 13 "use strict";
11
14
12 15 var browser = utils.browser[0];
13 16 var platform = utils.platform;
14 17
@@ -40,437 +43,449 b' define(['
40 43 KeyboardManager.prototype.get_default_common_shortcuts = function() {
41 44 var that = this;
42 45 var shortcuts = {
43 'shift' : {
44 help : '',
45 help_index : '',
46 handler : function (event) {
47 // ignore shift keydown
48 return true;
49 }
50 },
51 'shift-enter' : {
52 help : 'run cell, select below',
53 help_index : 'ba',
54 handler : function (event) {
46 'shift' : {
47 help : '',
48 help_index : '',
49 handler : function (event) {
50 // ignore shift keydown
51 return true;
52 }
53 },
54 'shift-enter' : {
55 help : 'run cell, select below',
56 help_index : 'ba',
57 handler : function (event) {
55 58 that.notebook.execute_cell_and_select_below();
56 return false;
57 }
58 },
59 'ctrl-enter' : {
60 help : 'run cell',
61 help_index : 'bb',
62 handler : function (event) {
59 return false;
60 }
61 },
62 'ctrl-enter' : {
63 help : 'run cell',
64 help_index : 'bb',
65 handler : function (event) {
63 66 that.notebook.execute_cell();
64 return false;
65 }
66 },
67 'alt-enter' : {
68 help : 'run cell, insert below',
69 help_index : 'bc',
70 handler : function (event) {
67 return false;
68 }
69 },
70 'alt-enter' : {
71 help : 'run cell, insert below',
72 help_index : 'bc',
73 handler : function (event) {
71 74 that.notebook.execute_cell_and_insert_below();
72 return false;
73 }
75 return false;
74 76 }
75 };
77 }
78 };
76 79
77 if (platform === 'MacOS') {
80 if (platform === 'MacOS') {
78 81 shortcuts['cmd-s'] =
79 {
80 help : 'save notebook',
81 help_index : 'fb',
82 handler : function (event) {
82 {
83 help : 'save notebook',
84 help_index : 'fb',
85 handler : function (event) {
83 86 that.notebook.save_checkpoint();
84 event.preventDefault();
85 return false;
86 }
87 };
88 } else {
87 event.preventDefault();
88 return false;
89 }
90 };
91 } else {
89 92 shortcuts['ctrl-s'] =
90 {
91 help : 'save notebook',
92 help_index : 'fb',
93 handler : function (event) {
93 {
94 help : 'save notebook',
95 help_index : 'fb',
96 handler : function (event) {
94 97 that.notebook.save_checkpoint();
95 event.preventDefault();
96 return false;
97 }
98 };
99 }
98 event.preventDefault();
99 return false;
100 }
101 };
102 }
100 103 return shortcuts;
101 104 };
102 105
103 106 KeyboardManager.prototype.get_default_edit_shortcuts = function() {
104 107 var that = this;
105 108 return {
106 'esc' : {
107 help : 'command mode',
108 help_index : 'aa',
109 handler : function (event) {
109 'esc' : {
110 help : 'command mode',
111 help_index : 'aa',
112 handler : function (event) {
110 113 that.notebook.command_mode();
111 return false;
112 }
113 },
114 'ctrl-m' : {
115 help : 'command mode',
116 help_index : 'ab',
117 handler : function (event) {
114 return false;
115 }
116 },
117 'ctrl-m' : {
118 help : 'command mode',
119 help_index : 'ab',
120 handler : function (event) {
118 121 that.notebook.command_mode();
119 return false;
120 }
121 },
122 'up' : {
123 help : '',
124 help_index : '',
125 handler : function (event) {
122 return false;
123 }
124 },
125 'up' : {
126 help : '',
127 help_index : '',
128 handler : function (event) {
126 129 var index = that.notebook.get_selected_index();
127 130 var cell = that.notebook.get_cell(index);
128 if (cell && cell.at_top() && index !== 0) {
129 event.preventDefault();
131 if (cell && cell.at_top() && index !== 0) {
132 event.preventDefault();
130 133 that.notebook.command_mode();
131 134 that.notebook.select_prev();
132 135 that.notebook.edit_mode();
133 136 var cm = that.notebook.get_selected_cell().code_mirror;
134 cm.setCursor(cm.lastLine(), 0);
135 return false;
136 } else if (cell) {
137 var cm = cell.code_mirror;
138 cm.execCommand('goLineUp');
139 return false;
140 }
137 cm.setCursor(cm.lastLine(), 0);
138 return false;
139 } else if (cell) {
140 var cm = cell.code_mirror;
141 cm.execCommand('goLineUp');
142 return false;
141 143 }
142 },
143 'down' : {
144 help : '',
145 help_index : '',
146 handler : function (event) {
144 }
145 },
146 'down' : {
147 help : '',
148 help_index : '',
149 handler : function (event) {
147 150 var index = that.notebook.get_selected_index();
148 151 var cell = that.notebook.get_cell(index);
149 152 if (cell.at_bottom() && index !== (that.notebook.ncells()-1)) {
150 event.preventDefault();
153 event.preventDefault();
151 154 that.notebook.command_mode();
152 155 that.notebook.select_next();
153 156 that.notebook.edit_mode();
154 157 var cm = that.notebook.get_selected_cell().code_mirror;
155 cm.setCursor(0, 0);
156 return false;
157 } else {
158 var cm = cell.code_mirror;
159 cm.execCommand('goLineDown');
160 return false;
161 }
162 }
163 },
164 'ctrl-shift--' : {
165 help : 'split cell',
166 help_index : 'ea',
167 handler : function (event) {
168 that.notebook.split_cell();
158 cm.setCursor(0, 0);
169 159 return false;
170 }
171 },
172 'ctrl-shift-subtract' : {
173 help : '',
174 help_index : 'eb',
175 handler : function (event) {
176 that.notebook.split_cell();
160 } else {
161 var cm = cell.code_mirror;
162 cm.execCommand('goLineDown');
177 163 return false;
178 164 }
179 },
180 };
165 }
166 },
167 'ctrl-shift--' : {
168 help : 'split cell',
169 help_index : 'ea',
170 handler : function (event) {
171 that.notebook.split_cell();
172 return false;
173 }
174 },
175 'ctrl-shift-subtract' : {
176 help : '',
177 help_index : 'eb',
178 handler : function (event) {
179 that.notebook.split_cell();
180 return false;
181 }
182 },
183 };
181 184 };
182 185
183 186 KeyboardManager.prototype.get_default_command_shortcuts = function() {
184 187 var that = this;
185 188 return {
186 'enter' : {
187 help : 'edit mode',
188 help_index : 'aa',
189 handler : function (event) {
189 'space': {
190 help: "Scroll down to next H1 cell",
191 handler: function(event) {
192 return that.notebook.scrollmanager.scroll(1);
193 },
194 },
195 'shift-space': {
196 help: "Scroll up to previous H1 cell",
197 handler: function(event) {
198 return that.notebook.scrollmanager.scroll(-1);
199 },
200 },
201 'enter' : {
202 help : 'edit mode',
203 help_index : 'aa',
204 handler : function (event) {
190 205 that.notebook.edit_mode();
191 return false;
192 }
193 },
194 'up' : {
195 help : 'select previous cell',
196 help_index : 'da',
197 handler : function (event) {
206 return false;
207 }
208 },
209 'up' : {
210 help : 'select previous cell',
211 help_index : 'da',
212 handler : function (event) {
198 213 var index = that.notebook.get_selected_index();
199 if (index !== 0 && index !== null) {
214 if (index !== 0 && index !== null) {
200 215 that.notebook.select_prev();
201 216 that.notebook.focus_cell();
202 }
203 return false;
204 217 }
205 },
206 'down' : {
207 help : 'select next cell',
208 help_index : 'db',
209 handler : function (event) {
218 return false;
219 }
220 },
221 'down' : {
222 help : 'select next cell',
223 help_index : 'db',
224 handler : function (event) {
210 225 var index = that.notebook.get_selected_index();
211 226 if (index !== (that.notebook.ncells()-1) && index !== null) {
212 227 that.notebook.select_next();
213 228 that.notebook.focus_cell();
214 }
215 return false;
216 229 }
217 },
218 'k' : {
219 help : 'select previous cell',
220 help_index : 'dc',
221 handler : function (event) {
230 return false;
231 }
232 },
233 'k' : {
234 help : 'select previous cell',
235 help_index : 'dc',
236 handler : function (event) {
222 237 var index = that.notebook.get_selected_index();
223 if (index !== 0 && index !== null) {
238 if (index !== 0 && index !== null) {
224 239 that.notebook.select_prev();
225 240 that.notebook.focus_cell();
226 }
227 return false;
228 241 }
229 },
230 'j' : {
231 help : 'select next cell',
232 help_index : 'dd',
233 handler : function (event) {
242 return false;
243 }
244 },
245 'j' : {
246 help : 'select next cell',
247 help_index : 'dd',
248 handler : function (event) {
234 249 var index = that.notebook.get_selected_index();
235 250 if (index !== (that.notebook.ncells()-1) && index !== null) {
236 251 that.notebook.select_next();
237 252 that.notebook.focus_cell();
238 }
239 return false;
240 253 }
241 },
242 'x' : {
243 help : 'cut cell',
244 help_index : 'ee',
245 handler : function (event) {
254 return false;
255 }
256 },
257 'x' : {
258 help : 'cut cell',
259 help_index : 'ee',
260 handler : function (event) {
246 261 that.notebook.cut_cell();
247 return false;
248 }
249 },
250 'c' : {
251 help : 'copy cell',
252 help_index : 'ef',
253 handler : function (event) {
262 return false;
263 }
264 },
265 'c' : {
266 help : 'copy cell',
267 help_index : 'ef',
268 handler : function (event) {
254 269 that.notebook.copy_cell();
255 return false;
256 }
257 },
258 'shift-v' : {
259 help : 'paste cell above',
260 help_index : 'eg',
261 handler : function (event) {
270 return false;
271 }
272 },
273 'shift-v' : {
274 help : 'paste cell above',
275 help_index : 'eg',
276 handler : function (event) {
262 277 that.notebook.paste_cell_above();
263 return false;
264 }
265 },
266 'v' : {
267 help : 'paste cell below',
268 help_index : 'eh',
269 handler : function (event) {
278 return false;
279 }
280 },
281 'v' : {
282 help : 'paste cell below',
283 help_index : 'eh',
284 handler : function (event) {
270 285 that.notebook.paste_cell_below();
271 return false;
272 }
273 },
274 'd' : {
275 help : 'delete cell (press twice)',
276 help_index : 'ej',
277 count: 2,
278 handler : function (event) {
286 return false;
287 }
288 },
289 'd' : {
290 help : 'delete cell (press twice)',
291 help_index : 'ej',
292 count: 2,
293 handler : function (event) {
279 294 that.notebook.delete_cell();
280 return false;
281 }
282 },
283 'a' : {
284 help : 'insert cell above',
285 help_index : 'ec',
286 handler : function (event) {
295 return false;
296 }
297 },
298 'a' : {
299 help : 'insert cell above',
300 help_index : 'ec',
301 handler : function (event) {
287 302 that.notebook.insert_cell_above();
288 303 that.notebook.select_prev();
289 304 that.notebook.focus_cell();
290 return false;
291 }
292 },
293 'b' : {
294 help : 'insert cell below',
295 help_index : 'ed',
296 handler : function (event) {
305 return false;
306 }
307 },
308 'b' : {
309 help : 'insert cell below',
310 help_index : 'ed',
311 handler : function (event) {
297 312 that.notebook.insert_cell_below();
298 313 that.notebook.select_next();
299 314 that.notebook.focus_cell();
300 return false;
301 }
302 },
303 'y' : {
304 help : 'to code',
305 help_index : 'ca',
306 handler : function (event) {
315 return false;
316 }
317 },
318 'y' : {
319 help : 'to code',
320 help_index : 'ca',
321 handler : function (event) {
307 322 that.notebook.to_code();
308 return false;
309 }
310 },
311 'm' : {
312 help : 'to markdown',
313 help_index : 'cb',
314 handler : function (event) {
323 return false;
324 }
325 },
326 'm' : {
327 help : 'to markdown',
328 help_index : 'cb',
329 handler : function (event) {
315 330 that.notebook.to_markdown();
316 return false;
317 }
318 },
319 'r' : {
320 help : 'to raw',
321 help_index : 'cc',
322 handler : function (event) {
331 return false;
332 }
333 },
334 'r' : {
335 help : 'to raw',
336 help_index : 'cc',
337 handler : function (event) {
323 338 that.notebook.to_raw();
324 return false;
325 }
326 },
327 '1' : {
328 help : 'to heading 1',
329 help_index : 'cd',
330 handler : function (event) {
339 return false;
340 }
341 },
342 '1' : {
343 help : 'to heading 1',
344 help_index : 'cd',
345 handler : function (event) {
331 346 that.notebook.to_heading(undefined, 1);
332 return false;
333 }
334 },
335 '2' : {
336 help : 'to heading 2',
337 help_index : 'ce',
338 handler : function (event) {
347 return false;
348 }
349 },
350 '2' : {
351 help : 'to heading 2',
352 help_index : 'ce',
353 handler : function (event) {
339 354 that.notebook.to_heading(undefined, 2);
340 return false;
341 }
342 },
343 '3' : {
344 help : 'to heading 3',
345 help_index : 'cf',
346 handler : function (event) {
355 return false;
356 }
357 },
358 '3' : {
359 help : 'to heading 3',
360 help_index : 'cf',
361 handler : function (event) {
347 362 that.notebook.to_heading(undefined, 3);
348 return false;
349 }
350 },
351 '4' : {
352 help : 'to heading 4',
353 help_index : 'cg',
354 handler : function (event) {
363 return false;
364 }
365 },
366 '4' : {
367 help : 'to heading 4',
368 help_index : 'cg',
369 handler : function (event) {
355 370 that.notebook.to_heading(undefined, 4);
356 return false;
357 }
358 },
359 '5' : {
360 help : 'to heading 5',
361 help_index : 'ch',
362 handler : function (event) {
371 return false;
372 }
373 },
374 '5' : {
375 help : 'to heading 5',
376 help_index : 'ch',
377 handler : function (event) {
363 378 that.notebook.to_heading(undefined, 5);
364 return false;
365 }
366 },
367 '6' : {
368 help : 'to heading 6',
369 help_index : 'ci',
370 handler : function (event) {
379 return false;
380 }
381 },
382 '6' : {
383 help : 'to heading 6',
384 help_index : 'ci',
385 handler : function (event) {
371 386 that.notebook.to_heading(undefined, 6);
372 return false;
373 }
374 },
375 'o' : {
376 help : 'toggle output',
377 help_index : 'gb',
378 handler : function (event) {
387 return false;
388 }
389 },
390 'o' : {
391 help : 'toggle output',
392 help_index : 'gb',
393 handler : function (event) {
379 394 that.notebook.toggle_output();
380 return false;
381 }
382 },
383 'shift-o' : {
384 help : 'toggle output scrolling',
385 help_index : 'gc',
386 handler : function (event) {
395 return false;
396 }
397 },
398 'shift-o' : {
399 help : 'toggle output scrolling',
400 help_index : 'gc',
401 handler : function (event) {
387 402 that.notebook.toggle_output_scroll();
388 return false;
389 }
390 },
391 's' : {
392 help : 'save notebook',
393 help_index : 'fa',
394 handler : function (event) {
403 return false;
404 }
405 },
406 's' : {
407 help : 'save notebook',
408 help_index : 'fa',
409 handler : function (event) {
395 410 that.notebook.save_checkpoint();
396 return false;
397 }
398 },
399 'ctrl-j' : {
400 help : 'move cell down',
401 help_index : 'eb',
402 handler : function (event) {
411 return false;
412 }
413 },
414 'ctrl-j' : {
415 help : 'move cell down',
416 help_index : 'eb',
417 handler : function (event) {
403 418 that.notebook.move_cell_down();
404 return false;
405 }
406 },
407 'ctrl-k' : {
408 help : 'move cell up',
409 help_index : 'ea',
410 handler : function (event) {
419 return false;
420 }
421 },
422 'ctrl-k' : {
423 help : 'move cell up',
424 help_index : 'ea',
425 handler : function (event) {
411 426 that.notebook.move_cell_up();
412 return false;
413 }
414 },
415 'l' : {
416 help : 'toggle line numbers',
417 help_index : 'ga',
418 handler : function (event) {
427 return false;
428 }
429 },
430 'l' : {
431 help : 'toggle line numbers',
432 help_index : 'ga',
433 handler : function (event) {
419 434 that.notebook.cell_toggle_line_numbers();
420 return false;
421 }
422 },
423 'i' : {
424 help : 'interrupt kernel (press twice)',
425 help_index : 'ha',
426 count: 2,
427 handler : function (event) {
435 return false;
436 }
437 },
438 'i' : {
439 help : 'interrupt kernel (press twice)',
440 help_index : 'ha',
441 count: 2,
442 handler : function (event) {
428 443 that.notebook.kernel.interrupt();
429 return false;
430 }
431 },
432 '0' : {
433 help : 'restart kernel (press twice)',
434 help_index : 'hb',
435 count: 2,
436 handler : function (event) {
444 return false;
445 }
446 },
447 '0' : {
448 help : 'restart kernel (press twice)',
449 help_index : 'hb',
450 count: 2,
451 handler : function (event) {
437 452 that.notebook.restart_kernel();
438 return false;
439 }
440 },
441 'h' : {
442 help : 'keyboard shortcuts',
443 help_index : 'ge',
444 handler : function (event) {
453 return false;
454 }
455 },
456 'h' : {
457 help : 'keyboard shortcuts',
458 help_index : 'ge',
459 handler : function (event) {
445 460 that.quick_help.show_keyboard_shortcuts();
446 return false;
447 }
448 },
449 'z' : {
450 help : 'undo last delete',
451 help_index : 'ei',
452 handler : function (event) {
461 return false;
462 }
463 },
464 'z' : {
465 help : 'undo last delete',
466 help_index : 'ei',
467 handler : function (event) {
453 468 that.notebook.undelete_cell();
454 return false;
455 }
456 },
457 'shift-m' : {
458 help : 'merge cell below',
459 help_index : 'ek',
460 handler : function (event) {
469 return false;
470 }
471 },
472 'shift-m' : {
473 help : 'merge cell below',
474 help_index : 'ek',
475 handler : function (event) {
461 476 that.notebook.merge_cell_below();
462 return false;
463 }
464 },
465 'q' : {
466 help : 'close pager',
467 help_index : 'gd',
468 handler : function (event) {
477 return false;
478 }
479 },
480 'q' : {
481 help : 'close pager',
482 help_index : 'gd',
483 handler : function (event) {
469 484 that.pager.collapse();
470 return false;
471 }
472 },
473 };
485 return false;
486 }
487 },
488 };
474 489 };
475 490
476 491 KeyboardManager.prototype.bind_events = function () {
Show file before | Show file after | Hide comments
@@ -19,6 +19,7 b' require(['
19 19 'notebook/js/keyboardmanager',
20 20 'notebook/js/config',
21 21 'notebook/js/kernelselector',
22 'notebook/js/scrollmanager'
22 23 // only loaded, not used:
23 24 'custom/custom',
24 25 ], function(
@@ -38,7 +39,8 b' require(['
38 39 savewidget,
39 40 keyboardmanager,
40 41 config,
41 kernelselector
42 kernelselector,
43 scrollmanager
42 44 ) {
43 45 "use strict";
44 46
@@ -67,6 +69,7 b' require(['
67 69 save_widget: save_widget,
68 70 config: user_config},
69 71 common_options));
72 var scrollmanager = new scrollmanager.ScrollManager(notebook);
70 73 var login_widget = new loginwidget.LoginWidget('span#login_widget', common_options);
71 74 var toolbar = new maintoolbar.MainToolBar('#maintoolbar-container', {
72 75 notebook: notebook,
@@ -132,6 +135,7 b' require(['
132 135 IPython.save_widget = save_widget;
133 136 IPython.config = user_config;
134 137 IPython.tooltip = notebook.tooltip;
138 IPython.scrollmanager = scrollmanager;
135 139
136 140 events.trigger('app_initialized.NotebookApp');
137 141 notebook.load_notebook(common_options.notebook_name, common_options.notebook_path);
General Comments 0
You need to be logged in to leave comments. Login now