Show More
@@ -86,6 +86,7 b' class ZMQStreamRouter(Configurable):' | |||||
86 | idents, msg_list = self.session.feed_identities(msg_list) |
|
86 | idents, msg_list = self.session.feed_identities(msg_list) | |
87 | msg = self.session.unserialize(msg_list) |
|
87 | msg = self.session.unserialize(msg_list) | |
88 | msg['header'].pop('date') |
|
88 | msg['header'].pop('date') | |
|
89 | msg.pop('buffers') | |||
89 | return json.dumps(msg) |
|
90 | return json.dumps(msg) | |
90 |
|
91 | |||
91 |
|
92 |
@@ -5,7 +5,7 b' CodeMirror.defineMode("python", function(conf) {' | |||||
5 | return new RegExp("^((" + words.join(")|(") + "))\\b"); |
|
5 | return new RegExp("^((" + words.join(")|(") + "))\\b"); | |
6 | } |
|
6 | } | |
7 |
|
7 | |||
8 | var singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!]"); |
|
8 | var singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!\\?]"); | |
9 | var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]'); |
|
9 | var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]'); | |
10 | var doubleOperators = new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))"); |
|
10 | var doubleOperators = new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))"); | |
11 | var doubleDelimiters = new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))"); |
|
11 | var doubleDelimiters = new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))"); |
@@ -127,13 +127,13 b' div#left_panel_splitter {' | |||||
127 | div#pager { |
|
127 | div#pager { | |
128 | height: 200px; |
|
128 | height: 200px; | |
129 | overflow: auto; |
|
129 | overflow: auto; | |
130 |
|
130 | padding: 15px; | ||
131 | } |
|
131 | } | |
132 |
|
132 | |||
133 | div#notebook { |
|
133 | div#notebook { | |
134 | overflow-y: scroll; |
|
134 | overflow-y: scroll; | |
135 | overflow-x: auto; |
|
135 | overflow-x: auto; | |
136 |
padding: 0px |
|
136 | padding: 0px 15px; | |
137 | background-color: white; |
|
137 | background-color: white; | |
138 | font-size: 12pt; |
|
138 | font-size: 12pt; | |
139 | } |
|
139 | } |
@@ -5,6 +5,8 b'' | |||||
5 |
|
5 | |||
6 | var IPython = (function (IPython) { |
|
6 | var IPython = (function (IPython) { | |
7 |
|
7 | |||
|
8 | var utils = IPython.utils; | |||
|
9 | ||||
8 | var Notebook = function (selector) { |
|
10 | var Notebook = function (selector) { | |
9 | this.element = $(selector); |
|
11 | this.element = $(selector); | |
10 | this.element.scroll(); |
|
12 | this.element.scroll(); | |
@@ -373,15 +375,33 b' var IPython = (function (IPython) {' | |||||
373 |
|
375 | |||
374 | Notebook.prototype.handle_shell_reply = function (e) { |
|
376 | Notebook.prototype.handle_shell_reply = function (e) { | |
375 | reply = $.parseJSON(e.data); |
|
377 | reply = $.parseJSON(e.data); | |
376 | // console.log(reply); |
|
378 | var header = reply.header; | |
377 |
var |
|
379 | var content = reply.content; | |
|
380 | var msg_type = header.msg_type; | |||
|
381 | console.log(reply); | |||
378 | var cell = this.cell_for_msg(reply.parent_header.msg_id); |
|
382 | var cell = this.cell_for_msg(reply.parent_header.msg_id); | |
379 | if (msg_type === "execute_reply") { |
|
383 | if (msg_type === "execute_reply") { | |
380 |
cell.set_input_prompt( |
|
384 | cell.set_input_prompt(content.execution_count); | |
381 | }; |
|
385 | }; | |
|
386 | var payload = content.payload || []; | |||
|
387 | this.handle_payload(content.payload); | |||
382 | }; |
|
388 | }; | |
383 |
|
389 | |||
384 |
|
390 | |||
|
391 | Notebook.prototype.handle_payload = function (payload) { | |||
|
392 | var l = payload.length; | |||
|
393 | var element = $('div#pager'); | |||
|
394 | if (l > 0) { | |||
|
395 | element.show(); | |||
|
396 | }; | |||
|
397 | for (var i=0; i<l; i++) { | |||
|
398 | var toinsert = $("<div/>").addClass("output_area output_stream monospace-font"); | |||
|
399 | toinsert.append($("<pre/>").addClass("monospace-font"). | |||
|
400 | html(utils.fixConsole(payload[i].text))); | |||
|
401 | element.append(toinsert); | |||
|
402 | }; | |||
|
403 | }; | |||
|
404 | ||||
385 | Notebook.prototype.handle_iopub_reply = function (e) { |
|
405 | Notebook.prototype.handle_iopub_reply = function (e) { | |
386 | reply = $.parseJSON(e.data); |
|
406 | reply = $.parseJSON(e.data); | |
387 | var content = reply.content; |
|
407 | var content = reply.content; |
@@ -42,7 +42,7 b'' | |||||
42 | <div id="notebook_panel"> |
|
42 | <div id="notebook_panel"> | |
43 | <div id="notebook"></div> |
|
43 | <div id="notebook"></div> | |
44 | <div id="pager_splitter"></div> |
|
44 | <div id="pager_splitter"></div> | |
45 |
<div id="pager"> |
|
45 | <div id="pager"></div> | |
46 | </div> |
|
46 | </div> | |
47 |
|
47 | |||
48 | </div> |
|
48 | </div> |
General Comments 0
You need to be logged in to leave comments.
Login now