Fix instantiating config in editor and terminal

IPython/html/static/edit/js/main.js

@@ -1,78 +1,78
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
 
 require([
     'base/js/namespace',
     'base/js/utils',
     'base/js/page',
     'base/js/events',
     'contents',
     'services/config',
     'edit/js/editor',
     'edit/js/menubar',
     'edit/js/savewidget',
     'edit/js/notificationarea',
     'custom/custom',
 ], function(
     IPython,
     utils,
     page,
     events,
     contents,
     configmod,
     editmod,
     menubar,
     savewidget,
     notificationarea
     ){
     page = new page.Page();
 
     var base_url = utils.get_body_data('baseUrl');
     var file_path = utils.get_body_data('filePath');
     contents = new contents.Contents({base_url: base_url});
     var config = new configmod.ConfigSection('edit', {base_url: base_url});
     config.load();
-    var common_config = new configmod.ConfigSection('common', common_options);
+    var common_config = new configmod.ConfigSection('common', {base_url: base_url});
     common_config.load();
     
     var editor = new editmod.Editor('#texteditor-container', {
         base_url: base_url,
         events: events,
         contents: contents,
         file_path: file_path,
         config: config,
     });
     
     // Make it available for debugging
     IPython.editor = editor;
     
     var save_widget = new savewidget.SaveWidget('span#save_widget', {
         editor: editor,
         events: events,
     });
     
     var menus = new menubar.MenuBar('#menubar', {
         base_url: base_url,
         editor: editor,
         events: events,
         save_widget: save_widget,
     });
     
     var notification_area = new notificationarea.EditorNotificationArea(
         '#notification_area', {
         events: events,
     });
     notification_area.init_notification_widgets();
 
     utils.load_extensions_from_config(config);
     utils.load_extensions_from_config(common_config);
     editor.load();
     page.show();
 
     window.onbeforeunload = function () {
         if (editor.save_enabled && !editor.codemirror.isClean(editor.generation)) {
             return "Unsaved changes will be lost. Close anyway?";
         }
     };
 
 });

IPython/html/static/terminal/js/main.js

@@ -1,61 +1,62
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
 
 require([
     'jquery',
     'termjs',
     'base/js/utils',
     'base/js/page',
     'services/config',
     'terminal/js/terminado',
     'custom/custom',
 ], function(
     $, 
     termjs,
     utils,
     page,
     configmod,
     terminado
     ){
     page = new page.Page();
 
-    var common_config = new configmod.ConfigSection('common', common_options);
+    var common_config = new configmod.ConfigSection('common', 
+                                    {base_url: utils.get_body_data('baseUrl')});
     common_config.load();
 
     // 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
     var termColWidth =  function() { return 1.02 * $("#dummy-screen-rows")[0].offsetWidth / 80;};
 
     var base_url = utils.get_body_data('baseUrl');
     var ws_path = utils.get_body_data('wsPath');
     var ws_url = location.protocol.replace('http', 'ws') + "//" + location.host
                                     + base_url + ws_path;
     
     var header = $("#header")[0]
     function calculate_size() {
         height = window.innerHeight - header.offsetHeight;
         width = window.innerWidth;
         var rows = Math.min(1000, Math.max(20, Math.floor(height/termRowHeight())-1));
         var cols = Math.min(1000, Math.max(40, Math.floor(width/termColWidth())-1));
         console.log("resize to :", rows , 'rows by ', cols, 'columns');
         return {rows: rows, cols: cols};
     }
     
     page.show_header();
     
     size = calculate_size();
     var terminal = terminado.make_terminal($("#terminado-container")[0], size, ws_url);
     
     page.show_site();
     
     utils.load_extensions_from_config(common_config);
     
     window.onresize = function() { 
       var geom = calculate_size();
       terminal.term.resize(geom.cols, geom.rows);
       terminal.socket.send(JSON.stringify(["set_size", geom.rows, geom.cols,
                                     window.innerHeight, window.innerWidth]));
     };
 
 });