##// END OF EJS Templates
Merge pull request #2854 from minrk/2853b...
Merge pull request #2854 from minrk/2853b Move kernel code into IPython.kernel inprocess Kernel in kernel.inprocess zmq Kernel in kernel.zmq KernelManager stuff and ulities in top-level kernel Main functional change: allow custom kernel Popen command - [x] adds `KernelManager.kernel_cmd` configurable for launching a custom kernel - [x] splits entry_point.base_launch_kernel into two steps: making the launch cmd and launching the subprocess - [x] figure out where the entry_point functions belong, if it should be anywhere else - [x] move IPython.zmq.kernelmanagerabc to IPython.kernel.kernelmanagerabc - [x] move IPython.lib.kernel/IPython/zmq.entry_point to IPython.kernel.launcher / connect - [x] move zmq.ipkernelapp.IPKernelApp to zmq.kernelapp (I'll look at merging the classes, and see if it makes - [x] move IPython.zmq to IPython.kernel.zmq - [x] move IPython.inprocess to IPython.kernel.inprocess - [x] move embed_kernel from zmq.ipkernelapp to zmq.embed - [x] move MultiKernelManager to IPython.kernel.multikernelmanager. - [x] move IPython.zmq.blockingkernelmanager to IPython.kernel.blockingkernelmanager. - [x] move IPython.zmq.kernelmanager to IPython.kernel.kernelmanager. - [x] move IPython.ipkernel.Kernel to IPython.kernel.kernel.

File last commit:

