Show More
@@ -1,690 +1,691 b'' | |||
|
1 | 1 | //---------------------------------------------------------------------------- |
|
2 | 2 | // Copyright (C) 2008 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 | // OutputArea |
|
10 | 10 | //============================================================================ |
|
11 | 11 | |
|
12 | 12 | /** |
|
13 | 13 | * @module IPython |
|
14 | 14 | * @namespace IPython |
|
15 | 15 | * @submodule OutputArea |
|
16 | 16 | */ |
|
17 | 17 | var IPython = (function (IPython) { |
|
18 | 18 | "use strict"; |
|
19 | 19 | |
|
20 | 20 | var utils = IPython.utils; |
|
21 | 21 | |
|
22 | 22 | /** |
|
23 | 23 | * @class OutputArea |
|
24 | 24 | * |
|
25 | 25 | * @constructor |
|
26 | 26 | */ |
|
27 | 27 | |
|
28 | 28 | var OutputArea = function (selector, prompt_area) { |
|
29 | 29 | this.selector = selector; |
|
30 | 30 | this.wrapper = $(selector); |
|
31 | 31 | this.outputs = []; |
|
32 | 32 | this.collapsed = false; |
|
33 | 33 | this.scrolled = false; |
|
34 | 34 | this.clear_out_timeout = null; |
|
35 | 35 | if (prompt_area === undefined) { |
|
36 | 36 | this.prompt_area = true; |
|
37 | 37 | } else { |
|
38 | 38 | this.prompt_area = prompt_area; |
|
39 | 39 | } |
|
40 | 40 | this.create_elements(); |
|
41 | 41 | this.style(); |
|
42 | 42 | this.bind_events(); |
|
43 | 43 | }; |
|
44 | 44 | |
|
45 | 45 | OutputArea.prototype.create_elements = function () { |
|
46 | 46 | this.element = $("<div/>"); |
|
47 | 47 | this.collapse_button = $("<div/>"); |
|
48 | 48 | this.prompt_overlay = $("<div/>"); |
|
49 | 49 | this.wrapper.append(this.prompt_overlay); |
|
50 | 50 | this.wrapper.append(this.element); |
|
51 | 51 | this.wrapper.append(this.collapse_button); |
|
52 | 52 | }; |
|
53 | 53 | |
|
54 | 54 | |
|
55 | 55 | OutputArea.prototype.style = function () { |
|
56 | 56 | this.collapse_button.hide(); |
|
57 | 57 | this.prompt_overlay.hide(); |
|
58 | 58 | |
|
59 | 59 | this.wrapper.addClass('output_wrapper'); |
|
60 | 60 | this.element.addClass('output vbox'); |
|
61 | 61 | |
|
62 | 62 | this.collapse_button.button(); |
|
63 | 63 | this.collapse_button.addClass('output_collapsed vbox'); |
|
64 | 64 | this.collapse_button.attr('title', 'click to expand output'); |
|
65 | 65 | this.collapse_button.html('. . .'); |
|
66 | 66 | |
|
67 | 67 | this.prompt_overlay.addClass('out_prompt_overlay prompt'); |
|
68 | 68 | this.prompt_overlay.attr('title', 'click to expand output; double click to hide output'); |
|
69 | 69 | |
|
70 | 70 | this.collapse(); |
|
71 | 71 | }; |
|
72 | 72 | |
|
73 | 73 | /** |
|
74 | 74 | * Should the OutputArea scroll? |
|
75 | 75 | * Returns whether the height (in lines) exceeds a threshold. |
|
76 | 76 | * |
|
77 | 77 | * @private |
|
78 | 78 | * @method _should_scroll |
|
79 | 79 | * @param [lines=100]{Integer} |
|
80 | 80 | * @return {Bool} |
|
81 | 81 | * |
|
82 | 82 | */ |
|
83 | 83 | OutputArea.prototype._should_scroll = function (lines) { |
|
84 | 84 | if (lines <=0 ){ return } |
|
85 | 85 | if (!lines) { |
|
86 | 86 | lines = 100; |
|
87 | 87 | } |
|
88 | 88 | // line-height from http://stackoverflow.com/questions/1185151 |
|
89 | 89 | var fontSize = this.element.css('font-size'); |
|
90 | 90 | var lineHeight = Math.floor(parseInt(fontSize.replace('px','')) * 1.5); |
|
91 | 91 | |
|
92 | 92 | return (this.element.height() > lines * lineHeight); |
|
93 | 93 | }; |
|
94 | 94 | |
|
95 | 95 | |
|
96 | 96 | OutputArea.prototype.bind_events = function () { |
|
97 | 97 | var that = this; |
|
98 | 98 | this.prompt_overlay.dblclick(function () { that.toggle_output(); }); |
|
99 | 99 | this.prompt_overlay.click(function () { that.toggle_scroll(); }); |
|
100 | 100 | |
|
101 | 101 | this.element.resize(function () { |
|
102 | 102 | // FIXME: Firefox on Linux misbehaves, so automatic scrolling is disabled |
|
103 | 103 | if ( IPython.utils.browser[0] === "Firefox" ) { |
|
104 | 104 | return; |
|
105 | 105 | } |
|
106 | 106 | // maybe scroll output, |
|
107 | 107 | // if it's grown large enough and hasn't already been scrolled. |
|
108 | 108 | if ( !that.scrolled && that._should_scroll(OutputArea.auto_scroll_threshold)) { |
|
109 | 109 | that.scroll_area(); |
|
110 | 110 | } |
|
111 | 111 | }); |
|
112 | 112 | this.collapse_button.click(function () { |
|
113 | 113 | that.expand(); |
|
114 | 114 | }); |
|
115 | 115 | this.collapse_button.hover(function () { |
|
116 | 116 | $(this).addClass("ui-state-hover"); |
|
117 | 117 | }, function () { |
|
118 | 118 | $(this).removeClass("ui-state-hover"); |
|
119 | 119 | }); |
|
120 | 120 | }; |
|
121 | 121 | |
|
122 | 122 | |
|
123 | 123 | OutputArea.prototype.collapse = function () { |
|
124 | 124 | if (!this.collapsed) { |
|
125 | 125 | this.element.hide(); |
|
126 | 126 | this.prompt_overlay.hide(); |
|
127 | 127 | if (this.element.html()){ |
|
128 | 128 | this.collapse_button.show(); |
|
129 | 129 | } |
|
130 | 130 | this.collapsed = true; |
|
131 | 131 | } |
|
132 | 132 | }; |
|
133 | 133 | |
|
134 | 134 | |
|
135 | 135 | OutputArea.prototype.expand = function () { |
|
136 | 136 | if (this.collapsed) { |
|
137 | 137 | this.collapse_button.hide(); |
|
138 | 138 | this.element.show(); |
|
139 | 139 | this.prompt_overlay.show(); |
|
140 | 140 | this.collapsed = false; |
|
141 | 141 | } |
|
142 | 142 | }; |
|
143 | 143 | |
|
144 | 144 | |
|
145 | 145 | OutputArea.prototype.toggle_output = function () { |
|
146 | 146 | if (this.collapsed) { |
|
147 | 147 | this.expand(); |
|
148 | 148 | } else { |
|
149 | 149 | this.collapse(); |
|
150 | 150 | } |
|
151 | 151 | }; |
|
152 | 152 | |
|
153 | 153 | |
|
154 | 154 | OutputArea.prototype.scroll_area = function () { |
|
155 | 155 | this.element.addClass('output_scroll'); |
|
156 | 156 | this.prompt_overlay.attr('title', 'click to unscroll output; double click to hide'); |
|
157 | 157 | this.scrolled = true; |
|
158 | 158 | }; |
|
159 | 159 | |
|
160 | 160 | |
|
161 | 161 | OutputArea.prototype.unscroll_area = function () { |
|
162 | 162 | this.element.removeClass('output_scroll'); |
|
163 | 163 | this.prompt_overlay.attr('title', 'click to scroll output; double click to hide'); |
|
164 | 164 | this.scrolled = false; |
|
165 | 165 | }; |
|
166 | 166 | |
|
167 | 167 | /** |
|
168 | 168 | * Threshold to trigger autoscroll when the OutputArea is resized, |
|
169 | 169 | * typically when new outputs are added. |
|
170 | 170 | * |
|
171 | 171 | * Behavior is undefined if autoscroll is lower than minimum_scroll_threshold, |
|
172 | 172 | * unless it is < 0, in which case autoscroll will never be triggered |
|
173 | 173 | * |
|
174 | 174 | * @property auto_scroll_threshold |
|
175 | 175 | * @type Number |
|
176 | 176 | * @default 20 |
|
177 | 177 | * |
|
178 | 178 | **/ |
|
179 | 179 | OutputArea.auto_scroll_threshold = 20; |
|
180 | 180 | |
|
181 | 181 | |
|
182 | 182 | /** |
|
183 | 183 | * Lower limit (in lines) for OutputArea to be made scrollable. OutputAreas |
|
184 | 184 | * shorter than this are never scrolled. |
|
185 | 185 | * |
|
186 | 186 | * @property minimum_scroll_threshold |
|
187 | 187 | * @type Number |
|
188 | 188 | * @default 20 |
|
189 | 189 | * |
|
190 | 190 | **/ |
|
191 | 191 | OutputArea.minimum_scroll_threshold = 20; |
|
192 | 192 | |
|
193 | 193 | |
|
194 | 194 | /** |
|
195 | 195 | * |
|
196 | 196 | * Scroll OutputArea if height supperior than a threshold (in lines). |
|
197 | 197 | * |
|
198 | 198 | * Threshold is a maximum number of lines. If unspecified, defaults to |
|
199 | 199 | * OutputArea.minimum_scroll_threshold. |
|
200 | 200 | * |
|
201 |
* Negative |
|
|
202 | * scrolling | |
|
201 | * Negative threshold will prevent the OutputArea from ever scrolling. | |
|
203 | 202 | * |
|
204 | 203 | * @method scroll_if_long |
|
205 | * @param [lines=OutputArea.minimum_scroll_threshold]{Number} Default to `OutputArea.minimum_scroll_threshold` | |
|
204 | * | |
|
205 | * @param [lines=20]{Number} Default to 20 if not set, | |
|
206 | * behavior undefined for value of `0`. | |
|
206 | 207 | * |
|
207 | 208 | **/ |
|
208 | 209 | OutputArea.prototype.scroll_if_long = function (lines) { |
|
209 | 210 | var n = lines | OutputArea.minimum_scroll_threshold; |
|
210 | 211 | if(n <= 0){ |
|
211 | 212 | return |
|
212 | 213 | } |
|
213 | 214 | |
|
214 | 215 | if (this._should_scroll(n)) { |
|
215 | 216 | // only allow scrolling long-enough output |
|
216 | 217 | this.scroll_area(); |
|
217 | 218 | } |
|
218 | 219 | }; |
|
219 | 220 | |
|
220 | 221 | |
|
221 | 222 | OutputArea.prototype.toggle_scroll = function () { |
|
222 | 223 | if (this.scrolled) { |
|
223 | 224 | this.unscroll_area(); |
|
224 | 225 | } else { |
|
225 | 226 | // only allow scrolling long-enough output |
|
226 | 227 | this.scroll_if_long(); |
|
227 | 228 | } |
|
228 | 229 | }; |
|
229 | 230 | |
|
230 | 231 | |
|
231 | 232 | // typeset with MathJax if MathJax is available |
|
232 | 233 | OutputArea.prototype.typeset = function () { |
|
233 | 234 | if (window.MathJax){ |
|
234 | 235 | MathJax.Hub.Queue(["Typeset",MathJax.Hub]); |
|
235 | 236 | } |
|
236 | 237 | }; |
|
237 | 238 | |
|
238 | 239 | |
|
239 | 240 | OutputArea.prototype.handle_output = function (msg_type, content) { |
|
240 | 241 | var json = {}; |
|
241 | 242 | json.output_type = msg_type; |
|
242 | 243 | if (msg_type === "stream") { |
|
243 | 244 | json.text = content.data; |
|
244 | 245 | json.stream = content.name; |
|
245 | 246 | } else if (msg_type === "display_data") { |
|
246 | 247 | json = this.convert_mime_types(json, content.data); |
|
247 | 248 | json.metadata = this.convert_mime_types({}, content.metadata); |
|
248 | 249 | } else if (msg_type === "pyout") { |
|
249 | 250 | json.prompt_number = content.execution_count; |
|
250 | 251 | json = this.convert_mime_types(json, content.data); |
|
251 | 252 | json.metadata = this.convert_mime_types({}, content.metadata); |
|
252 | 253 | } else if (msg_type === "pyerr") { |
|
253 | 254 | json.ename = content.ename; |
|
254 | 255 | json.evalue = content.evalue; |
|
255 | 256 | json.traceback = content.traceback; |
|
256 | 257 | } |
|
257 | 258 | // append with dynamic=true |
|
258 | 259 | this.append_output(json, true); |
|
259 | 260 | }; |
|
260 | 261 | |
|
261 | 262 | |
|
262 | 263 | OutputArea.prototype.convert_mime_types = function (json, data) { |
|
263 | 264 | if (data['text/plain'] !== undefined) { |
|
264 | 265 | json.text = data['text/plain']; |
|
265 | 266 | } |
|
266 | 267 | if (data['text/html'] !== undefined) { |
|
267 | 268 | json.html = data['text/html']; |
|
268 | 269 | } |
|
269 | 270 | if (data['image/svg+xml'] !== undefined) { |
|
270 | 271 | json.svg = data['image/svg+xml']; |
|
271 | 272 | } |
|
272 | 273 | if (data['image/png'] !== undefined) { |
|
273 | 274 | json.png = data['image/png']; |
|
274 | 275 | } |
|
275 | 276 | if (data['image/jpeg'] !== undefined) { |
|
276 | 277 | json.jpeg = data['image/jpeg']; |
|
277 | 278 | } |
|
278 | 279 | if (data['text/latex'] !== undefined) { |
|
279 | 280 | json.latex = data['text/latex']; |
|
280 | 281 | } |
|
281 | 282 | if (data['application/json'] !== undefined) { |
|
282 | 283 | json.json = data['application/json']; |
|
283 | 284 | } |
|
284 | 285 | if (data['application/javascript'] !== undefined) { |
|
285 | 286 | json.javascript = data['application/javascript']; |
|
286 | 287 | } |
|
287 | 288 | return json; |
|
288 | 289 | }; |
|
289 | 290 | |
|
290 | 291 | |
|
291 | 292 | OutputArea.prototype.append_output = function (json, dynamic) { |
|
292 | 293 | // If dynamic is true, javascript output will be eval'd. |
|
293 | 294 | this.expand(); |
|
294 | 295 | this.flush_clear_timeout(); |
|
295 | 296 | if (json.output_type === 'pyout') { |
|
296 | 297 | this.append_pyout(json, dynamic); |
|
297 | 298 | } else if (json.output_type === 'pyerr') { |
|
298 | 299 | this.append_pyerr(json); |
|
299 | 300 | } else if (json.output_type === 'display_data') { |
|
300 | 301 | this.append_display_data(json, dynamic); |
|
301 | 302 | } else if (json.output_type === 'stream') { |
|
302 | 303 | this.append_stream(json); |
|
303 | 304 | } |
|
304 | 305 | this.outputs.push(json); |
|
305 | 306 | var that = this; |
|
306 | 307 | setTimeout(function(){that.element.trigger('resize');}, 100); |
|
307 | 308 | }; |
|
308 | 309 | |
|
309 | 310 | |
|
310 | 311 | OutputArea.prototype.create_output_area = function () { |
|
311 | 312 | var oa = $("<div/>").addClass("output_area"); |
|
312 | 313 | if (this.prompt_area) { |
|
313 | 314 | oa.append($('<div/>').addClass('prompt')); |
|
314 | 315 | } |
|
315 | 316 | return oa; |
|
316 | 317 | }; |
|
317 | 318 | |
|
318 | 319 | |
|
319 | 320 | OutputArea.prototype.append_pyout = function (json, dynamic) { |
|
320 | 321 | var n = json.prompt_number || ' '; |
|
321 | 322 | var toinsert = this.create_output_area(); |
|
322 | 323 | if (this.prompt_area) { |
|
323 | 324 | toinsert.find('div.prompt').addClass('output_prompt').html('Out[' + n + ']:'); |
|
324 | 325 | } |
|
325 | 326 | this.append_mime_type(json, toinsert, dynamic); |
|
326 | 327 | this.element.append(toinsert); |
|
327 | 328 | // If we just output latex, typeset it. |
|
328 | 329 | if ((json.latex !== undefined) || (json.html !== undefined)) { |
|
329 | 330 | this.typeset(); |
|
330 | 331 | } |
|
331 | 332 | }; |
|
332 | 333 | |
|
333 | 334 | |
|
334 | 335 | OutputArea.prototype.append_pyerr = function (json) { |
|
335 | 336 | var tb = json.traceback; |
|
336 | 337 | if (tb !== undefined && tb.length > 0) { |
|
337 | 338 | var s = ''; |
|
338 | 339 | var len = tb.length; |
|
339 | 340 | for (var i=0; i<len; i++) { |
|
340 | 341 | s = s + tb[i] + '\n'; |
|
341 | 342 | } |
|
342 | 343 | s = s + '\n'; |
|
343 | 344 | var toinsert = this.create_output_area(); |
|
344 | 345 | this.append_text(s, {}, toinsert); |
|
345 | 346 | this.element.append(toinsert); |
|
346 | 347 | } |
|
347 | 348 | }; |
|
348 | 349 | |
|
349 | 350 | |
|
350 | 351 | OutputArea.prototype.append_stream = function (json) { |
|
351 | 352 | // temporary fix: if stream undefined (json file written prior to this patch), |
|
352 | 353 | // default to most likely stdout: |
|
353 | 354 | if (json.stream == undefined){ |
|
354 | 355 | json.stream = 'stdout'; |
|
355 | 356 | } |
|
356 | 357 | var text = json.text; |
|
357 | 358 | var subclass = "output_"+json.stream; |
|
358 | 359 | if (this.outputs.length > 0){ |
|
359 | 360 | // have at least one output to consider |
|
360 | 361 | var last = this.outputs[this.outputs.length-1]; |
|
361 | 362 | if (last.output_type == 'stream' && json.stream == last.stream){ |
|
362 | 363 | // latest output was in the same stream, |
|
363 | 364 | // so append directly into its pre tag |
|
364 | 365 | // escape ANSI & HTML specials: |
|
365 | 366 | var pre = this.element.find('div.'+subclass).last().find('pre'); |
|
366 | 367 | var html = utils.fixCarriageReturn( |
|
367 | 368 | pre.html() + utils.fixConsole(text)); |
|
368 | 369 | pre.html(html); |
|
369 | 370 | return; |
|
370 | 371 | } |
|
371 | 372 | } |
|
372 | 373 | |
|
373 | 374 | if (!text.replace("\r", "")) { |
|
374 | 375 | // text is nothing (empty string, \r, etc.) |
|
375 | 376 | // so don't append any elements, which might add undesirable space |
|
376 | 377 | return; |
|
377 | 378 | } |
|
378 | 379 | |
|
379 | 380 | // If we got here, attach a new div |
|
380 | 381 | var toinsert = this.create_output_area(); |
|
381 | 382 | this.append_text(text, {}, toinsert, "output_stream "+subclass); |
|
382 | 383 | this.element.append(toinsert); |
|
383 | 384 | }; |
|
384 | 385 | |
|
385 | 386 | |
|
386 | 387 | OutputArea.prototype.append_display_data = function (json, dynamic) { |
|
387 | 388 | var toinsert = this.create_output_area(); |
|
388 | 389 | this.append_mime_type(json, toinsert, dynamic); |
|
389 | 390 | this.element.append(toinsert); |
|
390 | 391 | // If we just output latex, typeset it. |
|
391 | 392 | if ( (json.latex !== undefined) || (json.html !== undefined) ) { |
|
392 | 393 | this.typeset(); |
|
393 | 394 | } |
|
394 | 395 | }; |
|
395 | 396 | |
|
396 | 397 | OutputArea.display_order = ['javascript','html','latex','svg','png','jpeg','text']; |
|
397 | 398 | |
|
398 | 399 | OutputArea.prototype.append_mime_type = function (json, element, dynamic) { |
|
399 | 400 | for(var type_i in OutputArea.display_order){ |
|
400 | 401 | var type = OutputArea.display_order[type_i]; |
|
401 | 402 | if(json[type] != undefined ){ |
|
402 | 403 | var md = {}; |
|
403 | 404 | if (json.metadata && json.metadata[type]) { |
|
404 | 405 | md = json.metadata[type]; |
|
405 | 406 | }; |
|
406 | 407 | if(type == 'javascript'){ |
|
407 | 408 | if (dynamic) { |
|
408 | 409 | this.append_javascript(json.javascript, md, element, dynamic); |
|
409 | 410 | } |
|
410 | 411 | } else { |
|
411 | 412 | this['append_'+type](json[type], md, element); |
|
412 | 413 | } |
|
413 | 414 | return; |
|
414 | 415 | } |
|
415 | 416 | } |
|
416 | 417 | }; |
|
417 | 418 | |
|
418 | 419 | |
|
419 | 420 | OutputArea.prototype.append_html = function (html, md, element) { |
|
420 | 421 | var toinsert = $("<div/>").addClass("output_subarea output_html rendered_html"); |
|
421 | 422 | toinsert.append(html); |
|
422 | 423 | element.append(toinsert); |
|
423 | 424 | }; |
|
424 | 425 | |
|
425 | 426 | |
|
426 | 427 | OutputArea.prototype.append_javascript = function (js, md, container) { |
|
427 | 428 | // We just eval the JS code, element appears in the local scope. |
|
428 | 429 | var element = $("<div/>").addClass("output_subarea"); |
|
429 | 430 | container.append(element); |
|
430 | 431 | // Div for js shouldn't be drawn, as it will add empty height to the area. |
|
431 | 432 | container.hide(); |
|
432 | 433 | // If the Javascript appends content to `element` that should be drawn, then |
|
433 | 434 | // it must also call `container.show()`. |
|
434 | 435 | try { |
|
435 | 436 | eval(js); |
|
436 | 437 | } catch(err) { |
|
437 | 438 | console.log('Error in Javascript!'); |
|
438 | 439 | console.log(err); |
|
439 | 440 | container.show(); |
|
440 | 441 | element.append($('<div/>') |
|
441 | 442 | .html("Error in Javascript !<br/>"+ |
|
442 | 443 | err.toString()+ |
|
443 | 444 | '<br/>See your browser Javascript console for more details.') |
|
444 | 445 | .addClass('js-error') |
|
445 | 446 | ); |
|
446 | 447 | } |
|
447 | 448 | }; |
|
448 | 449 | |
|
449 | 450 | |
|
450 | 451 | OutputArea.prototype.append_text = function (data, md, element, extra_class) { |
|
451 | 452 | var toinsert = $("<div/>").addClass("output_subarea output_text"); |
|
452 | 453 | // escape ANSI & HTML specials in plaintext: |
|
453 | 454 | data = utils.fixConsole(data); |
|
454 | 455 | data = utils.fixCarriageReturn(data); |
|
455 | 456 | data = utils.autoLinkUrls(data); |
|
456 | 457 | if (extra_class){ |
|
457 | 458 | toinsert.addClass(extra_class); |
|
458 | 459 | } |
|
459 | 460 | toinsert.append($("<pre/>").html(data)); |
|
460 | 461 | element.append(toinsert); |
|
461 | 462 | }; |
|
462 | 463 | |
|
463 | 464 | |
|
464 | 465 | OutputArea.prototype.append_svg = function (svg, md, element) { |
|
465 | 466 | var toinsert = $("<div/>").addClass("output_subarea output_svg"); |
|
466 | 467 | toinsert.append(svg); |
|
467 | 468 | element.append(toinsert); |
|
468 | 469 | }; |
|
469 | 470 | |
|
470 | 471 | |
|
471 | 472 | OutputArea.prototype._dblclick_to_reset_size = function (img) { |
|
472 | 473 | // schedule wrapping image in resizable after a delay, |
|
473 | 474 | // so we don't end up calling resize on a zero-size object |
|
474 | 475 | var that = this; |
|
475 | 476 | setTimeout(function () { |
|
476 | 477 | var h0 = img.height(); |
|
477 | 478 | var w0 = img.width(); |
|
478 | 479 | if (!(h0 && w0)) { |
|
479 | 480 | // zero size, schedule another timeout |
|
480 | 481 | that._dblclick_to_reset_size(img); |
|
481 | 482 | return; |
|
482 | 483 | } |
|
483 | 484 | img.resizable({ |
|
484 | 485 | aspectRatio: true, |
|
485 | 486 | autoHide: true |
|
486 | 487 | }); |
|
487 | 488 | img.dblclick(function () { |
|
488 | 489 | // resize wrapper & image together for some reason: |
|
489 | 490 | img.parent().height(h0); |
|
490 | 491 | img.height(h0); |
|
491 | 492 | img.parent().width(w0); |
|
492 | 493 | img.width(w0); |
|
493 | 494 | }); |
|
494 | 495 | }, 250); |
|
495 | 496 | }; |
|
496 | 497 | |
|
497 | 498 | |
|
498 | 499 | OutputArea.prototype.append_png = function (png, md, element) { |
|
499 | 500 | var toinsert = $("<div/>").addClass("output_subarea output_png"); |
|
500 | 501 | var img = $("<img/>").attr('src','data:image/png;base64,'+png); |
|
501 | 502 | if (md['height']) { |
|
502 | 503 | img.attr('height', md['height']); |
|
503 | 504 | } |
|
504 | 505 | if (md['width']) { |
|
505 | 506 | img.attr('width', md['width']); |
|
506 | 507 | } |
|
507 | 508 | this._dblclick_to_reset_size(img); |
|
508 | 509 | toinsert.append(img); |
|
509 | 510 | element.append(toinsert); |
|
510 | 511 | }; |
|
511 | 512 | |
|
512 | 513 | |
|
513 | 514 | OutputArea.prototype.append_jpeg = function (jpeg, md, element) { |
|
514 | 515 | var toinsert = $("<div/>").addClass("output_subarea output_jpeg"); |
|
515 | 516 | var img = $("<img/>").attr('src','data:image/jpeg;base64,'+jpeg); |
|
516 | 517 | if (md['height']) { |
|
517 | 518 | img.attr('height', md['height']); |
|
518 | 519 | } |
|
519 | 520 | if (md['width']) { |
|
520 | 521 | img.attr('width', md['width']); |
|
521 | 522 | } |
|
522 | 523 | this._dblclick_to_reset_size(img); |
|
523 | 524 | toinsert.append(img); |
|
524 | 525 | element.append(toinsert); |
|
525 | 526 | }; |
|
526 | 527 | |
|
527 | 528 | |
|
528 | 529 | OutputArea.prototype.append_latex = function (latex, md, element) { |
|
529 | 530 | // This method cannot do the typesetting because the latex first has to |
|
530 | 531 | // be on the page. |
|
531 | 532 | var toinsert = $("<div/>").addClass("output_subarea output_latex"); |
|
532 | 533 | toinsert.append(latex); |
|
533 | 534 | element.append(toinsert); |
|
534 | 535 | }; |
|
535 | 536 | |
|
536 | 537 | OutputArea.prototype.append_raw_input = function (content) { |
|
537 | 538 | var that = this; |
|
538 | 539 | this.expand(); |
|
539 | 540 | this.flush_clear_timeout(); |
|
540 | 541 | var area = this.create_output_area(); |
|
541 | 542 | |
|
542 | 543 | area.append( |
|
543 | 544 | $("<div/>") |
|
544 | 545 | .addClass("box-flex1 output_subarea raw_input") |
|
545 | 546 | .append( |
|
546 | 547 | $("<span/>") |
|
547 | 548 | .addClass("input_prompt") |
|
548 | 549 | .text(content.prompt) |
|
549 | 550 | ) |
|
550 | 551 | .append( |
|
551 | 552 | $("<input/>") |
|
552 | 553 | .addClass("raw_input") |
|
553 | 554 | .attr('type', 'text') |
|
554 | 555 | .attr("size", 80) |
|
555 | 556 | .keydown(function (event, ui) { |
|
556 | 557 | // make sure we submit on enter, |
|
557 | 558 | // and don't re-execute the *cell* on shift-enter |
|
558 | 559 | if (event.which === utils.keycodes.ENTER) { |
|
559 | 560 | that._submit_raw_input(); |
|
560 | 561 | return false; |
|
561 | 562 | } |
|
562 | 563 | }) |
|
563 | 564 | ) |
|
564 | 565 | ); |
|
565 | 566 | this.element.append(area); |
|
566 | 567 | area.find("input.raw_input").focus(); |
|
567 | 568 | } |
|
568 | 569 | OutputArea.prototype._submit_raw_input = function (evt) { |
|
569 | 570 | var container = this.element.find("div.raw_input"); |
|
570 | 571 | var theprompt = container.find("span.input_prompt"); |
|
571 | 572 | var theinput = container.find("input.raw_input"); |
|
572 | 573 | var value = theinput.attr("value"); |
|
573 | 574 | var content = { |
|
574 | 575 | output_type : 'stream', |
|
575 | 576 | name : 'stdout', |
|
576 | 577 | text : theprompt.text() + value + '\n' |
|
577 | 578 | } |
|
578 | 579 | // remove form container |
|
579 | 580 | container.parent().remove(); |
|
580 | 581 | // replace with plaintext version in stdout |
|
581 | 582 | this.append_output(content, false); |
|
582 | 583 | $([IPython.events]).trigger('send_input_reply.Kernel', value); |
|
583 | 584 | } |
|
584 | 585 | |
|
585 | 586 | |
|
586 | 587 | OutputArea.prototype.handle_clear_output = function (content) { |
|
587 | 588 | this.clear_output(content.stdout, content.stderr, content.other); |
|
588 | 589 | }; |
|
589 | 590 | |
|
590 | 591 | |
|
591 | 592 | OutputArea.prototype.clear_output = function (stdout, stderr, other) { |
|
592 | 593 | var that = this; |
|
593 | 594 | if (this.clear_out_timeout != null){ |
|
594 | 595 | // fire previous pending clear *immediately* |
|
595 | 596 | clearTimeout(this.clear_out_timeout); |
|
596 | 597 | this.clear_out_timeout = null; |
|
597 | 598 | this.clear_output_callback(this._clear_stdout, this._clear_stderr, this._clear_other); |
|
598 | 599 | } |
|
599 | 600 | // store flags for flushing the timeout |
|
600 | 601 | this._clear_stdout = stdout; |
|
601 | 602 | this._clear_stderr = stderr; |
|
602 | 603 | this._clear_other = other; |
|
603 | 604 | this.clear_out_timeout = setTimeout(function() { |
|
604 | 605 | // really clear timeout only after a short delay |
|
605 | 606 | // this reduces flicker in 'clear_output; print' cases |
|
606 | 607 | that.clear_out_timeout = null; |
|
607 | 608 | that._clear_stdout = that._clear_stderr = that._clear_other = null; |
|
608 | 609 | that.clear_output_callback(stdout, stderr, other); |
|
609 | 610 | }, 500 |
|
610 | 611 | ); |
|
611 | 612 | }; |
|
612 | 613 | |
|
613 | 614 | |
|
614 | 615 | OutputArea.prototype.clear_output_callback = function (stdout, stderr, other) { |
|
615 | 616 | var output_div = this.element; |
|
616 | 617 | |
|
617 | 618 | if (stdout && stderr && other){ |
|
618 | 619 | // clear all, no need for logic |
|
619 | 620 | output_div.html(""); |
|
620 | 621 | this.outputs = []; |
|
621 | 622 | this.unscroll_area(); |
|
622 | 623 | return; |
|
623 | 624 | } |
|
624 | 625 | // remove html output |
|
625 | 626 | // each output_subarea that has an identifying class is in an output_area |
|
626 | 627 | // which is the element to be removed. |
|
627 | 628 | if (stdout) { |
|
628 | 629 | output_div.find("div.output_stdout").parent().remove(); |
|
629 | 630 | } |
|
630 | 631 | if (stderr) { |
|
631 | 632 | output_div.find("div.output_stderr").parent().remove(); |
|
632 | 633 | } |
|
633 | 634 | if (other) { |
|
634 | 635 | output_div.find("div.output_subarea").not("div.output_stderr").not("div.output_stdout").parent().remove(); |
|
635 | 636 | } |
|
636 | 637 | this.unscroll_area(); |
|
637 | 638 | |
|
638 | 639 | // remove cleared outputs from JSON list: |
|
639 | 640 | for (var i = this.outputs.length - 1; i >= 0; i--) { |
|
640 | 641 | var out = this.outputs[i]; |
|
641 | 642 | var output_type = out.output_type; |
|
642 | 643 | if (output_type == "display_data" && other) { |
|
643 | 644 | this.outputs.splice(i,1); |
|
644 | 645 | } else if (output_type == "stream") { |
|
645 | 646 | if (stdout && out.stream == "stdout") { |
|
646 | 647 | this.outputs.splice(i,1); |
|
647 | 648 | } else if (stderr && out.stream == "stderr") { |
|
648 | 649 | this.outputs.splice(i,1); |
|
649 | 650 | } |
|
650 | 651 | } |
|
651 | 652 | } |
|
652 | 653 | }; |
|
653 | 654 | |
|
654 | 655 | |
|
655 | 656 | OutputArea.prototype.flush_clear_timeout = function() { |
|
656 | 657 | var output_div = this.element; |
|
657 | 658 | if (this.clear_out_timeout){ |
|
658 | 659 | clearTimeout(this.clear_out_timeout); |
|
659 | 660 | this.clear_out_timeout = null; |
|
660 | 661 | this.clear_output_callback(this._clear_stdout, this._clear_stderr, this._clear_other); |
|
661 | 662 | } |
|
662 | 663 | }; |
|
663 | 664 | |
|
664 | 665 | |
|
665 | 666 | // JSON serialization |
|
666 | 667 | |
|
667 | 668 | OutputArea.prototype.fromJSON = function (outputs) { |
|
668 | 669 | var len = outputs.length; |
|
669 | 670 | for (var i=0; i<len; i++) { |
|
670 | 671 | // append with dynamic=false. |
|
671 | 672 | this.append_output(outputs[i], false); |
|
672 | 673 | } |
|
673 | 674 | }; |
|
674 | 675 | |
|
675 | 676 | |
|
676 | 677 | OutputArea.prototype.toJSON = function () { |
|
677 | 678 | var outputs = []; |
|
678 | 679 | var len = this.outputs.length; |
|
679 | 680 | for (var i=0; i<len; i++) { |
|
680 | 681 | outputs[i] = this.outputs[i]; |
|
681 | 682 | } |
|
682 | 683 | return outputs; |
|
683 | 684 | }; |
|
684 | 685 | |
|
685 | 686 | |
|
686 | 687 | IPython.OutputArea = OutputArea; |
|
687 | 688 | |
|
688 | 689 | return IPython; |
|
689 | 690 | |
|
690 | 691 | }(IPython)); |
General Comments 0
You need to be logged in to leave comments.
Login now