Show More
@@ -1,494 +1,494 b'' | |||
|
1 | 1 | //---------------------------------------------------------------------------- |
|
2 | 2 | // Copyright (C) 2008-2011 The IPython Development Team |
|
3 | 3 | // |
|
4 | 4 | // Distributed under the terms of the BSD License. The full license is in |
|
5 | 5 | // the file COPYING, distributed as part of this software. |
|
6 | 6 | //---------------------------------------------------------------------------- |
|
7 | 7 | |
|
8 | 8 | //============================================================================ |
|
9 | 9 | // Cell |
|
10 | 10 | //============================================================================ |
|
11 | 11 | /** |
|
12 | 12 | * An extendable module that provide base functionnality to create cell for notebook. |
|
13 | 13 | * @module IPython |
|
14 | 14 | * @namespace IPython |
|
15 | 15 | * @submodule Cell |
|
16 | 16 | */ |
|
17 | 17 | |
|
18 | 18 | var IPython = (function (IPython) { |
|
19 | 19 | "use strict"; |
|
20 | 20 | |
|
21 | 21 | var utils = IPython.utils; |
|
22 | 22 | |
|
23 | 23 | /** |
|
24 | 24 | * The Base `Cell` class from which to inherit |
|
25 | 25 | * @class Cell |
|
26 | 26 | **/ |
|
27 | 27 | |
|
28 | 28 | /* |
|
29 | 29 | * @constructor |
|
30 | 30 | * |
|
31 | 31 | * @param {object|undefined} [options] |
|
32 | 32 | * @param [options.cm_config] {object} config to pass to CodeMirror, will extend default parameters |
|
33 | 33 | */ |
|
34 | 34 | var Cell = function (options) { |
|
35 | 35 | |
|
36 | 36 | options = this.mergeopt(Cell, options); |
|
37 | 37 | // superclass default overwrite our default |
|
38 | 38 | |
|
39 | 39 | this.placeholder = options.placeholder || ''; |
|
40 | 40 | this.read_only = options.cm_config.readOnly; |
|
41 | 41 | this.selected = false; |
|
42 | 42 | this.rendered = false; |
|
43 | 43 | this.mode = 'command'; |
|
44 | 44 | this.metadata = {}; |
|
45 | 45 | // load this from metadata later ? |
|
46 | 46 | this.user_highlight = 'auto'; |
|
47 | 47 | this.cm_config = options.cm_config; |
|
48 | 48 | this.cell_id = utils.uuid(); |
|
49 | 49 | this._options = options; |
|
50 | 50 | |
|
51 | 51 | // For JS VM engines optimisation, attributes should be all set (even |
|
52 | 52 | // to null) in the constructor, and if possible, if different subclass |
|
53 | 53 | // have new attributes with same name, they should be created in the |
|
54 | 54 | // same order. Easiest is to create and set to null in parent class. |
|
55 | 55 | |
|
56 | 56 | this.element = null; |
|
57 | 57 | this.cell_type = this.cell_type || null; |
|
58 | 58 | this.code_mirror = null; |
|
59 | 59 | |
|
60 | 60 | |
|
61 | 61 | this.create_element(); |
|
62 | 62 | if (this.element !== null) { |
|
63 | 63 | this.element.data("cell", this); |
|
64 | 64 | this.bind_events(); |
|
65 | 65 | this.init_classes(); |
|
66 | 66 | } |
|
67 | 67 | }; |
|
68 | 68 | |
|
69 | 69 | Cell.options_default = { |
|
70 | 70 | cm_config : { |
|
71 | 71 | indentUnit : 4, |
|
72 | 72 | readOnly: false, |
|
73 | 73 | theme: "default" |
|
74 | 74 | } |
|
75 | 75 | }; |
|
76 | 76 | |
|
77 | 77 | // FIXME: Workaround CM Bug #332 (Safari segfault on drag) |
|
78 | 78 | // by disabling drag/drop altogether on Safari |
|
79 | 79 | // https://github.com/marijnh/CodeMirror/issues/332 |
|
80 | 80 | |
|
81 | 81 | if (utils.browser[0] == "Safari") { |
|
82 | 82 | Cell.options_default.cm_config.dragDrop = false; |
|
83 | 83 | } |
|
84 | 84 | |
|
85 | 85 | Cell.prototype.mergeopt = function(_class, options, overwrite){ |
|
86 | 86 | options = options || {}; |
|
87 | 87 | overwrite = overwrite || {}; |
|
88 | 88 | return $.extend(true, {}, _class.options_default, options, overwrite) |
|
89 | 89 | |
|
90 | 90 | } |
|
91 | 91 | |
|
92 | 92 | |
|
93 | 93 | |
|
94 | 94 | /** |
|
95 | 95 | * Empty. Subclasses must implement create_element. |
|
96 | 96 | * This should contain all the code to create the DOM element in notebook |
|
97 | 97 | * and will be called by Base Class constructor. |
|
98 | 98 | * @method create_element |
|
99 | 99 | */ |
|
100 | 100 | Cell.prototype.create_element = function () { |
|
101 | 101 | }; |
|
102 | 102 | |
|
103 | 103 | Cell.prototype.init_classes = function () { |
|
104 | 104 | // Call after this.element exists to initialize the css classes |
|
105 | 105 | // related to selected, rendered and mode. |
|
106 | 106 | if (this.selected) { |
|
107 | 107 | this.element.addClass('selected'); |
|
108 | 108 | } else { |
|
109 | 109 | this.element.addClass('unselected'); |
|
110 | 110 | } |
|
111 | 111 | if (this.rendered) { |
|
112 | 112 | this.element.addClass('rendered'); |
|
113 | 113 | } else { |
|
114 | 114 | this.element.addClass('unrendered'); |
|
115 | 115 | } |
|
116 | 116 | if (this.mode === 'edit') { |
|
117 | 117 | this.element.addClass('edit_mode'); |
|
118 | 118 | } else { |
|
119 | 119 | this.element.addClass('command_mode'); |
|
120 | 120 | } |
|
121 | 121 | } |
|
122 | 122 | |
|
123 | 123 | |
|
124 | 124 | /** |
|
125 | 125 | * Subclasses can implement override bind_events. |
|
126 | 126 | * Be carefull to call the parent method when overwriting as it fires event. |
|
127 | 127 | * this will be triggerd after create_element in constructor. |
|
128 | 128 | * @method bind_events |
|
129 | 129 | */ |
|
130 | 130 | Cell.prototype.bind_events = function () { |
|
131 | 131 | var that = this; |
|
132 | 132 | // We trigger events so that Cell doesn't have to depend on Notebook. |
|
133 | 133 | that.element.click(function (event) { |
|
134 | 134 | if (!that.selected) { |
|
135 | 135 | $([IPython.events]).trigger('select.Cell', {'cell':that}); |
|
136 | 136 | }; |
|
137 | 137 | }); |
|
138 | 138 | that.element.focusin(function (event) { |
|
139 | 139 | if (!that.selected) { |
|
140 | 140 | $([IPython.events]).trigger('select.Cell', {'cell':that}); |
|
141 | 141 | }; |
|
142 | 142 | }); |
|
143 | 143 | if (this.code_mirror) { |
|
144 | 144 | this.code_mirror.on("change", function(cm, change) { |
|
145 | 145 | $([IPython.events]).trigger("set_dirty.Notebook", {value: true}); |
|
146 | 146 | }); |
|
147 |
} |
|
|
147 | } | |
|
148 | 148 | if (this.code_mirror) { |
|
149 | 149 | this.code_mirror.on('focus', function(cm, change) { |
|
150 | 150 | $([IPython.events]).trigger('edit_mode.Cell', {cell: that}); |
|
151 | 151 | }); |
|
152 |
} |
|
|
152 | } | |
|
153 | 153 | if (this.code_mirror) { |
|
154 | 154 | this.code_mirror.on('blur', function(cm, change) { |
|
155 | 155 | if (that.mode === 'edit') { |
|
156 | 156 | setTimeout(function () { |
|
157 | 157 | var isf = IPython.utils.is_focused; |
|
158 | 158 | var trigger = true; |
|
159 | 159 | if (isf('div#tooltip') || isf('div.completions')) { |
|
160 | 160 | trigger = false; |
|
161 | 161 | } |
|
162 | 162 | if (trigger) { |
|
163 | 163 | $([IPython.events]).trigger('command_mode.Cell', {cell: that}); |
|
164 | 164 | } |
|
165 | 165 | }, 1); |
|
166 | 166 | } |
|
167 | 167 | }); |
|
168 |
} |
|
|
168 | } | |
|
169 | 169 | }; |
|
170 | 170 | |
|
171 | 171 | /** |
|
172 | 172 | * Triger typsetting of math by mathjax on current cell element |
|
173 | 173 | * @method typeset |
|
174 | 174 | */ |
|
175 | 175 | Cell.prototype.typeset = function () { |
|
176 | 176 | if (window.MathJax) { |
|
177 | 177 | var cell_math = this.element.get(0); |
|
178 | 178 | MathJax.Hub.Queue(["Typeset", MathJax.Hub, cell_math]); |
|
179 |
} |
|
|
179 | } | |
|
180 | 180 | }; |
|
181 | 181 | |
|
182 | 182 | /** |
|
183 | 183 | * handle cell level logic when a cell is selected |
|
184 | 184 | * @method select |
|
185 | 185 | * @return is the action being taken |
|
186 | 186 | */ |
|
187 | 187 | Cell.prototype.select = function () { |
|
188 | 188 | if (!this.selected) { |
|
189 | 189 | this.element.addClass('selected'); |
|
190 | 190 | this.element.removeClass('unselected'); |
|
191 | 191 | this.selected = true; |
|
192 | 192 | return true; |
|
193 | 193 | } else { |
|
194 | 194 | return false; |
|
195 |
} |
|
|
195 | } | |
|
196 | 196 | }; |
|
197 | 197 | |
|
198 | 198 | /** |
|
199 | 199 | * handle cell level logic when a cell is unselected |
|
200 | 200 | * @method unselect |
|
201 | 201 | * @return is the action being taken |
|
202 | 202 | */ |
|
203 | 203 | Cell.prototype.unselect = function () { |
|
204 | 204 | if (this.selected) { |
|
205 | 205 | this.element.addClass('unselected'); |
|
206 | 206 | this.element.removeClass('selected'); |
|
207 | 207 | this.selected = false; |
|
208 | 208 | return true; |
|
209 | 209 | } else { |
|
210 | 210 | return false; |
|
211 |
} |
|
|
211 | } | |
|
212 | 212 | }; |
|
213 | 213 | |
|
214 | 214 | /** |
|
215 | 215 | * handle cell level logic when a cell is rendered |
|
216 | 216 | * @method render |
|
217 | 217 | * @return is the action being taken |
|
218 | 218 | */ |
|
219 | 219 | Cell.prototype.render = function () { |
|
220 | 220 | if (!this.rendered) { |
|
221 | 221 | this.element.addClass('rendered'); |
|
222 | 222 | this.element.removeClass('unrendered'); |
|
223 | 223 | this.rendered = true; |
|
224 | 224 | return true; |
|
225 | 225 | } else { |
|
226 | 226 | return false; |
|
227 |
} |
|
|
227 | } | |
|
228 | 228 | }; |
|
229 | 229 | |
|
230 | 230 | /** |
|
231 | 231 | * handle cell level logic when a cell is unrendered |
|
232 | 232 | * @method unrender |
|
233 | 233 | * @return is the action being taken |
|
234 | 234 | */ |
|
235 | 235 | Cell.prototype.unrender = function () { |
|
236 | 236 | if (this.rendered) { |
|
237 | 237 | this.element.addClass('unrendered'); |
|
238 | 238 | this.element.removeClass('rendered'); |
|
239 | 239 | this.rendered = false; |
|
240 | 240 | return true; |
|
241 | 241 | } else { |
|
242 | 242 | return false; |
|
243 |
} |
|
|
243 | } | |
|
244 | 244 | }; |
|
245 | 245 | |
|
246 | 246 | /** |
|
247 | 247 | * enter the command mode for the cell |
|
248 | 248 | * @method command_mode |
|
249 | 249 | * @return is the action being taken |
|
250 | 250 | */ |
|
251 | 251 | Cell.prototype.command_mode = function () { |
|
252 | 252 | if (this.mode !== 'command') { |
|
253 | 253 | this.element.addClass('command_mode'); |
|
254 | 254 | this.element.removeClass('edit_mode'); |
|
255 | 255 | this.mode = 'command'; |
|
256 | 256 | return true; |
|
257 | 257 | } else { |
|
258 | 258 | return false; |
|
259 |
} |
|
|
259 | } | |
|
260 | 260 | }; |
|
261 | 261 | |
|
262 | 262 | /** |
|
263 | 263 | * enter the edit mode for the cell |
|
264 | 264 | * @method command_mode |
|
265 | 265 | * @return is the action being taken |
|
266 | 266 | */ |
|
267 | 267 | Cell.prototype.edit_mode = function () { |
|
268 | 268 | if (this.mode !== 'edit') { |
|
269 | 269 | this.element.addClass('edit_mode'); |
|
270 | 270 | this.element.removeClass('command_mode'); |
|
271 | 271 | this.mode = 'edit'; |
|
272 | 272 | return true; |
|
273 | 273 | } else { |
|
274 | 274 | return false; |
|
275 |
} |
|
|
275 | } | |
|
276 | 276 | } |
|
277 | 277 | |
|
278 | 278 | /** |
|
279 | 279 | * Focus the cell in the DOM sense |
|
280 | 280 | * @method focus_cell |
|
281 | 281 | */ |
|
282 | 282 | Cell.prototype.focus_cell = function () { |
|
283 | 283 | this.element.focus(); |
|
284 | 284 | } |
|
285 | 285 | |
|
286 | 286 | /** |
|
287 | 287 | * Focus the editor area so a user can type |
|
288 | 288 | * @method focus_editor |
|
289 | 289 | */ |
|
290 | 290 | Cell.prototype.focus_editor = function () { |
|
291 | 291 | this.refresh(); |
|
292 | 292 | this.code_mirror.focus(); |
|
293 | 293 | } |
|
294 | 294 | |
|
295 | 295 | /** |
|
296 | 296 | * Refresh codemirror instance |
|
297 | 297 | * @method refresh |
|
298 | 298 | */ |
|
299 | 299 | Cell.prototype.refresh = function () { |
|
300 | 300 | this.code_mirror.refresh(); |
|
301 | 301 | }; |
|
302 | 302 | |
|
303 | 303 | /** |
|
304 | 304 | * should be overritten by subclass |
|
305 | 305 | * @method get_text |
|
306 | 306 | */ |
|
307 | 307 | Cell.prototype.get_text = function () { |
|
308 | 308 | }; |
|
309 | 309 | |
|
310 | 310 | /** |
|
311 | 311 | * should be overritten by subclass |
|
312 | 312 | * @method set_text |
|
313 | 313 | * @param {string} text |
|
314 | 314 | */ |
|
315 | 315 | Cell.prototype.set_text = function (text) { |
|
316 | 316 | }; |
|
317 | 317 | |
|
318 | 318 | /** |
|
319 | 319 | * should be overritten by subclass |
|
320 | 320 | * serialise cell to json. |
|
321 | 321 | * @method toJSON |
|
322 | 322 | **/ |
|
323 | 323 | Cell.prototype.toJSON = function () { |
|
324 | 324 | var data = {}; |
|
325 | 325 | data.metadata = this.metadata; |
|
326 | 326 | data.cell_type = this.cell_type; |
|
327 | 327 | return data; |
|
328 | 328 | }; |
|
329 | 329 | |
|
330 | 330 | |
|
331 | 331 | /** |
|
332 | 332 | * should be overritten by subclass |
|
333 | 333 | * @method fromJSON |
|
334 | 334 | **/ |
|
335 | 335 | Cell.prototype.fromJSON = function (data) { |
|
336 | 336 | if (data.metadata !== undefined) { |
|
337 | 337 | this.metadata = data.metadata; |
|
338 | 338 | } |
|
339 | 339 | this.celltoolbar.rebuild(); |
|
340 | 340 | }; |
|
341 | 341 | |
|
342 | 342 | |
|
343 | 343 | /** |
|
344 | 344 | * can the cell be split into two cells |
|
345 | 345 | * @method is_splittable |
|
346 | 346 | **/ |
|
347 | 347 | Cell.prototype.is_splittable = function () { |
|
348 | 348 | return true; |
|
349 | 349 | }; |
|
350 | 350 | |
|
351 | 351 | |
|
352 | 352 | /** |
|
353 | 353 | * can the cell be merged with other cells |
|
354 | 354 | * @method is_mergeable |
|
355 | 355 | **/ |
|
356 | 356 | Cell.prototype.is_mergeable = function () { |
|
357 | 357 | return true; |
|
358 | 358 | }; |
|
359 | 359 | |
|
360 | 360 | |
|
361 | 361 | /** |
|
362 | 362 | * @return {String} - the text before the cursor |
|
363 | 363 | * @method get_pre_cursor |
|
364 | 364 | **/ |
|
365 | 365 | Cell.prototype.get_pre_cursor = function () { |
|
366 | 366 | var cursor = this.code_mirror.getCursor(); |
|
367 | 367 | var text = this.code_mirror.getRange({line:0, ch:0}, cursor); |
|
368 | 368 | text = text.replace(/^\n+/, '').replace(/\n+$/, ''); |
|
369 | 369 | return text; |
|
370 | 370 | } |
|
371 | 371 | |
|
372 | 372 | |
|
373 | 373 | /** |
|
374 | 374 | * @return {String} - the text after the cursor |
|
375 | 375 | * @method get_post_cursor |
|
376 | 376 | **/ |
|
377 | 377 | Cell.prototype.get_post_cursor = function () { |
|
378 | 378 | var cursor = this.code_mirror.getCursor(); |
|
379 | 379 | var last_line_num = this.code_mirror.lineCount()-1; |
|
380 | 380 | var last_line_len = this.code_mirror.getLine(last_line_num).length; |
|
381 | 381 | var end = {line:last_line_num, ch:last_line_len} |
|
382 | 382 | var text = this.code_mirror.getRange(cursor, end); |
|
383 | 383 | text = text.replace(/^\n+/, '').replace(/\n+$/, ''); |
|
384 | 384 | return text; |
|
385 | 385 | }; |
|
386 | 386 | |
|
387 | 387 | /** |
|
388 | 388 | * Show/Hide CodeMirror LineNumber |
|
389 | 389 | * @method show_line_numbers |
|
390 | 390 | * |
|
391 | 391 | * @param value {Bool} show (true), or hide (false) the line number in CodeMirror |
|
392 | 392 | **/ |
|
393 | 393 | Cell.prototype.show_line_numbers = function (value) { |
|
394 | 394 | this.code_mirror.setOption('lineNumbers', value); |
|
395 | 395 | this.code_mirror.refresh(); |
|
396 | 396 | }; |
|
397 | 397 | |
|
398 | 398 | /** |
|
399 | 399 | * Toggle CodeMirror LineNumber |
|
400 | 400 | * @method toggle_line_numbers |
|
401 | 401 | **/ |
|
402 | 402 | Cell.prototype.toggle_line_numbers = function () { |
|
403 | 403 | var val = this.code_mirror.getOption('lineNumbers'); |
|
404 | 404 | this.show_line_numbers(!val); |
|
405 | 405 | }; |
|
406 | 406 | |
|
407 | 407 | /** |
|
408 | 408 | * Force codemirror highlight mode |
|
409 | 409 | * @method force_highlight |
|
410 | 410 | * @param {object} - CodeMirror mode |
|
411 | 411 | **/ |
|
412 | 412 | Cell.prototype.force_highlight = function(mode) { |
|
413 | 413 | this.user_highlight = mode; |
|
414 | 414 | this.auto_highlight(); |
|
415 | 415 | }; |
|
416 | 416 | |
|
417 | 417 | /** |
|
418 | 418 | * Try to autodetect cell highlight mode, or use selected mode |
|
419 | 419 | * @methods _auto_highlight |
|
420 | 420 | * @private |
|
421 | 421 | * @param {String|object|undefined} - CodeMirror mode | 'auto' |
|
422 | 422 | **/ |
|
423 | 423 | Cell.prototype._auto_highlight = function (modes) { |
|
424 | 424 | //Here we handle manually selected modes |
|
425 | 425 | if( this.user_highlight != undefined && this.user_highlight != 'auto' ) |
|
426 | 426 | { |
|
427 | 427 | var mode = this.user_highlight; |
|
428 | 428 | CodeMirror.autoLoadMode(this.code_mirror, mode); |
|
429 | 429 | this.code_mirror.setOption('mode', mode); |
|
430 | 430 | return; |
|
431 | 431 | } |
|
432 | 432 | var current_mode = this.code_mirror.getOption('mode', mode); |
|
433 | 433 | var first_line = this.code_mirror.getLine(0); |
|
434 | 434 | // loop on every pairs |
|
435 | 435 | for( var mode in modes) { |
|
436 | 436 | var regs = modes[mode]['reg']; |
|
437 | 437 | // only one key every time but regexp can't be keys... |
|
438 | 438 | for(var reg in regs ) { |
|
439 | 439 | // here we handle non magic_modes |
|
440 | 440 | if(first_line.match(regs[reg]) != null) { |
|
441 | 441 | if(current_mode == mode){ |
|
442 | 442 | return; |
|
443 | 443 | } |
|
444 | 444 | if (mode.search('magic_') != 0) { |
|
445 | 445 | this.code_mirror.setOption('mode', mode); |
|
446 | 446 | CodeMirror.autoLoadMode(this.code_mirror, mode); |
|
447 | 447 | return; |
|
448 | 448 | } |
|
449 | 449 | var open = modes[mode]['open']|| "%%"; |
|
450 | 450 | var close = modes[mode]['close']|| "%%end"; |
|
451 | 451 | var mmode = mode; |
|
452 | 452 | mode = mmode.substr(6); |
|
453 | 453 | if(current_mode == mode){ |
|
454 | 454 | return; |
|
455 | 455 | } |
|
456 | 456 | CodeMirror.autoLoadMode(this.code_mirror, mode); |
|
457 | 457 | // create on the fly a mode that swhitch between |
|
458 | 458 | // plain/text and smth else otherwise `%%` is |
|
459 | 459 | // source of some highlight issues. |
|
460 | 460 | // we use patchedGetMode to circumvent a bug in CM |
|
461 | 461 | CodeMirror.defineMode(mmode , function(config) { |
|
462 | 462 | return CodeMirror.multiplexingMode( |
|
463 | 463 | CodeMirror.patchedGetMode(config, 'text/plain'), |
|
464 | 464 | // always set someting on close |
|
465 | 465 | {open: open, close: close, |
|
466 | 466 | mode: CodeMirror.patchedGetMode(config, mode), |
|
467 | 467 | delimStyle: "delimit" |
|
468 | 468 | } |
|
469 | 469 | ); |
|
470 | 470 | }); |
|
471 | 471 | this.code_mirror.setOption('mode', mmode); |
|
472 | 472 | return; |
|
473 | 473 | } |
|
474 | 474 | } |
|
475 | 475 | } |
|
476 | 476 | // fallback on default |
|
477 | 477 | var default_mode |
|
478 | 478 | try { |
|
479 | 479 | default_mode = this._options.cm_config.mode; |
|
480 | 480 | } catch(e) { |
|
481 | 481 | default_mode = 'text/plain'; |
|
482 | 482 | } |
|
483 | 483 | if( current_mode === default_mode){ |
|
484 | 484 | return |
|
485 | 485 | } |
|
486 | 486 | this.code_mirror.setOption('mode', default_mode); |
|
487 | 487 | }; |
|
488 | 488 | |
|
489 | 489 | IPython.Cell = Cell; |
|
490 | 490 | |
|
491 | 491 | return IPython; |
|
492 | 492 | |
|
493 | 493 | }(IPython)); |
|
494 | 494 |
@@ -1,525 +1,525 b'' | |||
|
1 | 1 | //---------------------------------------------------------------------------- |
|
2 | 2 | // Copyright (C) 2008-2011 The IPython Development Team |
|
3 | 3 | // |
|
4 | 4 | // Distributed under the terms of the BSD License. The full license is in |
|
5 | 5 | // the file COPYING, distributed as part of this software. |
|
6 | 6 | //---------------------------------------------------------------------------- |
|
7 | 7 | |
|
8 | 8 | //============================================================================ |
|
9 | 9 | // CodeCell |
|
10 | 10 | //============================================================================ |
|
11 | 11 | /** |
|
12 | 12 | * An extendable module that provide base functionnality to create cell for notebook. |
|
13 | 13 | * @module IPython |
|
14 | 14 | * @namespace IPython |
|
15 | 15 | * @submodule CodeCell |
|
16 | 16 | */ |
|
17 | 17 | |
|
18 | 18 | |
|
19 | 19 | /* local util for codemirror */ |
|
20 | 20 | var posEq = function(a, b) {return a.line == b.line && a.ch == b.ch;}; |
|
21 | 21 | |
|
22 | 22 | /** |
|
23 | 23 | * |
|
24 | 24 | * function to delete until previous non blanking space character |
|
25 | 25 | * or first multiple of 4 tabstop. |
|
26 | 26 | * @private |
|
27 | 27 | */ |
|
28 | 28 | CodeMirror.commands.delSpaceToPrevTabStop = function(cm){ |
|
29 | 29 | var from = cm.getCursor(true), to = cm.getCursor(false), sel = !posEq(from, to); |
|
30 | 30 | if (!posEq(from, to)) { cm.replaceRange("", from, to); return; } |
|
31 | 31 | var cur = cm.getCursor(), line = cm.getLine(cur.line); |
|
32 | 32 | var tabsize = cm.getOption('tabSize'); |
|
33 | 33 | var chToPrevTabStop = cur.ch-(Math.ceil(cur.ch/tabsize)-1)*tabsize; |
|
34 | 34 | from = {ch:cur.ch-chToPrevTabStop,line:cur.line}; |
|
35 | 35 | var select = cm.getRange(from,cur); |
|
36 | 36 | if( select.match(/^\ +$/) !== null){ |
|
37 | 37 | cm.replaceRange("",from,cur); |
|
38 | 38 | } else { |
|
39 | 39 | cm.deleteH(-1,"char"); |
|
40 | 40 | } |
|
41 | 41 | }; |
|
42 | 42 | |
|
43 | 43 | |
|
44 | 44 | var IPython = (function (IPython) { |
|
45 | 45 | "use strict"; |
|
46 | 46 | |
|
47 | 47 | var utils = IPython.utils; |
|
48 | 48 | var key = IPython.utils.keycodes; |
|
49 | 49 | |
|
50 | 50 | /** |
|
51 | 51 | * A Cell conceived to write code. |
|
52 | 52 | * |
|
53 | 53 | * The kernel doesn't have to be set at creation time, in that case |
|
54 | 54 | * it will be null and set_kernel has to be called later. |
|
55 | 55 | * @class CodeCell |
|
56 | 56 | * @extends IPython.Cell |
|
57 | 57 | * |
|
58 | 58 | * @constructor |
|
59 | 59 | * @param {Object|null} kernel |
|
60 | 60 | * @param {object|undefined} [options] |
|
61 | 61 | * @param [options.cm_config] {object} config to pass to CodeMirror |
|
62 | 62 | */ |
|
63 | 63 | var CodeCell = function (kernel, options) { |
|
64 | 64 | this.kernel = kernel || null; |
|
65 | 65 | this.collapsed = false; |
|
66 | 66 | |
|
67 | 67 | // create all attributed in constructor function |
|
68 | 68 | // even if null for V8 VM optimisation |
|
69 | 69 | this.input_prompt_number = null; |
|
70 | 70 | this.celltoolbar = null; |
|
71 | 71 | this.output_area = null; |
|
72 | 72 | this.last_msg_id = null; |
|
73 | 73 | this.completer = null; |
|
74 | 74 | |
|
75 | 75 | |
|
76 | 76 | var cm_overwrite_options = { |
|
77 | 77 | onKeyEvent: $.proxy(this.handle_keyevent,this) |
|
78 | 78 | }; |
|
79 | 79 | |
|
80 | 80 | options = this.mergeopt(CodeCell, options, {cm_config:cm_overwrite_options}); |
|
81 | 81 | |
|
82 | 82 | IPython.Cell.apply(this,[options]); |
|
83 | 83 | |
|
84 | 84 | // Attributes we want to override in this subclass. |
|
85 | 85 | this.cell_type = "code"; |
|
86 | 86 | |
|
87 | 87 | var that = this; |
|
88 | 88 | this.element.focusout( |
|
89 | 89 | function() { that.auto_highlight(); } |
|
90 | 90 | ); |
|
91 | 91 | }; |
|
92 | 92 | |
|
93 | 93 | CodeCell.options_default = { |
|
94 | 94 | cm_config : { |
|
95 | 95 | extraKeys: { |
|
96 | 96 | "Tab" : "indentMore", |
|
97 | 97 | "Shift-Tab" : "indentLess", |
|
98 | 98 | "Backspace" : "delSpaceToPrevTabStop", |
|
99 | 99 | "Cmd-/" : "toggleComment", |
|
100 | 100 | "Ctrl-/" : "toggleComment" |
|
101 | 101 | }, |
|
102 | 102 | mode: 'ipython', |
|
103 | 103 | theme: 'ipython', |
|
104 | 104 | matchBrackets: true |
|
105 | 105 | } |
|
106 | 106 | }; |
|
107 | 107 | |
|
108 | 108 | |
|
109 | 109 | CodeCell.prototype = new IPython.Cell(); |
|
110 | 110 | |
|
111 | 111 | /** |
|
112 | 112 | * @method auto_highlight |
|
113 | 113 | */ |
|
114 | 114 | CodeCell.prototype.auto_highlight = function () { |
|
115 | 115 | this._auto_highlight(IPython.config.cell_magic_highlight); |
|
116 | 116 | }; |
|
117 | 117 | |
|
118 | 118 | /** @method create_element */ |
|
119 | 119 | CodeCell.prototype.create_element = function () { |
|
120 | 120 | IPython.Cell.prototype.create_element.apply(this, arguments); |
|
121 | 121 | |
|
122 | 122 | var cell = $('<div></div>').addClass('cell border-box-sizing code_cell'); |
|
123 | 123 | cell.attr('tabindex','2'); |
|
124 | 124 | |
|
125 | 125 | var input = $('<div></div>').addClass('input'); |
|
126 | 126 | var prompt = $('<div/>').addClass('prompt input_prompt'); |
|
127 | 127 | var inner_cell = $('<div/>').addClass('inner_cell'); |
|
128 | 128 | this.celltoolbar = new IPython.CellToolbar(this); |
|
129 | 129 | inner_cell.append(this.celltoolbar.element); |
|
130 | 130 | var input_area = $('<div/>').addClass('input_area'); |
|
131 | 131 | this.code_mirror = CodeMirror(input_area.get(0), this.cm_config); |
|
132 | 132 | $(this.code_mirror.getInputField()).attr("spellcheck", "false"); |
|
133 | 133 | inner_cell.append(input_area); |
|
134 | 134 | input.append(prompt).append(inner_cell); |
|
135 | 135 | var output = $('<div></div>'); |
|
136 | 136 | cell.append(input).append(output); |
|
137 | 137 | this.element = cell; |
|
138 | 138 | this.output_area = new IPython.OutputArea(output, true); |
|
139 | 139 | this.completer = new IPython.Completer(this); |
|
140 | 140 | }; |
|
141 | 141 | |
|
142 | 142 | /** @method bind_events */ |
|
143 | 143 | CodeCell.prototype.bind_events = function () { |
|
144 | 144 | IPython.Cell.prototype.bind_events.apply(this); |
|
145 | 145 | var that = this; |
|
146 | 146 | |
|
147 | 147 | this.element.focusout( |
|
148 | 148 | function() { that.auto_highlight(); } |
|
149 | 149 | ); |
|
150 | 150 | }; |
|
151 | 151 | |
|
152 | 152 | CodeCell.prototype.handle_keyevent = function (editor, event) { |
|
153 | 153 | |
|
154 | 154 | // console.log('CM', this.mode, event.which, event.type) |
|
155 | 155 | |
|
156 | 156 | if (this.mode === 'command') { |
|
157 | 157 | return true; |
|
158 | 158 | } else if (this.mode === 'edit') { |
|
159 | 159 | return this.handle_codemirror_keyevent(editor, event); |
|
160 | 160 | } |
|
161 | 161 | }; |
|
162 | 162 | |
|
163 | 163 | /** |
|
164 | 164 | * This method gets called in CodeMirror's onKeyDown/onKeyPress |
|
165 | 165 | * handlers and is used to provide custom key handling. Its return |
|
166 | 166 | * value is used to determine if CodeMirror should ignore the event: |
|
167 | 167 | * true = ignore, false = don't ignore. |
|
168 | 168 | * @method handle_codemirror_keyevent |
|
169 | 169 | */ |
|
170 | 170 | CodeCell.prototype.handle_codemirror_keyevent = function (editor, event) { |
|
171 | 171 | |
|
172 | 172 | var that = this; |
|
173 | 173 | // whatever key is pressed, first, cancel the tooltip request before |
|
174 | 174 | // they are sent, and remove tooltip if any, except for tab again |
|
175 | 175 | var tooltip_closed = null; |
|
176 | 176 | if (event.type === 'keydown' && event.which != key.TAB ) { |
|
177 | 177 | tooltip_closed = IPython.tooltip.remove_and_cancel_tooltip(); |
|
178 | 178 | } |
|
179 | 179 | |
|
180 | 180 | var cur = editor.getCursor(); |
|
181 | 181 | if (event.keyCode === key.ENTER){ |
|
182 | 182 | this.auto_highlight(); |
|
183 | 183 | } |
|
184 | 184 | |
|
185 | 185 | if (event.keyCode === key.ENTER && (event.shiftKey || event.ctrlKey || event.altKey)) { |
|
186 | 186 | // Always ignore shift-enter in CodeMirror as we handle it. |
|
187 | 187 | return true; |
|
188 | 188 | } else if (event.which === 40 && event.type === 'keypress' && IPython.tooltip.time_before_tooltip >= 0) { |
|
189 | 189 | // triger on keypress (!) otherwise inconsistent event.which depending on plateform |
|
190 | 190 | // browser and keyboard layout ! |
|
191 | 191 | // Pressing '(' , request tooltip, don't forget to reappend it |
|
192 | 192 | // The second argument says to hide the tooltip if the docstring |
|
193 | 193 | // is actually empty |
|
194 | 194 | IPython.tooltip.pending(that, true); |
|
195 | 195 | } else if (event.which === key.UPARROW && event.type === 'keydown') { |
|
196 | 196 | // If we are not at the top, let CM handle the up arrow and |
|
197 | 197 | // prevent the global keydown handler from handling it. |
|
198 | 198 | if (!that.at_top()) { |
|
199 | 199 | event.stop(); |
|
200 | 200 | return false; |
|
201 | 201 | } else { |
|
202 | 202 | return true; |
|
203 | 203 | } |
|
204 | 204 | } else if (event.which === key.ESC && event.type === 'keydown') { |
|
205 | 205 | // First see if the tooltip is active and if so cancel it. |
|
206 | 206 | if (tooltip_closed) { |
|
207 | 207 | // The call to remove_and_cancel_tooltip above in L177 doesn't pass |
|
208 | 208 | // force=true. Because of this it won't actually close the tooltip |
|
209 | 209 | // if it is in sticky mode. Thus, we have to check again if it is open |
|
210 | 210 | // and close it with force=true. |
|
211 | 211 | if (!IPython.tooltip._hidden) { |
|
212 | 212 | IPython.tooltip.remove_and_cancel_tooltip(true); |
|
213 | 213 | } |
|
214 | 214 | // If we closed the tooltip, don't let CM or the global handlers |
|
215 | 215 | // handle this event. |
|
216 | 216 | event.stop(); |
|
217 | 217 | return true; |
|
218 | 218 | } |
|
219 | 219 | if (that.code_mirror.options.keyMap === "vim-insert") { |
|
220 | 220 | // vim keyMap is active and in insert mode. In this case we leave vim |
|
221 | 221 | // insert mode, but remain in notebook edit mode. |
|
222 | 222 | // Let' CM handle this event and prevent global handling. |
|
223 | 223 | event.stop(); |
|
224 | 224 | return false; |
|
225 | 225 | } else { |
|
226 | 226 | // vim keyMap is not active. Leave notebook edit mode. |
|
227 | 227 | // Don't let CM handle the event, defer to global handling. |
|
228 | 228 | return true; |
|
229 | 229 | } |
|
230 | 230 | } else if (event.which === key.DOWNARROW && event.type === 'keydown') { |
|
231 | 231 | // If we are not at the bottom, let CM handle the down arrow and |
|
232 | 232 | // prevent the global keydown handler from handling it. |
|
233 | 233 | if (!that.at_bottom()) { |
|
234 | 234 | event.stop(); |
|
235 | 235 | return false; |
|
236 | 236 | } else { |
|
237 | 237 | return true; |
|
238 | 238 | } |
|
239 | 239 | } else if (event.keyCode === key.TAB && event.type === 'keydown' && event.shiftKey) { |
|
240 | 240 | if (editor.somethingSelected()){ |
|
241 | 241 | var anchor = editor.getCursor("anchor"); |
|
242 | 242 | var head = editor.getCursor("head"); |
|
243 | 243 | if( anchor.line != head.line){ |
|
244 | 244 | return false; |
|
245 | 245 | } |
|
246 | 246 | } |
|
247 | 247 | IPython.tooltip.request(that); |
|
248 | 248 | event.stop(); |
|
249 | 249 | return true; |
|
250 | 250 | } else if (event.keyCode === key.TAB && event.type == 'keydown') { |
|
251 | 251 | // Tab completion. |
|
252 | 252 | IPython.tooltip.remove_and_cancel_tooltip(); |
|
253 | 253 | if (editor.somethingSelected()) { |
|
254 | 254 | return false; |
|
255 | 255 | } |
|
256 | 256 | var pre_cursor = editor.getRange({line:cur.line,ch:0},cur); |
|
257 | 257 | if (pre_cursor.trim() === "") { |
|
258 | 258 | // Don't autocomplete if the part of the line before the cursor |
|
259 | 259 | // is empty. In this case, let CodeMirror handle indentation. |
|
260 | 260 | return false; |
|
261 | 261 | } else { |
|
262 | 262 | event.stop(); |
|
263 | 263 | this.completer.startCompletion(); |
|
264 | 264 | return true; |
|
265 | 265 | } |
|
266 | 266 | } else { |
|
267 | 267 | // keypress/keyup also trigger on TAB press, and we don't want to |
|
268 | 268 | // use those to disable tab completion. |
|
269 | 269 | return false; |
|
270 | 270 | } |
|
271 | 271 | return false; |
|
272 | 272 | }; |
|
273 | 273 | |
|
274 | 274 | // Kernel related calls. |
|
275 | 275 | |
|
276 | 276 | CodeCell.prototype.set_kernel = function (kernel) { |
|
277 | 277 | this.kernel = kernel; |
|
278 | 278 | }; |
|
279 | 279 | |
|
280 | 280 | /** |
|
281 | 281 | * Execute current code cell to the kernel |
|
282 | 282 | * @method execute |
|
283 | 283 | */ |
|
284 | 284 | CodeCell.prototype.execute = function () { |
|
285 | 285 | this.output_area.clear_output(); |
|
286 | 286 | this.set_input_prompt('*'); |
|
287 | 287 | this.element.addClass("running"); |
|
288 | 288 | if (this.last_msg_id) { |
|
289 | 289 | this.kernel.clear_callbacks_for_msg(this.last_msg_id); |
|
290 | 290 | } |
|
291 | 291 | var callbacks = this.get_callbacks(); |
|
292 | 292 | |
|
293 | 293 | this.last_msg_id = this.kernel.execute(this.get_text(), callbacks, {silent: false, store_history: true}); |
|
294 | 294 | }; |
|
295 | 295 | |
|
296 | 296 | /** |
|
297 | 297 | * Construct the default callbacks for |
|
298 | 298 | * @method get_callbacks |
|
299 | 299 | */ |
|
300 | 300 | CodeCell.prototype.get_callbacks = function () { |
|
301 | 301 | return { |
|
302 | 302 | shell : { |
|
303 | 303 | reply : $.proxy(this._handle_execute_reply, this), |
|
304 | 304 | payload : { |
|
305 | 305 | set_next_input : $.proxy(this._handle_set_next_input, this), |
|
306 | 306 | page : $.proxy(this._open_with_pager, this) |
|
307 | 307 | } |
|
308 | 308 | }, |
|
309 | 309 | iopub : { |
|
310 | 310 | output : $.proxy(this.output_area.handle_output, this.output_area), |
|
311 | 311 | clear_output : $.proxy(this.output_area.handle_clear_output, this.output_area), |
|
312 | 312 | }, |
|
313 | 313 | input : $.proxy(this._handle_input_request, this) |
|
314 | 314 | }; |
|
315 | 315 | }; |
|
316 | 316 | |
|
317 | 317 | CodeCell.prototype._open_with_pager = function (payload) { |
|
318 | 318 | $([IPython.events]).trigger('open_with_text.Pager', payload); |
|
319 | 319 | }; |
|
320 | 320 | |
|
321 | 321 | /** |
|
322 | 322 | * @method _handle_execute_reply |
|
323 | 323 | * @private |
|
324 | 324 | */ |
|
325 | 325 | CodeCell.prototype._handle_execute_reply = function (msg) { |
|
326 | 326 | this.set_input_prompt(msg.content.execution_count); |
|
327 | 327 | this.element.removeClass("running"); |
|
328 | 328 | $([IPython.events]).trigger('set_dirty.Notebook', {value: true}); |
|
329 | 329 | }; |
|
330 | 330 | |
|
331 | 331 | /** |
|
332 | 332 | * @method _handle_set_next_input |
|
333 | 333 | * @private |
|
334 | 334 | */ |
|
335 | 335 | CodeCell.prototype._handle_set_next_input = function (payload) { |
|
336 | 336 | var data = {'cell': this, 'text': payload.text}; |
|
337 | 337 | $([IPython.events]).trigger('set_next_input.Notebook', data); |
|
338 | 338 | }; |
|
339 | 339 | |
|
340 | 340 | /** |
|
341 | 341 | * @method _handle_input_request |
|
342 | 342 | * @private |
|
343 | 343 | */ |
|
344 | 344 | CodeCell.prototype._handle_input_request = function (msg) { |
|
345 | 345 | this.output_area.append_raw_input(msg); |
|
346 | 346 | }; |
|
347 | 347 | |
|
348 | 348 | |
|
349 | 349 | // Basic cell manipulation. |
|
350 | 350 | |
|
351 | 351 | CodeCell.prototype.select = function () { |
|
352 | 352 | var cont = IPython.Cell.prototype.select.apply(this); |
|
353 | 353 | if (cont) { |
|
354 | 354 | this.code_mirror.refresh(); |
|
355 | 355 | this.auto_highlight(); |
|
356 |
} |
|
|
356 | } | |
|
357 | 357 | return cont; |
|
358 | 358 | }; |
|
359 | 359 | |
|
360 | 360 | CodeCell.prototype.render = function () { |
|
361 | 361 | var cont = IPython.Cell.prototype.render.apply(this); |
|
362 | 362 | // Always execute, even if we are already in the rendered state |
|
363 | 363 | return cont; |
|
364 | 364 | }; |
|
365 | 365 | |
|
366 | 366 | CodeCell.prototype.unrender = function () { |
|
367 | 367 | // CodeCell is always rendered |
|
368 | 368 | return false; |
|
369 | 369 | }; |
|
370 | 370 | |
|
371 | 371 | CodeCell.prototype.edit_mode = function () { |
|
372 | 372 | var cont = IPython.Cell.prototype.edit_mode.apply(this); |
|
373 | 373 | if (cont) { |
|
374 | 374 | this.focus_editor(); |
|
375 |
} |
|
|
375 | } | |
|
376 | 376 | return cont; |
|
377 | 377 | } |
|
378 | 378 | |
|
379 | 379 | CodeCell.prototype.select_all = function () { |
|
380 | 380 | var start = {line: 0, ch: 0}; |
|
381 | 381 | var nlines = this.code_mirror.lineCount(); |
|
382 | 382 | var last_line = this.code_mirror.getLine(nlines-1); |
|
383 | 383 | var end = {line: nlines-1, ch: last_line.length}; |
|
384 | 384 | this.code_mirror.setSelection(start, end); |
|
385 | 385 | }; |
|
386 | 386 | |
|
387 | 387 | |
|
388 | 388 | CodeCell.prototype.collapse = function () { |
|
389 | 389 | this.collapsed = true; |
|
390 | 390 | this.output_area.collapse(); |
|
391 | 391 | }; |
|
392 | 392 | |
|
393 | 393 | |
|
394 | 394 | CodeCell.prototype.expand = function () { |
|
395 | 395 | this.collapsed = false; |
|
396 | 396 | this.output_area.expand(); |
|
397 | 397 | }; |
|
398 | 398 | |
|
399 | 399 | |
|
400 | 400 | CodeCell.prototype.toggle_output = function () { |
|
401 | 401 | this.collapsed = Boolean(1 - this.collapsed); |
|
402 | 402 | this.output_area.toggle_output(); |
|
403 | 403 | }; |
|
404 | 404 | |
|
405 | 405 | |
|
406 | 406 | CodeCell.prototype.toggle_output_scroll = function () { |
|
407 | 407 | this.output_area.toggle_scroll(); |
|
408 | 408 | }; |
|
409 | 409 | |
|
410 | 410 | |
|
411 | 411 | CodeCell.input_prompt_classical = function (prompt_value, lines_number) { |
|
412 | 412 | var ns = prompt_value || " "; |
|
413 | 413 | return 'In [' + ns + ']:'; |
|
414 | 414 | }; |
|
415 | 415 | |
|
416 | 416 | CodeCell.input_prompt_continuation = function (prompt_value, lines_number) { |
|
417 | 417 | var html = [CodeCell.input_prompt_classical(prompt_value, lines_number)]; |
|
418 | 418 | for(var i=1; i < lines_number; i++) { |
|
419 | 419 | html.push(['...:']); |
|
420 | 420 | } |
|
421 | 421 | return html.join('<br/>'); |
|
422 | 422 | }; |
|
423 | 423 | |
|
424 | 424 | CodeCell.input_prompt_function = CodeCell.input_prompt_classical; |
|
425 | 425 | |
|
426 | 426 | |
|
427 | 427 | CodeCell.prototype.set_input_prompt = function (number) { |
|
428 | 428 | var nline = 1; |
|
429 | 429 | if (this.code_mirror !== undefined) { |
|
430 | 430 | nline = this.code_mirror.lineCount(); |
|
431 | 431 | } |
|
432 | 432 | this.input_prompt_number = number; |
|
433 | 433 | var prompt_html = CodeCell.input_prompt_function(this.input_prompt_number, nline); |
|
434 | 434 | this.element.find('div.input_prompt').html(prompt_html); |
|
435 | 435 | }; |
|
436 | 436 | |
|
437 | 437 | |
|
438 | 438 | CodeCell.prototype.clear_input = function () { |
|
439 | 439 | this.code_mirror.setValue(''); |
|
440 | 440 | }; |
|
441 | 441 | |
|
442 | 442 | |
|
443 | 443 | CodeCell.prototype.get_text = function () { |
|
444 | 444 | return this.code_mirror.getValue(); |
|
445 | 445 | }; |
|
446 | 446 | |
|
447 | 447 | |
|
448 | 448 | CodeCell.prototype.set_text = function (code) { |
|
449 | 449 | return this.code_mirror.setValue(code); |
|
450 | 450 | }; |
|
451 | 451 | |
|
452 | 452 | |
|
453 | 453 | CodeCell.prototype.at_top = function () { |
|
454 | 454 | var cursor = this.code_mirror.getCursor(); |
|
455 | 455 | if (cursor.line === 0 && cursor.ch === 0) { |
|
456 | 456 | return true; |
|
457 | 457 | } else { |
|
458 | 458 | return false; |
|
459 | 459 | } |
|
460 | 460 | }; |
|
461 | 461 | |
|
462 | 462 | |
|
463 | 463 | CodeCell.prototype.at_bottom = function () { |
|
464 | 464 | var cursor = this.code_mirror.getCursor(); |
|
465 | 465 | if (cursor.line === (this.code_mirror.lineCount()-1) && cursor.ch === this.code_mirror.getLine(cursor.line).length) { |
|
466 | 466 | return true; |
|
467 | 467 | } else { |
|
468 | 468 | return false; |
|
469 | 469 | } |
|
470 | 470 | }; |
|
471 | 471 | |
|
472 | 472 | |
|
473 | 473 | CodeCell.prototype.clear_output = function (wait) { |
|
474 | 474 | this.output_area.clear_output(wait); |
|
475 | 475 | }; |
|
476 | 476 | |
|
477 | 477 | |
|
478 | 478 | // JSON serialization |
|
479 | 479 | |
|
480 | 480 | CodeCell.prototype.fromJSON = function (data) { |
|
481 | 481 | IPython.Cell.prototype.fromJSON.apply(this, arguments); |
|
482 | 482 | if (data.cell_type === 'code') { |
|
483 | 483 | if (data.input !== undefined) { |
|
484 | 484 | this.set_text(data.input); |
|
485 | 485 | // make this value the starting point, so that we can only undo |
|
486 | 486 | // to this state, instead of a blank cell |
|
487 | 487 | this.code_mirror.clearHistory(); |
|
488 | 488 | this.auto_highlight(); |
|
489 | 489 | } |
|
490 | 490 | if (data.prompt_number !== undefined) { |
|
491 | 491 | this.set_input_prompt(data.prompt_number); |
|
492 | 492 | } else { |
|
493 | 493 | this.set_input_prompt(); |
|
494 | 494 | } |
|
495 | 495 | this.output_area.fromJSON(data.outputs); |
|
496 | 496 | if (data.collapsed !== undefined) { |
|
497 | 497 | if (data.collapsed) { |
|
498 | 498 | this.collapse(); |
|
499 | 499 | } else { |
|
500 | 500 | this.expand(); |
|
501 | 501 | } |
|
502 | 502 | } |
|
503 | 503 | } |
|
504 | 504 | }; |
|
505 | 505 | |
|
506 | 506 | |
|
507 | 507 | CodeCell.prototype.toJSON = function () { |
|
508 | 508 | var data = IPython.Cell.prototype.toJSON.apply(this); |
|
509 | 509 | data.input = this.get_text(); |
|
510 | 510 | // is finite protect against undefined and '*' value |
|
511 | 511 | if (isFinite(this.input_prompt_number)) { |
|
512 | 512 | data.prompt_number = this.input_prompt_number; |
|
513 | 513 | } |
|
514 | 514 | var outputs = this.output_area.toJSON(); |
|
515 | 515 | data.outputs = outputs; |
|
516 | 516 | data.language = 'python'; |
|
517 | 517 | data.collapsed = this.collapsed; |
|
518 | 518 | return data; |
|
519 | 519 | }; |
|
520 | 520 | |
|
521 | 521 | |
|
522 | 522 | IPython.CodeCell = CodeCell; |
|
523 | 523 | |
|
524 | 524 | return IPython; |
|
525 | 525 | }(IPython)); |
General Comments 0
You need to be logged in to leave comments.
Login now