upstream/ipython Commit - r4615:968e3fe4

Refactor static printing.

Stefan van der Walt -

r4615:968e3fe4

parent child

IPython/frontend/html/notebook/static/js/printwidget.js

0 created 644 +54 0

@@ -0,0 +1,54 b''
	1	var IPython = (function (IPython) {
	2
	3	var PrintWidget = function (selector) {
	4	this.selector = selector;
	5	if (this.selector !== undefined) {
	6	this.element = $(selector);
	7	this.style();
	8	this.bind_events();
	9	}
	10	};
	11
	12	PrintWidget.prototype.style = function () {
	13	this.element.find('button#print_notebook').button();
	14	};
	15
	16	PrintWidget.prototype.bind_events = function () {
	17	var that = this;
	18	this.element.find('button#print_notebook').click(function () {
	19	that.print_notebook();
	20	});
	21	};
	22
	23	PrintWidget.prototype.enable = function () {
	24	this.element.find('button#print_notebook').button('enable');
	25	};
	26
	27	PrintWidget.prototype.disable = function () {
	28	this.element.find('button#print_notebook').button('disable');
	29	};
	30
	31	PrintWidget.prototype.print_notebook = function () {
	32	var w = window.open('', '_blank', 'scrollbars=1,menubar=1');
	33	var html = '<html><head>' +
	34	$('head').clone().html() +
	35	'<style type="text/css">' +
	36	'@media print { body { overflow: visible !important; } }' +
	37	'.ui-widget-content { border: 0px; }' +
	38	'</style>' +
	39	'</head><body style="overflow: auto;">' +
	40	$('#notebook').clone().html() +
	41	'</body></html>';
	42
	43	w.document.open();
	44	w.document.write(html);
	45	w.document.close();
	46
	47	return false;
	48	};
	49
	50	IPython.PrintWidget = PrintWidget;
	51
	52	return IPython;
	53
	54	}(IPython)); No newline at end of file

IPython/frontend/html/notebook/static/js/notebook.js

