Merge pull request #7756 from Carreau/common_conf

pass common config to contents manager

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

@@ -1,93 +1,97 b''
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
 
 require([
     'jquery',
     '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
     ){
+    "use strict";
     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', {base_url: base_url});
     common_config.load();
+    contents = new contents.Contents({
+        base_url: base_url,
+        common_config: common_config
+    });
     
     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,
     });
     editor.notification_area = notification_area;
     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?";
         }
     };
 
     // Make sure the codemirror editor is sized appropriatley.
     var _handle_resize = function() {
         var backdrop = $("#texteditor-backdrop");
 
         // account for padding on the backdrop wrapper
         var padding = backdrop.outerHeight(true) - backdrop.height();
         $('div.CodeMirror').height($("#site").height() - padding);
     };
     $(window).resize(_handle_resize);
 
     // On document ready, resize codemirror.
     $(document).ready(_handle_resize);
 });

IPython/html/static/notebook/js/main.js

@@ -1,159 +1,160 b''
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
 
 require([
     'base/js/namespace',
     'jquery',
     'notebook/js/notebook',
     'contents',
     'services/config',
     'base/js/utils',
     'base/js/page',
     'base/js/events',
     'auth/js/loginwidget',
     'notebook/js/maintoolbar',
     'notebook/js/pager',
     'notebook/js/quickhelp',
     'notebook/js/menubar',
     'notebook/js/notificationarea',
     'notebook/js/savewidget',
     'notebook/js/actions',
     'notebook/js/keyboardmanager',
     'notebook/js/kernelselector',
     'codemirror/lib/codemirror',
     'notebook/js/about',
     // only loaded, not used, please keep sure this is loaded last
     'custom/custom'
 ], function(
     IPython, 
     $,
     notebook, 
     contents,
     configmod,
     utils, 
     page, 
     events,
     loginwidget, 
     maintoolbar, 
     pager, 
     quickhelp, 
     menubar, 
     notificationarea, 
     savewidget,
     actions,
     keyboardmanager,
     kernelselector,
     CodeMirror,
     about,
     // please keep sure that even if not used, this is loaded last
     custom
     ) {
     "use strict";
 
     // compat with old IPython, remove for IPython > 3.0
     window.CodeMirror = CodeMirror;
 
     var common_options = {
         ws_url : utils.get_body_data("wsUrl"),
         base_url : utils.get_body_data("baseUrl"),
         notebook_path : utils.get_body_data("notebookPath"),
         notebook_name : utils.get_body_data('notebookName')
     };
 
     var config_section = new configmod.ConfigSection('notebook', common_options);
     config_section.load();
     var common_config = new configmod.ConfigSection('common', common_options);
     common_config.load();
     var page = new page.Page();
     var pager = new pager.Pager('div#pager', {
         events: events});
     var acts = new actions.init();
     var keyboard_manager = new keyboardmanager.KeyboardManager({
         pager: pager, 
         events: events, 
         actions: acts });
     var save_widget = new savewidget.SaveWidget('span#save_widget', {
         events: events, 
         keyboard_manager: keyboard_manager});
-    var contents = new contents.Contents($.extend({
-        events: events, config:config_section},
-        common_options));
+    var contents = new contents.Contents({
+          base_url: common_options.base_url,
+          common_config: common_config
+        });
     var notebook = new notebook.Notebook('div#notebook', $.extend({
         events: events,
         keyboard_manager: keyboard_manager,
         save_widget: save_widget,
         contents: contents,
         config: config_section},
         common_options));
     var login_widget = new loginwidget.LoginWidget('span#login_widget', common_options);
     var toolbar = new maintoolbar.MainToolBar('#maintoolbar-container', {
         notebook: notebook, 
         events: events, 
         actions: acts}); 
     var quick_help = new quickhelp.QuickHelp({
         keyboard_manager: keyboard_manager, 
         events: events,
         notebook: notebook});
     keyboard_manager.set_notebook(notebook);
     keyboard_manager.set_quickhelp(quick_help);
     var menubar = new menubar.MenuBar('#menubar', $.extend({
         notebook: notebook, 
         contents: contents,
         events: events, 
         save_widget: save_widget, 
         quick_help: quick_help}, 
         common_options));
     var notification_area = new notificationarea.NotebookNotificationArea(
         '#notification_area', {
         events: events, 
         save_widget: save_widget, 
         notebook: notebook,
         keyboard_manager: keyboard_manager});
     notification_area.init_notification_widgets();
     var kernel_selector = new kernelselector.KernelSelector(
         '#kernel_logo_widget', notebook);
 
     $('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) {
         $('head').append('<style>.CodeMirror span { vertical-align: bottom; }</style>');
     }
     $('#fonttest').remove();
 
     page.show();
 
     var first_load = function () {
         var hash = document.location.hash;
         if (hash) {
             document.location.hash = '';
             document.location.hash = hash;
         }
         notebook.set_autosave_interval(notebook.minimum_autosave_interval);
         // only do this once
         events.off('notebook_loaded.Notebook', first_load);
     };
     events.on('notebook_loaded.Notebook', first_load);
     
     IPython.page = page;
     IPython.notebook = notebook;
     IPython.contents = contents;
     IPython.pager = pager;
     IPython.quick_help = quick_help;
     IPython.login_widget = login_widget;
     IPython.menubar = menubar;
     IPython.toolbar = toolbar;
     IPython.notification_area = notification_area;
     IPython.keyboard_manager = keyboard_manager;
     IPython.save_widget = save_widget;
     IPython.tooltip = notebook.tooltip;
 
     events.trigger('app_initialized.NotebookApp');
     utils.load_extensions_from_config(config_section);
     utils.load_extensions_from_config(common_config);
     notebook.load_notebook(common_options.notebook_path);
 
 });

