diff --git a/notebook/static/terminal/js/main.js b/notebook/static/terminal/js/main.js index d1b02f6c1..e976ca754 100644 --- a/notebook/static/terminal/js/main.js +++ b/notebook/static/terminal/js/main.js @@ -6,11 +6,13 @@ require('xterm/src/xterm.css'); require([ 'base/js/utils', 'base/js/page', + 'auth/js/loginwidget', 'services/config', 'terminal/js/terminado', ], function( utils, page, + loginwidget, configmod, terminado ){ @@ -18,13 +20,17 @@ require([ requirejs(['custom/custom'], function() {}); page = new page.Page(); - var config = new configmod.ConfigSection('terminal', - {base_url: utils.get_body_data('baseUrl')}); + var common_options = { + base_url : utils.get_body_data("baseUrl"), + }; + + var config = new configmod.ConfigSection('terminal', common_options); config.load(); - var common_config = new configmod.ConfigSection('common', - {base_url: utils.get_body_data('baseUrl')}); + var common_config = new configmod.ConfigSection('common', common_options); common_config.load(); + var login_widget = new loginwidget.LoginWidget('span#login_widget', common_options); + // Test size: 25x80 var termRowHeight = function(){ return 1.00 * $("#dummy-screen")[0].offsetHeight / 25;}; // 1.02 here arrived at by trial and error to make the spacing look right