0 0 -18

             //============================================================================
             // Notebook
             //============================================================================
             var IPython = (function (IPython) {
                 var utils = IPython.utils;
                 var Notebook = function (selector) {
                     this.element = $(selector);
                     this.element.scroll();
                     this.element.data("notebook", this);
                     this.next_prompt_number = 1;
                     this.kernel = null;
                     this.dirty = false;
                     this.msg_cell_map = {};
                     this.style();
                     this.create_elements();
                     this.bind_events();
                 };
                 Notebook.prototype.style = function () {
                     $('div#notebook').addClass('border-box-sizing');
                 };
                 Notebook.prototype.create_elements = function () {
                     // We add this end_space div to the end of the notebook div to:
                     // i) provide a margin between the last cell and the end of the notebook
                     // ii) to prevent the div from scrolling up when the last cell is being
                     // edited, but is too low on the page, which browsers will do automatically.
                     this.element.append($('<div class="end_space"></div>').height(150));
                     $('div#notebook').addClass('border-box-sizing');
                 };
                 Notebook.prototype.bind_events = function () {
                     var that = this;
                     $(document).keydown(function (event) {
                         // console.log(event);
                         if (event.which === 38) {
                             var cell = that.selected_cell();
                             if (cell.at_top()) {
                                 event.preventDefault();
                                 that.select_prev();
                             };
                         } else if (event.which === 40) {
                             var cell = that.selected_cell();
                             if (cell.at_bottom()) {
                                 event.preventDefault();
                                 that.select_next();
                             };
                         } else if (event.which === 13 && event.shiftKey) {
                             that.execute_selected_cell();
                             return false;
                         } else if (event.which === 13 && event.ctrlKey) {
                             that.execute_selected_cell({terminal:true});
                             return false;
                         };
                     });
                     this.element.bind('collapse_pager', function () {
                         var app_height = $('div#main_app').height(); // content height
                         var splitter_height = $('div#pager_splitter').outerHeight(true);
                         var new_height = app_height - splitter_height;
                         that.element.animate({height : new_height + 'px'}, 'fast');
                     });
                     this.element.bind('expand_pager', function () {
                         var app_height = $('div#main_app').height(); // content height
                         var splitter_height = $('div#pager_splitter').outerHeight(true);
                         var pager_height = $('div#pager').outerHeight(true);
                         var new_height = app_height - pager_height - splitter_height;
                         that.element.animate({height : new_height + 'px'}, 'fast');
                     });
                     this.element.bind('collapse_left_panel', function () {
                         var splitter_width = $('div#left_panel_splitter').outerWidth(true);
                         var new_margin = splitter_width;
                         $('div#notebook_panel').animate({marginLeft : new_margin + 'px'}, 'fast');
                     });
                     this.element.bind('expand_left_panel', function () {
                         var splitter_width = $('div#left_panel_splitter').outerWidth(true);
                         var left_panel_width = IPython.left_panel.width;
                         var new_margin = splitter_width + left_panel_width;
                         $('div#notebook_panel').animate({marginLeft : new_margin + 'px'}, 'fast');
                     });
                     $(window).bind('beforeunload', function () {
                         var kill_kernel = $('#kill_kernel').prop('checked');
                         if (kill_kernel) {
                             that.kernel.kill();
                         }
                         if (that.dirty) {
                             return "You have unsaved changes that will be lost if you leave this page.";
                         };
                     });
                 };
                 Notebook.prototype.scroll_to_bottom = function () {
                     this.element.animate({scrollTop:this.element.get(0).scrollHeight}, 0);
                 };
                 Notebook.prototype.scroll_to_top = function () {
                     this.element.animate({scrollTop:0}, 0);
                 };
                 // Cell indexing, retrieval, etc.
                 Notebook.prototype.cell_elements = function () {
                     return this.element.children("div.cell");
                 }
                 Notebook.prototype.ncells = function (cell) {
                     return this.cell_elements().length;
                 }
                 // TODO: we are often calling cells as cells()[i], which we should optimize
                 // to cells(i) or a new method.
                 Notebook.prototype.cells = function () {
                     return this.cell_elements().toArray().map(function (e) {
                         return $(e).data("cell");
                     });
                 }
                 Notebook.prototype.find_cell_index = function (cell) {
                     var result = null;
                     this.cell_elements().filter(function (index) {
                         if ($(this).data("cell") === cell) {
                             result = index;
                         };
                     });
                     return result;
                 };
                 Notebook.prototype.index_or_selected = function (index) {
                     return index || this.selected_index() || 0;
                 }
                 Notebook.prototype.select = function (index) {
                     if (index !== undefined && index >= 0 && index < this.ncells()) {
                         if (this.selected_index() !== null) {
                             this.selected_cell().unselect();
                         };
                         this.cells()[index].select();
                         if (index === (this.ncells()-1)) {
                             this.scroll_to_bottom();
                         };
                     };
                     return this;
                 };
                 Notebook.prototype.select_next = function () {
                     var index = this.selected_index();
                     if (index !== null && index >= 0 && (index+1) < this.ncells()) {
                         this.select(index+1);
                     };
                     return this;
                 };
                 Notebook.prototype.select_prev = function () {
                     var index = this.selected_index();
                     if (index !== null && index >= 0 && (index-1) < this.ncells()) {
                         this.select(index-1);
                     };
                     return this;
                 };
                 Notebook.prototype.selected_index = function () {
                     var result = null;
                     this.cell_elements().filter(function (index) {
                         if ($(this).data("cell").selected === true) {
                             result = index;
                         };
                     });
                     return result;
                 };
                 Notebook.prototype.cell_for_msg = function (msg_id) {
                     var cell_id = this.msg_cell_map[msg_id];
                     var result = null;
                     this.cell_elements().filter(function (index) {
                         cell = $(this).data("cell");
                         if (cell.cell_id === cell_id) {
                             result = cell;
                         };
                     });
                     return result;
                 };
                 Notebook.prototype.selected_cell = function () {
                     return this.cell_elements().eq(this.selected_index()).data("cell");
                 }
                 // Cell insertion, deletion and moving.
                 Notebook.prototype.delete_cell = function (index) {
                     var i = index || this.selected_index();
                     if (i !== null && i >= 0 && i < this.ncells()) {
                         this.cell_elements().eq(i).remove();
                         if (i === (this.ncells())) {
                             this.select(i-1);
                         } else {
                             this.select(i);
                         };
                     };
                     this.dirty = true;
                     return this;
                 };
                 Notebook.prototype.append_cell = function (cell) {
                     this.element.find('div.end_space').before(cell.element);
                     this.dirty = true;
                     return this;
                 };
                 Notebook.prototype.insert_cell_after = function (cell, index) {
                     var ncells = this.ncells();
                     if (ncells === 0) {
                         this.append_cell(cell);
                         return this;
                     };
                     if (index >= 0 && index < ncells) {
                         this.cell_elements().eq(index).after(cell.element);
                     };
                     this.dirty = true;
                     return this
                 };
                 Notebook.prototype.insert_cell_before = function (cell, index) {
                     var ncells = this.ncells();
                     if (ncells === 0) {
                         this.append_cell(cell);
                         return this;
                     };
                     if (index >= 0 && index < ncells) {
                         this.cell_elements().eq(index).before(cell.element);
                     };
                     this.dirty = true;
                     return this;
                 };
                 Notebook.prototype.move_cell_up = function (index) {
                     var i = index || this.selected_index();
                     if (i !== null && i < this.ncells() && i > 0) {
                         var pivot = this.cell_elements().eq(i-1);
                         var tomove = this.cell_elements().eq(i);
                         if (pivot !== null && tomove !== null) {
                             tomove.detach();
                             pivot.before(tomove);
                             this.select(i-1);
                         };
                     };
                     this.dirty = true;
                     return this;
                 }
                 Notebook.prototype.move_cell_down = function (index) {
                     var i = index || this.selected_index();
                     if (i !== null && i < (this.ncells()-1) && i >= 0) {
                         var pivot = this.cell_elements().eq(i+1)
                         var tomove = this.cell_elements().eq(i)
                         if (pivot !== null && tomove !== null) {
                             tomove.detach();
                             pivot.after(tomove);
                             this.select(i+1);
                         };
                     };
                     this.dirty = true;
                     return this;
                 }
                 Notebook.prototype.sort_cells = function () {
                     var ncells = this.ncells();
                     var sindex = this.selected_index();
                     var swapped;
                     do {
                         swapped = false
                         for (var i=1; i<ncells; i++) {
                             current = this.cell_elements().eq(i).data("cell");
                             previous = this.cell_elements().eq(i-1).data("cell");
                             if (previous.input_prompt_number > current.input_prompt_number) {
                                 this.move_cell_up(i);
                                 swapped = true;
                             };
                         };
                     } while (swapped);
                     this.select(sindex);
                     return this;
                 };
                 Notebook.prototype.insert_code_cell_before = function (index) {
                     // TODO: Bounds check for i
                     var i = this.index_or_selected(index);
                     var cell = new IPython.CodeCell(this);
                     cell.set_input_prompt();
                     this.insert_cell_before(cell, i);
                     this.select(this.find_cell_index(cell));
                     return cell;
                 }
                 Notebook.prototype.insert_code_cell_after = function (index) {
                     // TODO: Bounds check for i
                     var i = this.index_or_selected(index);
                     var cell = new IPython.CodeCell(this);
                     cell.set_input_prompt();
                     this.insert_cell_after(cell, i);
                     this.select(this.find_cell_index(cell));
                     return cell;
                 }
                 Notebook.prototype.insert_html_cell_before = function (index) {
                     // TODO: Bounds check for i
                     var i = this.index_or_selected(index);
                     var cell = new IPython.HTMLCell(this);
                     cell.config_mathjax();
                     this.insert_cell_before(cell, i);
                     this.select(this.find_cell_index(cell));
                     return cell;
                 }
                 Notebook.prototype.insert_html_cell_after = function (index) {
                     // TODO: Bounds check for i
                     var i = this.index_or_selected(index);
                     var cell = new IPython.HTMLCell(this);
                     cell.config_mathjax();
                     this.insert_cell_after(cell, i);
                     this.select(this.find_cell_index(cell));
                     return cell;
                 }
                 Notebook.prototype.insert_markdown_cell_before = function (index) {
                     // TODO: Bounds check for i
                     var i = this.index_or_selected(index);
                     var cell = new IPython.MarkdownCell(this);
                     cell.config_mathjax();
                     this.insert_cell_before(cell, i);
                     this.select(this.find_cell_index(cell));
                     return cell;
                 }
                 Notebook.prototype.insert_markdown_cell_after = function (index) {
                     // TODO: Bounds check for i
                     var i = this.index_or_selected(index);
                     var cell = new IPython.MarkdownCell(this);
                     cell.config_mathjax();
                     this.insert_cell_after(cell, i);
                     this.select(this.find_cell_index(cell));
                     return cell;
                 }
                 Notebook.prototype.to_code = function (index) {
                     // TODO: Bounds check for i
                     var i = this.index_or_selected(index);
                     var source_element = this.cell_elements().eq(i);
                     var source_cell = source_element.data("cell");
                     if (source_cell instanceof IPython.HTMLCell ||
                         source_cell instanceof IPython.MarkdownCell) {
                         this.insert_code_cell_after(i);
                         var target_cell = this.cells()[i+1];
                         target_cell.set_code(source_cell.get_source());
                         source_element.remove();
                         target_cell.select();
                     };
                     this.dirty = true;
                 };
                 Notebook.prototype.to_markdown = function (index) {
                     // TODO: Bounds check for i
                     var i = this.index_or_selected(index);
                     var source_element = this.cell_elements().eq(i);
                     var source_cell = source_element.data("cell");
                     var target_cell = null;
                     if (source_cell instanceof IPython.CodeCell) {
                         this.insert_markdown_cell_after(i);
                         var target_cell = this.cells()[i+1];
                         var text = source_cell.get_code();
                     } else if (source_cell instanceof IPython.HTMLCell) {
                         this.insert_markdown_cell_after(i);
                         var target_cell = this.cells()[i+1];
                         var text = source_cell.get_source();
                         if (text === source_cell.placeholder) {
                             text = target_cell.placeholder;
                         }
                     }
                     if (target_cell !== null) {
                         if (text === "") {text = target_cell.placeholder;};
                         target_cell.set_source(text);
                         source_element.remove();
                         target_cell.edit();
                     }
                     this.dirty = true;
                 };
                 Notebook.prototype.to_html = function (index) {
                     // TODO: Bounds check for i
                     var i = this.index_or_selected(index);
                     var source_element = this.cell_elements().eq(i);
                     var source_cell = source_element.data("cell");
                     var target_cell = null;
                     if (source_cell instanceof IPython.CodeCell) {
                         this.insert_html_cell_after(i);
                         var target_cell = this.cells()[i+1];
                         var text = source_cell.get_code();
                     } else if (source_cell instanceof IPython.MarkdownCell) {
                         this.insert_html_cell_after(i);
                         var target_cell = this.cells()[i+1];
                         var text = source_cell.get_source();
                         if (text === source_cell.placeholder) {
                             text = target_cell.placeholder;
                         }
                     }
                     if (target_cell !== null) {
                         if (text === "") {text = target_cell.placeholder;};
                         target_cell.set_source(text);
                         source_element.remove();
                         target_cell.edit();
                     }
                     this.dirty = true;
                 };
                 // Cell collapsing and output clearing
                 Notebook.prototype.collapse = function (index) {
                     var i = this.index_or_selected(index);
                     this.cells()[i].collapse();
                     this.dirty = true;
                 };
                 Notebook.prototype.expand = function (index) {
                     var i = this.index_or_selected(index);
                     this.cells()[i].expand();
                     this.dirty = true;
                 };
                 Notebook.prototype.set_autoindent = function (state) {
                     var cells = this.cells();
                     len = cells.length;
                     for (var i=0; i<len; i++) {
                         cells[i].set_autoindent(state)
                     };
                 };
                 Notebook.prototype.clear_all_output = function () {
                     var ncells = this.ncells();
                     var cells = this.cells();
                     for (var i=0; i<ncells; i++) {
                         if (cells[i] instanceof IPython.CodeCell) {
                             cells[i].clear_output();
                         }
                     };
                     this.dirty = true;
                 };
                 // Kernel related things
                 Notebook.prototype.start_kernel = function () {
                     this.kernel = new IPython.Kernel();
                     var notebook_id = IPython.save_widget.get_notebook_id();
                     this.kernel.start(notebook_id, $.proxy(this.kernel_started, this));
                 };
                 Notebook.prototype.restart_kernel = function () {
                     var notebook_id = IPython.save_widget.get_notebook_id();
                     this.kernel.restart($.proxy(this.kernel_started, this));
                 };
                 Notebook.prototype.kernel_started = function () {
                     console.log("Kernel started: ", this.kernel.kernel_id);
                     this.kernel.shell_channel.onmessage = $.proxy(this.handle_shell_reply,this);
                     this.kernel.iopub_channel.onmessage = $.proxy(this.handle_iopub_reply,this);
                 };
                 Notebook.prototype.handle_shell_reply = function (e) {
                     reply = $.parseJSON(e.data);
                     var header = reply.header;
                     var content = reply.content;
                     var msg_type = header.msg_type;
                     // console.log(reply);
                     var cell = this.cell_for_msg(reply.parent_header.msg_id);
                     if (msg_type === "execute_reply") {
                         cell.set_input_prompt(content.execution_count);
                         this.dirty = true;
                     } else if (msg_type === "complete_reply") {
                         cell.finish_completing(content.matched_text, content.matches);
                     };
                     var payload = content.payload || [];
                     this.handle_payload(cell, payload);
                 };
                 Notebook.prototype.handle_payload = function (cell, payload) {
                     var l = payload.length;
                     for (var i=0; i<l; i++) {
                         if (payload[i].source === 'IPython.zmq.page.page') {
                             if (payload[i].text.trim() !== '') {
                                 IPython.pager.clear();
                                 IPython.pager.expand();
                                 IPython.pager.append_text(payload[i].text);
                             }
                         } else if (payload[i].source === 'IPython.zmq.zmqshell.ZMQInteractiveShell.set_next_input') {
                             var index = this.find_cell_index(cell);
                             var new_cell = this.insert_code_cell_after(index);
                             new_cell.set_code(payload[i].text);
                             this.dirty = true;
                         }
                     };
                 };
                 Notebook.prototype.handle_iopub_reply = function (e) {
                     reply = $.parseJSON(e.data);
                     var content = reply.content;
                     // console.log(reply);
                     var msg_type = reply.header.msg_type;
                     var cell = this.cell_for_msg(reply.parent_header.msg_id);
                     var output_types = ['stream','display_data','pyout','pyerr'];
                     if (output_types.indexOf(msg_type) >= 0) {
                         this.handle_output(cell, msg_type, content);
                     } else if (msg_type === 'status') {
                         if (content.execution_state === 'busy') {
                             IPython.kernel_status_widget.status_busy();
                         } else if (content.execution_state === 'idle') {
                             IPython.kernel_status_widget.status_idle();
                         } else if (content.execution_state === 'dead') {
                             this.handle_status_dead();
                         };
                     }
                 };
                 Notebook.prototype.handle_status_dead = function () {
                     var that = this;
                     this.kernel.stop_channels();
                     var dialog = $('<div/>');
                     dialog.html('The kernel has died, would you like to restart it? If you do not restart the kernel, you will be able to save the notebook, but running code will not work until the notebook is reopened.');
                     $(document).append(dialog);
                     dialog.dialog({
                         resizable: false,
                         modal: true,
                         title: "Dead kernel",
                         buttons : {
                             "Yes": function () {
                                 that.start_kernel();
                                 $(this).dialog('close');
                             },
                             "No": function () {
                                 $(this).dialog('close');
                             }
                         }
                     });
                 };
                 Notebook.prototype.handle_output = function (cell, msg_type, content) {
                     var json = {};
                     json.output_type = msg_type;
                     if (msg_type === "stream") {
                         json.text = utils.fixConsole(content.data + '\n');
                     } else if (msg_type === "display_data") {
                         json = this.convert_mime_types(json, content.data);
                     } else if (msg_type === "pyout") {
                         json.prompt_number = content.execution_count;
                         json = this.convert_mime_types(json, content.data);
                     } else if (msg_type === "pyerr") {
                         json.ename = content.ename;
                         json.evalue = content.evalue;
                         var traceback = [];
                         for (var i=0; i<content.traceback.length; i++) {
                             traceback.push(utils.fixConsole(content.traceback[i]));
                         }
                         json.traceback = traceback;
                     };
                     cell.append_output(json);
                     this.dirty = true;
                 };
                 Notebook.prototype.convert_mime_types = function (json, data) {
                     if (data['text/plain'] !== undefined) {
                         json.text = utils.fixConsole(data['text/plain']);
                     };
                     if (data['text/html'] !== undefined) {
                         json.html = data['text/html'];
                     };
                     if (data['image/svg+xml'] !== undefined) {
                         json.svg = data['image/svg+xml'];
                     };
                     if (data['image/png'] !== undefined) {
                         json.png = data['image/png'];
                     };
                     if (data['image/jpeg'] !== undefined) {
                         json.jpeg = data['image/jpeg'];
                     };
                     if (data['text/latex'] !== undefined) {
                         json.latex = data['text/latex'];
                     };
                     if (data['application/json'] !== undefined) {
                         json.json = data['application/json'];
                     };
                     if (data['application/javascript'] !== undefined) {
                         json.javascript = data['application/javascript'];
                     }
                     return json;
                 };
                 Notebook.prototype.execute_selected_cell = function (options) {
                     // add_new: should a new cell be added if we are at the end of the nb
                     // terminal: execute in terminal mode, which stays in the current cell
                     default_options = {terminal: false, add_new: true}
                     $.extend(default_options, options)
                     var that = this;
                     var cell = that.selected_cell();
                     var cell_index = that.find_cell_index(cell);
                     if (cell instanceof IPython.CodeCell) {
                         cell.clear_output();
                         var code = cell.get_code();
                         var msg_id = that.kernel.execute(cell.get_code());
                         that.msg_cell_map[msg_id] = cell.cell_id;
                     } else if (cell instanceof IPython.HTMLCell) {
                         cell.render();
                     }
                     if (default_options.terminal) {
                         cell.clear_input();
                     } else {
                         if ((cell_index === (that.ncells()-1)) && default_options.add_new) {
                             that.insert_code_cell_after();
                             // If we are adding a new cell at the end, scroll down to show it.
                             that.scroll_to_bottom();
                         } else {
                             that.select(cell_index+1);
                         };
                     };
                     this.dirty = true;
                 };
                 Notebook.prototype.execute_all_cells = function () {
                     var ncells = this.ncells();
                     for (var i=0; i<ncells; i++) {
                         this.select(i);
                         this.execute_selected_cell({add_new:false});
                     };
                     this.scroll_to_bottom();
                 };
                 Notebook.prototype.complete_cell = function (cell, line, cursor_pos) {
                     var msg_id = this.kernel.complete(line, cursor_pos);
                     this.msg_cell_map[msg_id] = cell.cell_id;
                 };
                 // Persistance and loading
                 Notebook.prototype.fromJSON = function (data) {
                     var ncells = this.ncells();
                     for (var i=0; i<ncells; i++) {
                         // Always delete cell 0 as they get renumbered as they are deleted.
                         this.delete_cell(0);
                     };
                     // Only handle 1 worksheet for now.
                     var worksheet = data.worksheets[0];
                     if (worksheet !== undefined) {
                         var new_cells = worksheet.cells;
                         ncells = new_cells.length;
                         var cell_data = null;
                         var new_cell = null;
                         for (var i=0; i<ncells; i++) {
                             cell_data = new_cells[i];
                             if (cell_data.cell_type == 'code') {
                                 new_cell = this.insert_code_cell_after();
                                 new_cell.fromJSON(cell_data);
                             } else if (cell_data.cell_type === 'html') {
                                 new_cell = this.insert_html_cell_after();
                                 new_cell.fromJSON(cell_data);
                             } else if (cell_data.cell_type === 'markdown') {
                                 new_cell = this.insert_markdown_cell_after();
                                 new_cell.fromJSON(cell_data);
                             };
                         };
                     };
                 };
                 Notebook.prototype.toJSON = function () {
                     var cells = this.cells();
                     var ncells = cells.length;
                     cell_array = new Array(ncells);
                     for (var i=0; i<ncells; i++) {
                         cell_array[i] = cells[i].toJSON();
                     };
                     data = {
                         // Only handle 1 worksheet for now.
                         worksheets : [{cells:cell_array}]
                     }
                     return data
                 };
                 Notebook.prototype.save_notebook = function () {
                     if (IPython.save_widget.test_notebook_name()) {
                         var notebook_id = IPython.save_widget.get_notebook_id();
                         var nbname = IPython.save_widget.get_notebook_name();
                         // We may want to move the name/id/nbformat logic inside toJSON?
                         var data = this.toJSON();
                         data.name = nbname;
                         data.nbformat = 2;
                         // We do the call with settings so we can set cache to false.
                         var settings = {
                             processData : false,
                             cache : false,
                             type : "PUT",
                             data : JSON.stringify(data),
                             headers : {'Content-Type': 'application/json'},
                             success : $.proxy(this.notebook_saved,this)
                         };
                         IPython.save_widget.status_saving();
                         $.ajax("/notebooks/" + notebook_id, settings);
                     };
                 };
-                Notebook.prototype.publish_notebook = function () {
-                    var w = window.open('', '_blank', 'scrollbars=1,menubar=1');
-                    var html = '<html><head>' +
-                               $('head').clone().html() +
-                               '<style type="text/css">' +
-                               '@media print { body { overflow: visible !important; } }' +
-                               '.ui-widget-content { border: 0px; }' +
-                               '</style>' +
-                               '</head><body style="overflow: auto;">' +
-                               $('#notebook').clone().html() +
-                               '</body></html>';
-                    w.document.open();
-                    w.document.write(html);
-                    w.document.close();
-                    return false;
-                };
                 Notebook.prototype.notebook_saved = function (data, status, xhr) {
                     this.dirty = false;
                     setTimeout($.proxy(IPython.save_widget.status_save,IPython.save_widget),500);
                 }
                 Notebook.prototype.load_notebook = function (callback) {
                     var that = this;
                     var notebook_id = IPython.save_widget.get_notebook_id();
                     // We do the call with settings so we can set cache to false.
                     var settings = {
                         processData : false,
                         cache : false,
                         type : "GET",
                         dataType : "json",
                         success : function (data, status, xhr) {
                             that.notebook_loaded(data, status, xhr);
                             if (callback !== undefined) {
                                 callback();
                             };
                         }
                     };
                     IPython.save_widget.status_loading();
                     $.ajax("/notebooks/" + notebook_id, settings);
                 }
                 Notebook.prototype.notebook_loaded = function (data, status, xhr) {
                     this.fromJSON(data);
                     if (this.ncells() === 0) {
                         this.insert_code_cell_after();
                     };
                     IPython.save_widget.status_save();
                     IPython.save_widget.set_notebook_name(data.name);
                     this.start_kernel();
                     this.dirty = false;
                     // fromJSON always selects the last cell inserted. We need to wait
                     // until that is done before scrolling to the top.
                     setTimeout(function () {
                         IPython.notebook.select(0);
                         IPython.notebook.scroll_to_top();
                     }, 50);
                 };
                 IPython.Notebook = Notebook;
                 return IPython;
             }(IPython));