IPython/html/static/tree/js/main.js

@@ -1,179 +1,180 b''
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
 
 require([
     'jquery',
     'base/js/namespace',
     'base/js/dialog',
     'base/js/events',
     'base/js/page',
     'base/js/utils',
     'services/config',
     'contents',
     'tree/js/notebooklist',
     'tree/js/clusterlist',
     'tree/js/sessionlist',
     'tree/js/kernellist',
     'tree/js/terminallist',
     'tree/js/newnotebook',
     'auth/js/loginwidget',
     // only loaded, not used:
     'jqueryui',
     'bootstrap',
     'custom/custom',
 ], function(
     $,
     IPython,
     dialog,
     events,
     page,
     utils,
     config,
     contents_service,
     notebooklist,
     clusterlist,
     sesssionlist,
     kernellist,
     terminallist,
     newnotebook,
     loginwidget){
     "use strict";
 
     page = new page.Page();
     
     var common_options = {
         base_url: utils.get_body_data("baseUrl"),
         notebook_path: utils.get_body_data("notebookPath"),
     };
     var cfg = new config.ConfigSection('tree', common_options);
     cfg.load();
     common_options.config = cfg;
     var common_config = new config.ConfigSection('common', common_options);
     common_config.load();
     
     var session_list = new sesssionlist.SesssionList($.extend({
         events: events}, 
         common_options));
-    var contents = new contents_service.Contents($.extend({
-        events: events},
-        common_options));
+    var contents = new contents_service.Contents({
+        base_url: common_options.base_url,
+        common_config: common_config
+    });
     var notebook_list = new notebooklist.NotebookList('#notebook_list', $.extend({
         contents: contents,
         session_list:  session_list}, 
         common_options));
     var cluster_list = new clusterlist.ClusterList('#cluster_list', common_options);
     var kernel_list = new kernellist.KernelList('#running_list',  $.extend({
         session_list:  session_list}, 
         common_options));
     
     var terminal_list;
     if (utils.get_body_data("terminalsAvailable") === "True") {
         terminal_list = new terminallist.TerminalList('#terminal_list', common_options);
     }
 
     var login_widget = new loginwidget.LoginWidget('#login_widget', common_options);
 
     var new_buttons = new newnotebook.NewNotebookWidget("#new-buttons",
         $.extend(
             {contents: contents},
             common_options
         )
     );
 
     var interval_id=0;
     // auto refresh every xx secondes, no need to be fast,
     //  update is done most of the time when page get focus
     IPython.tree_time_refresh = 60; // in sec
 
     // limit refresh on focus at 1/10sec, otherwise this
     // can cause too frequent refresh on switching through windows or tabs.
     IPython.min_delta_refresh = 10; // in sec
 
     var _last_refresh = null;
 
     var _refresh_list = function(){
         _last_refresh = new Date();
         session_list.load_sessions();
         cluster_list.load_list();
         if (terminal_list) {
             terminal_list.load_terminals();
         }
-    }
+    };
 
     var enable_autorefresh = function(){
         /**
          *refresh immediately , then start interval
          */
-        var now = new Date()
+        var now = new Date();
 
         if (now - _last_refresh < IPython.min_delta_refresh*1000){
-            console.log("Reenabling autorefresh too close to last tree refresh, not refreshing immediately again.")
+            console.log("Reenabling autorefresh too close to last tree refresh, not refreshing immediately again.");
         } else {
             _refresh_list();
         }
         if (!interval_id){
             interval_id = setInterval(_refresh_list,
                     IPython.tree_time_refresh*1000
             );
         }
     };
 
     var disable_autorefresh = function(){
         clearInterval(interval_id);
         interval_id = 0;
     };
 
     // stop autorefresh when page lose focus
     $(window).blur(function() {
         disable_autorefresh();
     });
 
     //re-enable when page get focus back
     $(window).focus(function() {
         enable_autorefresh();
     });
 
     // finally start it, it will refresh immediately
     enable_autorefresh();
 
     page.show();
 
     // For backwards compatability.
     IPython.page = page;
     IPython.notebook_list = notebook_list;
     IPython.cluster_list = cluster_list;
     IPython.session_list = session_list;
     IPython.kernel_list = kernel_list;
     IPython.login_widget = login_widget;
     IPython.new_notebook_widget = new_buttons;
 
     events.trigger('app_initialized.DashboardApp');
     utils.load_extensions_from_config(cfg);
     utils.load_extensions_from_config(common_config);
     
     // bound the upload method to the on change of the file select list
     $("#alternate_upload").change(function (event){
         notebook_list.handleFilesUpload(event,'form');
     });
     
     // set hash on tab click
     $("#tabs").find("a").click(function(e) {
         // Prevent the document from jumping when the active tab is changed to a 
         // tab that has a lot of content.
         e.preventDefault();
 
         // Set the hash without causing the page to jump.
         // http://stackoverflow.com/a/14690177/2824256
         var hash = $(this).attr("href");
         if(window.history.pushState) {
             window.history.pushState(null, null, hash);
         } else {
             window.location.hash = hash;
         }
     });
     
     // load tab if url hash
     if (window.location.hash) {
         $("#tabs").find("a[href=" + window.location.hash + "]").click();
     }
 });