##// END OF EJS Templates
Trigger app_initialized event *after* the 'global' IPython object is initialized
Jason Grout -
Show More
@@ -18,6 +18,7 b' require(['
18 'notebook/js/savewidget',
18 'notebook/js/savewidget',
19 'notebook/js/keyboardmanager',
19 'notebook/js/keyboardmanager',
20 'notebook/js/config',
20 'notebook/js/config',
21 'custom/custom',
21 ], function(
22 ], function(
22 IPython,
23 IPython,
23 $,
24 $,
@@ -113,11 +114,8 b' require(['
113 // only do this once
114 // only do this once
114 events.off('notebook_loaded.Notebook', first_load);
115 events.off('notebook_loaded.Notebook', first_load);
115 };
116 };
116
117 events.on('notebook_loaded.Notebook', first_load);
117 events.on('notebook_loaded.Notebook', first_load);
118 events.trigger('app_initialized.NotebookApp');
118
119 notebook.load_notebook(common_options.notebook_name, common_options.notebook_path);
120
121 IPython.page = page;
119 IPython.page = page;
122 IPython.layout_manager = layout_manager;
120 IPython.layout_manager = layout_manager;
123 IPython.notebook = notebook;
121 IPython.notebook = notebook;
@@ -132,4 +130,8 b' require(['
132 IPython.save_widget = save_widget;
130 IPython.save_widget = save_widget;
133 IPython.config = user_config;
131 IPython.config = user_config;
134 IPython.tooltip = notebook.tooltip;
132 IPython.tooltip = notebook.tooltip;
133
134 events.trigger('app_initialized.NotebookApp');
135 notebook.load_notebook(common_options.notebook_name, common_options.notebook_path);
136
135 });
137 });
@@ -14,6 +14,7 b' require(['
14 'auth/js/loginwidget',
14 'auth/js/loginwidget',
15 'jqueryui',
15 'jqueryui',
16 'bootstrap',
16 'bootstrap',
17 'custom/custom',
17 ], function(
18 ], function(
18 IPython,
19 IPython,
19 $,
20 $,
@@ -90,6 +91,16 b' require(['
90 enable_autorefresh();
91 enable_autorefresh();
91
92
92 page.show();
93 page.show();
94
95 // For backwards compatability.
96 IPython.page = page;
97 IPython.notebook_list = notebook_list;
98 IPython.cluster_list = cluster_list;
99 IPython.session_list = session_list;
100 IPython.kernel_list = kernel_list;
101 IPython.login_widget = login_widget;
102 IPython.events = events;
103
93 events.trigger('app_initialized.DashboardApp');
104 events.trigger('app_initialized.DashboardApp');
94
105
95 // bound the upload method to the on change of the file select list
106 // bound the upload method to the on change of the file select list
@@ -107,12 +118,4 b' require(['
107 $("#tabs").find("a[href=" + window.location.hash + "]").click();
118 $("#tabs").find("a[href=" + window.location.hash + "]").click();
108 }
119 }
109
120
110 // For backwards compatability.
111 IPython.page = page;
112 IPython.notebook_list = notebook_list;
113 IPython.cluster_list = cluster_list;
114 IPython.session_list = session_list;
115 IPython.kernel_list = kernel_list;
116 IPython.login_widget = login_widget;
117 IPython.events = events;
118 });
121 });
General Comments 0
You need to be logged in to leave comments. Login now