IPython/frontend/html/notebook/static/js/notebook_main.js

0 +1 0

             //============================================================================
             // On document ready
             //============================================================================
             $(document).ready(function () {
                 MathJax.Hub.Config({
                     tex2jax: {
                         inlineMath: [ ['$','$'], ["\\(","\\)"] ],
                         displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
                     },
                     displayAlign: 'left', // Change this to 'center' to center equations.
                     "HTML-CSS": {
                         styles: {'.MathJax_Display': {"margin": 0}}
                     }
                 });
                 IPython.markdown_converter = new Markdown.Converter();
                 $('div#header').addClass('border-box-sizing');
                 $('div#main_app').addClass('border-box-sizing ui-widget ui-widget-content');
                 $('div#notebook_panel').addClass('border-box-sizing ui-widget');
                 IPython.layout_manager = new IPython.LayoutManager();
                 IPython.pager = new IPython.Pager('div#pager', 'div#pager_splitter');
                 IPython.left_panel = new IPython.LeftPanel('div#left_panel', 'div#left_panel_splitter');
                 IPython.save_widget = new IPython.SaveWidget('span#save_widget');
+                IPython.print_widget = new IPython.PrintWidget('span#print_widget');
                 IPython.notebook = new IPython.Notebook('div#notebook');
                 IPython.kernel_status_widget = new IPython.KernelStatusWidget('#kernel_status');
                 IPython.kernel_status_widget.status_idle();
                 IPython.layout_manager.do_resize();
                 // These have display: none in the css file and are made visible here to prevent FLOUC.
                 $('div#header').css('display','block');
                 $('div#main_app').css('display','block');
                 // Perform these actions after the notebook has been loaded.
                 // We wait 100 milliseconds because the notebook scrolls to the top after a load
                 // is completed and we need to wait for that to mostly finish.
                 IPython.notebook.load_notebook(function () {
                     setTimeout(function () {
                         IPython.save_widget.update_url();
                         IPython.layout_manager.do_resize();
                         IPython.pager.collapse();
                     },100);
                 });
             });