r8839:b1ae47fc
r9402:5db16721 merge
Show More
notebookmain.js
87 lines | 3.5 KiB | application/javascript | JavascriptLexer
Brian E. Granger
More review changes....
r4609 //----------------------------------------------------------------------------
Matthias BUSSONNIER
autochange highlight with cell magics...
r8202 // Copyright (C) 2011 The IPython Development Team
Brian E. Granger
More review changes....
r4609 //
// Distributed under the terms of the BSD License. The full license is in
// the file COPYING, distributed as part of this software.
//----------------------------------------------------------------------------
Brian E. Granger
Splitting notebook.js into muliple files for development ease.
r4349
//============================================================================
// On document ready
//============================================================================
$(document).ready(function () {
Brian Granger
Add Ace editing mode for code cells.
r5904
Matthias BUSSONNIER
autochange highlight with cell magics...
r8202 // monkey patch CM to be able to syntax highlight cell magics
// bug reported upstream,
// see https://github.com/marijnh/CodeMirror2/issues/670
if(CodeMirror.getMode(1,'text/plain').indent == undefined ){
console.log('patching CM for undefined indent');
CodeMirror.modes.null = function() { return {token: function(stream) {stream.skipToEnd();},indent : function(){return 0}}}
}
CodeMirror.patchedGetMode = function(config, mode){
var cmmode = CodeMirror.getMode(config, mode);
if(cmmode.indent == null)
{
console.log('patch mode "' , mode, '" on the fly');
cmmode.indent = function(){return 0};
}
return cmmode;
}
// end monkey patching CodeMirror
Aron Ahmadia
partial refactor, can't quite get environments working
r8565 IPython.mathjaxutils.init();
Brian E. Granger
Splitting notebook.js into muliple files for development ease.
r4349
Brian Granger
Major refactoring of notebook....
r6193 IPython.read_only = $('body').data('readOnly') === 'True';
$('div#main_app').addClass('border-box-sizing ui-widget');
Brian E. Granger
Left panel is now working.
r4363 $('div#notebook_panel').addClass('border-box-sizing ui-widget');
Brian Granger
Major refactoring of notebook....
r6193 // The header's bottom border is provided by the menu bar so we remove it.
$('div#header').css('border-bottom-style','none');
Brian E. Granger
Splitting notebook.js into muliple files for development ease.
r4349
Brian Granger
Major refactoring of notebook....
r6193 IPython.page = new IPython.Page();
IPython.markdown_converter = new Markdown.Converter();
Brian E. Granger
Left panel is now working.
r4363 IPython.layout_manager = new IPython.LayoutManager();
Brian E. Granger
Refactoring pager into its own class.
r4357 IPython.pager = new IPython.Pager('div#pager', 'div#pager_splitter');
MinRK
fix quickhelp widget...
r5066 IPython.quick_help = new IPython.QuickHelp('span#quick_help_area');
MinRK
add read-only view for notebooks...
r5200 IPython.login_widget = new IPython.LoginWidget('span#login_widget');
Brian E. Granger
Left panel is now working.
r4363 IPython.notebook = new IPython.Notebook('div#notebook');
Brian Granger
Major refactoring of saving, notification....
r6047 IPython.save_widget = new IPython.SaveWidget('span#save_widget');
Brian Granger
Implemented menu based UI using Wijmo.
r5857 IPython.menubar = new IPython.MenuBar('#menubar')
Matthias BUSSONNIER
#toolbar -> #maintoolbar
r8207 IPython.toolbar = new IPython.MainToolBar('#maintoolbar')
Matthias Bussonnier
tooltip to mac
r7144 IPython.tooltip = new IPython.Tooltip()
Matthias BUSSONNIER
call init method
r8048 IPython.notification_area = new IPython.NotificationArea('#notification_area')
Matthias BUSSONNIER
tweek notebook notification behavior
r8074 IPython.notification_area.init_notification_widgets();
Brian E. Granger
Refactoring pager into its own class.
r4357
Brian E. Granger
Updating font-sizing to use the YUI protocol.
r4379 IPython.layout_manager.do_resize();
Brian E. Granger
Hacks to prevent FLOUC (flash of unformatted content).
r4395
mcelrath
Add bad font detection, and a dialog informing the user.
r7394 $('body').append('<div id="fonttest"><pre><span id="test1">x</span>'+
'<span id="test2" style="font-weight: bold;">x</span>'+
'<span id="test3" style="font-style: italic;">x</span></pre></div>')
var nh = $('#test1').innerHeight();
var bh = $('#test2').innerHeight();
var ih = $('#test3').innerHeight();
if(nh != bh || nh != ih) {
mcelrath
Alternative solution: silently apply some CSS instead of a dialog box.
r7446 $('head').append('<style>.CodeMirror span { vertical-align: bottom; }</style>');
mcelrath
Add bad font detection, and a dialog informing the user.
r7394 }
mcelrath
Fix spurious appearance of #fontarea at end of document.
r7666 $('#fonttest').remove();
mcelrath
Add bad font detection, and a dialog informing the user.
r7394
MinRK
move read_only flag to page-level...
r5213 if(IPython.read_only){
// hide various elements from read-only view
Matthias BUSSONNIER
totally remove pager when read only...
r5655 $('div#pager').remove();
$('div#pager_splitter').remove();
Matthias BUSSONNIER
[notebook] read-only: disable name field
r5659
// set the notebook name field as not modifiable
$('#notebook_name').attr('disabled','disabled')
MinRK
move read_only flag to page-level...
r5213 }
Brian Granger
Major refactoring of notebook....
r6193 IPython.page.show();
Brian E. Granger
Massive work on the notebook document format....
r4484
Brian Granger
Optimizing notebook loading.
r5949 IPython.layout_manager.do_resize();
Brian Granger
Major refactoring of saving, notification....
r6047 $([IPython.events]).on('notebook_loaded.Notebook', function () {
IPython.layout_manager.do_resize();
Mikhail Korobov
Some bugs in js (mostly scoping bugs) are fixed
r8839 });
Brian Granger
Major refactoring of saving, notification....
r6047 IPython.notebook.load_notebook($('body').data('notebookId'));
Brian E. Granger
Implemented basic notebook browser and fixed numerous bugs.
r4488
Brian E. Granger
Splitting notebook.js into muliple files for development ease.
r4349 });