##// END OF EJS Templates
updating my code to incorporate upstream changes; resolved a merge conflict in IPython/lib/display.py
updating my code to incorporate upstream changes; resolved a merge conflict in IPython/lib/display.py

File last commit:

r8207:b270f568
r8798:c1e52e56 merge
Show More
layoutmanager.js
62 lines | 2.1 KiB | application/javascript | JavascriptLexer
Brian E. Granger
More review changes....
r4609 //----------------------------------------------------------------------------
// Copyright (C) 2008-2011 The IPython Development Team
//
// 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
Left panel is now working.
r4363
//============================================================================
// Layout
//============================================================================
var IPython = (function (IPython) {
var LayoutManager = function () {
this.bind_events();
};
LayoutManager.prototype.bind_events = function () {
$(window).resize($.proxy(this.do_resize,this));
};
Matthias BUSSONNIER
Make pager resizable, and remember size......
r6723 LayoutManager.prototype.app_height = function() {
Brian E. Granger
Left panel is now working.
r4363 var win = $(window);
var w = win.width();
var h = win.height();
Brian Granger
Further work on the toolbar UI....
r5994 var header_height;
if ($('div#header').css('display') === 'none') {
header_height = 0;
} else {
header_height = $('div#header').outerHeight(true);
}
Brian Granger
Implemented menu based UI using Wijmo.
r5857 var menubar_height = $('div#menubar').outerHeight(true);
Brian Granger
Further work on the toolbar UI....
r5994 var toolbar_height;
Matthias BUSSONNIER
#toolbar -> #maintoolbar
r8207 if ($('div#maintoolbar').css('display') === 'none') {
Brian Granger
Further work on the toolbar UI....
r5994 toolbar_height = 0;
} else {
Matthias BUSSONNIER
#toolbar -> #maintoolbar
r8207 toolbar_height = $('div#maintoolbar').outerHeight(true);
Brian Granger
Further work on the toolbar UI....
r5994 }
Matthias BUSSONNIER
Make pager resizable, and remember size......
r6723 return h-header_height-menubar_height-toolbar_height; // content height
}
LayoutManager.prototype.do_resize = function () {
var app_height = this.app_height() // content height
Brian E. Granger
Left panel is now working.
r4363
Brian Granger
Major refactoring of notebook....
r6193 $('div#main_app').height(app_height); // content+padding+border height
Brian E. Granger
Left panel is now working.
r4363
var pager_height = IPython.pager.percentage_height*app_height;
var pager_splitter_height = $('div#pager_splitter').outerHeight(true);
$('div#pager').height(pager_height);
if (IPython.pager.expanded) {
$('div#notebook').height(app_height-pager_height-pager_splitter_height);
} else {
$('div#notebook').height(app_height-pager_splitter_height);
}
};
Stefan van der Walt
Clean up javascript based on js2-mode feedback.
r5479 IPython.LayoutManager = LayoutManager;
Brian E. Granger
Left panel is now working.
r4363
return IPython;
}(IPython));