IPython/frontend/html/notebook/static/js/savewidget.js

0 +9 -14

             //============================================================================
             // Cell
             //============================================================================
             var IPython = (function (IPython) {
                 var utils = IPython.utils;
                 var SaveWidget = function (selector) {
                     this.selector = selector;
                     this.notebook_name_re = /[^/\\]+/
                     if (this.selector !== undefined) {
                         this.element = $(selector);
                         this.style();
                         this.bind_events();
                     }
                 };
                 SaveWidget.prototype.style = function () {
                     this.element.find('input#notebook_name').addClass('ui-widget ui-widget-content');
                     this.element.find('button#save_notebook').button();
-                    this.element.find('button#publish_notebook').button();
                     var left_panel_width = $('div#left_panel').outerWidth();
                     var left_panel_splitter_width = $('div#left_panel_splitter').outerWidth();
                     $('span#save_widget').css({marginLeft:left_panel_width+left_panel_splitter_width});
                 };
                 SaveWidget.prototype.bind_events = function () {
                     var that = this;
                     this.element.find('button#save_notebook').click(function () {
                         IPython.notebook.save_notebook();
                         that.set_document_title();
                     });
-                    this.element.find('button#publish_notebook').click(function () {
-                        IPython.notebook.publish_notebook();
-                    });
                 };
                 SaveWidget.prototype.get_notebook_name = function () {
                     return this.element.find('input#notebook_name').attr('value');
                 }
                 SaveWidget.prototype.set_notebook_name = function (nbname) {
                     this.element.find('input#notebook_name').attr('value',nbname);
                     this.set_document_title();
                 }
                 SaveWidget.prototype.set_document_title = function () {
                     nbname = this.get_notebook_name();
                     document.title = 'IPy: ' + nbname;
                 };
                 SaveWidget.prototype.get_notebook_id = function () {
                     return this.element.find('span#notebook_id').text()
                 };
                 SaveWidget.prototype.update_url = function () {
                     var notebook_id = this.get_notebook_id();
                     if (notebook_id !== '') {
                         window.history.replaceState({}, '', notebook_id);
                     };
                 };
                 SaveWidget.prototype.test_notebook_name = function () {
                     var nbname = this.get_notebook_name();
                     if (this.notebook_name_re.test(nbname)) {
                         return true;
                     } else {
                         var bad_name = $('<div/>');
                         bad_name.html(
                             "The notebook name you entered (" +
                             nbname +
                             ") is not valid. Notebook names can contain any characters except / and \\"
                         );
                         bad_name.dialog({title: 'Invalid name', modal: true});
                         return false;
                     };
                 };
                 SaveWidget.prototype.status_save = function () {
-                    $('button#save_notebook').button('option', 'label', 'Save');
+                    this.element.find('button#save_notebook').button('option', 'label', 'Save');
-                    $('button#save_notebook').button('enable');
+                    this.element.find('button#save_notebook').button('enable');
-                    $('button#publish_notebook').button('enable');
+                    IPython.print_widget.enable();
                 };
                 SaveWidget.prototype.status_saving = function () {
-                    $('button#save_notebook').button('option', 'label', 'Saving');
+                    this.element.find('button#save_notebook').button('option', 'label', 'Saving');
-                    $('button#save_notebook').button('disable');
+                    this.element.find('button#save_notebook').button('disable');
-                    $('button#publish_notebook').button('disable');
+                    IPython.print_widget.disable();
                 };
                 SaveWidget.prototype.status_loading = function () {
-                    $('button#save_notebook').button('option', 'label', 'Loading');
+                    this.element.find('button#save_notebook').button('option', 'label', 'Loading');
-                    $('button#save_notebook').button('disable');
+                    this.element.find('button#save_notebook').button('disable');
-                    $('button#publish_notebook').button('disable');
+                    IPython.print_widget.disable();
                 };
                 IPython.SaveWidget = SaveWidget;
                 return IPython;
             }(IPython));

IPython/frontend/html/notebook/templates/notebook.html

0 +5 -1

             <!DOCTYPE HTML>
             <html>
             <head>
                 <meta charset="utf-8">
                 <title>IPython Notebook</title>
                 <link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" />
             <!--     <link rel="stylesheet" href="static/jquery/css/themes/rocket/jquery-wijmo.css" type="text/css" /> -->
             <!--    <link rel="stylesheet" href="static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css" type="text/css" />-->
                 <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" charset="utf-8"></script>
                 <!-- <script type='text/javascript' src='static/mathjax/MathJax.js?config=TeX-AMS_HTML' charset='utf-8'></script> -->
                 <script type="text/javascript">
                 if (typeof MathJax == 'undefined') {
                     console.log("Trying to load local copy of MathJax");
                     document.write(unescape("%3Cscript type='text/javascript' src='static/mathjax/MathJax.js%3Fconfig=TeX-AMS_HTML' charset='utf-8'%3E%3C/script%3E"));
                 }
                 </script>
                 <link rel="stylesheet" href="static/codemirror-2.12/lib/codemirror.css">
                 <link rel="stylesheet" href="static/codemirror-2.12/mode/rst/rst.css">
                 <link rel="stylesheet" href="static/codemirror-2.12/theme/ipython.css">
                 <link rel="stylesheet" href="static/codemirror-2.12/theme/default.css">
                 <link rel="stylesheet" href="static/css/boilerplate.css" type="text/css" />
                 <link rel="stylesheet" href="static/css/layout.css" type="text/css" />
                 <link rel="stylesheet" href="static/css/base.css" type="text/css" />
                 <link rel="stylesheet" href="static/css/notebook.css" type="text/css" />
                 <link rel="stylesheet" href="static/css/renderedhtml.css" type="text/css" />
             </head>
             <body>
             <div id="header">
                 <span id="ipython_notebook"><h1>IPython Notebook</h1></span>
                 <span id="save_widget">
                     <input type="text" id="notebook_name" size="20"></textarea>
                     <span id="notebook_id" style="display:none">{{notebook_id}}</span>
                     <button id="save_notebook">Save</button>
-                    <button id="publish_notebook">Publish</button>
                 </span>
                 <span id="kernel_status">Idle</span>
             </div>
             <div id="main_app">
                 <div id="left_panel">
                     <div id="notebook_section">
                         <h3 class="section_header">Notebook</h3>
                         <div class="section_content">
                             <div class="section_row">
                                 <span id="new_open" class="section_row_buttons">
                                     <button id="new_notebook">New</button>
                                     <button id="open_notebook">Open</button>
                                 </span>
                                 <span class="section_row_header">Actions</span>
                             </div>
                             <div class="section_row">
                                 <span>
                                     <select id="download_format">
                                         <option value="xml">xml</option>
                                         <option value="json">json</option>
                                         <option value="py">py</option>
                                     </select>
                                 </span>
                                 <span class="section_row_buttons">
+                                    <span id="print_widget">
+                                        <button id="print_notebook">Print/HTML</button>
+                                    </span>
                                     <button id="download_notebook">Export</button>
                                 </span>
                             </div>
                         </div>
                     </div>
                     <div id="cell_section">
                         <h3 class="section_header">Cell</h3>
                         <div class="section_content">
                             <div class="section_row">
                                 <span class="section_row_buttons">
                                     <button id="delete_cell">Delete</button>
                                 </span>
                                 <span class="section_row_header">Actions</span>
                             </div>
                             <div class="section_row">
                                 <span id="cell_type" class="section_row_buttons">
                                     <button id="to_code">Code</button>
                                     <button id="to_html">HTML</button>
                                     <button id="to_markdown">Markdown</button>
                                 </span>
                                  <span class="button_label">Format</span>
                             </div>
                             <div class="section_row">
                                 <span id="toggle_output" class="section_row_buttons">
                                     <button id="collapse_cell">Collapse</button>
                                     <button id="expand_cell">Expand</button>
                                     <button id="clear_all_output">ClearAll</button>
                                 </span>
                                 <span class="button_label">Output</span>
                             </div>
                             <div class="section_row">
                                 <span id="insert" class="section_row_buttons">
                                     <button id="insert_cell_above">Above</button>
                                     <button id="insert_cell_below">Below</button>
                                 </span>
                                 <span class="button_label">Insert</span>
                             </div>
                             <div class="section_row">
                                 <span id="move" class="section_row_buttons">
                                     <button id="move_cell_up">Up</button>
                                     <button id="move_cell_down">Down</button>
                                 </span>
                                 <span class="button_label">Move</span>
                             </div>
                             <div class="section_row">
                                 <span id="run_cells" class="section_row_buttons">
                                     <button id="run_selected_cell">Selected</button>
                                     <button id="run_all_cells">All</button>
                                 </span>
                                 <span class="button_label">Run</span>
                             </div>
                             <div class="section_row">
                                 <span id="autoindent_span">
                                     <input type="checkbox" id="autoindent" checked="true"></input>
                                 </span>
                                 <span class="checkbox_label">Autoindent:</span>
                             </div>
                         </div>
                     </div>
                     <div id="kernel_section">
                         <h3 class="section_header">Kernel</h3>
                         <div class="section_content">
                             <div class="section_row">
                                 <span id="int_restart" class="section_row_buttons">
                                     <button id="int_kernel">Interrupt</button>
                                     <button id="restart_kernel">Restart</button>
                                 </span>
                                 <span class="section_row_header">Actions</span>
                             </div>
                             <div class="section_row">
                                 <span id="kernel_persist">
                                     <input type="checkbox" id="kill_kernel"></input>
                                 </span>
                                 <span class="checkbox_label">Kill kernel upon exit:</span>
                             </div>
                         </div>
                     </div>
                     <div id="help_section">
                         <h3 class="section_header">Help</h3>
                         <div class="section_content">
                             <div class="section_row">
                                 <span id="help_buttons0" class="section_row_buttons">
                                     <button id="python_help"><a href="http://docs.python.org" target="_blank">Python</a></button>
                                     <button id="ipython_help"><a href="http://ipython.org/documentation.html" target="_blank">IPython</a></button>
                                     <button id="numpy_help"><a href="http://docs.scipy.org/doc/numpy/reference/" target="_blank">NumPy</a></button>
                                 </span>
                                 <span class="section_row_header">Links</span>
                             </div>
                             <div class="section_row">
                                 <span id="help_buttons1" class="section_row_buttons">
                                     <button id="matplotlib_help"><a href="http://matplotlib.sourceforge.net/" target="_blank">MPL</a></button>
                                     <button id="scipy_help"><a href="http://docs.scipy.org/doc/scipy/reference/" target="_blank">SciPy</a></button>
                                     <button id="sympy_help"><a href="http://docs.sympy.org/dev/index.html" target="_blank">SymPy</a></button>
                                 </span>
                             </div>
                             <div class="section_row">
                                 <span class="help_string">run selected cell</span>
                                 <span class="help_string_label">Shift-Enter |</span>
                             </div>
                             <div class="section_row">
                                 <span class="help_string">run in terminal mode</span>
                                 <span class="help_string_label">Ctrl-Enter  |</span>
                             </div>
                         </div>
                     </div>
                 </div>
                 <div id="left_panel_splitter"></div>
                 <div id="notebook_panel">
                     <div id="notebook"></div>
                     <div id="pager_splitter"></div>
                     <div id="pager"></div>
                 </div>
             </div>
             <script src="static/jquery/js/jquery-1.6.2.min.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/jquery/js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/jquery/js/jquery.autogrow.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/codemirror-2.12/lib/codemirror.js" charset="utf-8"></script>
             <script src="static/codemirror-2.12/mode/python/python.js" charset="utf-8"></script>
             <script src="static/codemirror-2.12/mode/htmlmixed/htmlmixed.js" charset="utf-8"></script>
             <script src="static/codemirror-2.12/mode/xml/xml.js" charset="utf-8"></script>
             <script src="static/codemirror-2.12/mode/javascript/javascript.js" charset="utf-8"></script>
             <script src="static/codemirror-2.12/mode/css/css.js" charset="utf-8"></script>
             <script src="static/codemirror-2.12/mode/rst/rst.js" charset="utf-8"></script>
             <script src="static/pagedown/Markdown.Converter.js" charset="utf-8"></script>
             <script src="static/js/namespace.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/js/utils.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/js/cell.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/js/codecell.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/js/textcell.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/js/kernel.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/js/kernelstatus.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/js/layout.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/js/savewidget.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/js/pager.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/js/panelsection.js" type="text/javascript" charset="utf-8"></script>
+            <script src="static/js/printwidget.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/js/leftpanel.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/js/notebook.js" type="text/javascript" charset="utf-8"></script>
             <script src="static/js/notebook_main.js" type="text/javascript" charset="utf-8"></script>
             </body>
             </html>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages