mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-15 04:00:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't load main files - they should never be referenced anyways,

Browse Source 
they break things by resetting global page state.
Also put URL in string
This commit is contained in:
Jonathan Frederic 2016-02-10 15:09:20 -08:00
parent e64f1f9dc2
commit 4b0aa51ce7
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
notebook/static/index.js
View File

@ -4,7 +4,7 @@ __webpack_public_path__ = window['staticURL'] + 'built/';
module.exports = { module.exports = {
'edit/js/savewidget': require('./edit/js/savewidget.js'), 'edit/js/savewidget': require('./edit/js/savewidget.js'),
'edit/js/main': require('./edit/js/main.js'), // 'edit/js/main': require('./edit/js/main.js'),
'edit/js/menubar': require('./edit/js/menubar.js'), 'edit/js/menubar': require('./edit/js/menubar.js'),
'edit/js/editor': require('./edit/js/editor.js'), 'edit/js/editor': require('./edit/js/editor.js'),
'edit/js/notificationarea': require('./edit/js/notificationarea.js'), 'edit/js/notificationarea': require('./edit/js/notificationarea.js'),
@ -17,15 +17,15 @@ module.exports = {
'base/js/events': require('./base/js/events.js'), 'base/js/events': require('./base/js/events.js'),
'base/js/security': require('./base/js/security.js'), 'base/js/security': require('./base/js/security.js'),
'base/js/page': require('./base/js/page.js'), 'base/js/page': require('./base/js/page.js'),
'auth/js/main': require('./auth/js/main.js'), // 'auth/js/main': require('./auth/js/main.js'),
'auth/js/logoutmain': require('./auth/js/logoutmain.js'), 'auth/js/logoutmain': require('./auth/js/logoutmain.js'),
'auth/js/loginmain': require('./auth/js/loginmain.js'), 'auth/js/loginmain': require('./auth/js/loginmain.js'),
'auth/js/loginwidget': require('./auth/js/loginwidget.js'), 'auth/js/loginwidget': require('./auth/js/loginwidget.js'),
'terminal/js/main': require('./terminal/js/main.js'), // 'terminal/js/main': require('./terminal/js/main.js'),
'terminal/js/terminado': require('./terminal/js/terminado.js'), 'terminal/js/terminado': require('./terminal/js/terminado.js'),
'notebook/js/toolbar': require('./notebook/js/toolbar.js'), 'notebook/js/toolbar': require('./notebook/js/toolbar.js'),
'notebook/js/savewidget': require('./notebook/js/savewidget.js'), 'notebook/js/savewidget': require('./notebook/js/savewidget.js'),
'notebook/js/main': require('./notebook/js/main.js'), // 'notebook/js/main': require('./notebook/js/main.js'),
'notebook/js/completer': require('./notebook/js/completer.js'), 'notebook/js/completer': require('./notebook/js/completer.js'),
'notebook/js/contexthint': require('./notebook/js/contexthint.js'), 'notebook/js/contexthint': require('./notebook/js/contexthint.js'),
'notebook/js/textcell': require('./notebook/js/textcell.js'), 'notebook/js/textcell': require('./notebook/js/textcell.js'),
@ -56,7 +56,7 @@ module.exports = {
'notebook/js/celltoolbar': require('./notebook/js/celltoolbar.js'), 'notebook/js/celltoolbar': require('./notebook/js/celltoolbar.js'),
'notebook/js/commandpalette': require('./notebook/js/commandpalette.js'), 'notebook/js/commandpalette': require('./notebook/js/commandpalette.js'),
'tree/js/sessionlist': require('./tree/js/sessionlist.js'), 'tree/js/sessionlist': require('./tree/js/sessionlist.js'),
'tree/js/main': require('./tree/js/main.js'), // 'tree/js/main': require('./tree/js/main.js'),
'tree/js/kernellist': require('./tree/js/kernellist.js'), 'tree/js/kernellist': require('./tree/js/kernellist.js'),
'tree/js/newnotebook': require('./tree/js/newnotebook.js'), 'tree/js/newnotebook': require('./tree/js/newnotebook.js'),
'tree/js/terminallist': require('./tree/js/terminallist.js'), 'tree/js/terminallist': require('./tree/js/terminallist.js'),
@ -67,4 +67,4 @@ module.exports = {
'services/kernels/comm': require('./services/kernels/comm.js'), 'services/kernels/comm': require('./services/kernels/comm.js'),
'services/kernels/kernel': require('./services/kernels/kernel.js'), 'services/kernels/kernel': require('./services/kernels/kernel.js'),
'services/config': require('./services/config.js'), 'services/config': require('./services/config.js'),
}; };

2
notebook/templates/page.html
View File

@ -23,7 +23,7 @@
<script src="{{static_url("components/jquery-typeahead/dist/jquery.typeahead.js") }}" type="text/javascript" charset="utf-8"></script> <!-- extends window.$ --> <script src="{{static_url("components/jquery-typeahead/dist/jquery.typeahead.js") }}" type="text/javascript" charset="utf-8"></script> <!-- extends window.$ -->
<script src="{{static_url("components/requirejs/require.js") }}" type="text/javascript" charset="utf-8"></script> <script src="{{static_url("components/requirejs/require.js") }}" type="text/javascript" charset="utf-8"></script>
<script> <script>
window['staticURL'] = {{static_url("", include_version=False)}}; window['staticURL'] = "{{static_url("", include_version=False)}}";
require.config({ require.config({
{% if version_hash %} {% if version_hash %}
urlArgs: "v={{version_hash}}", urlArgs: "v={{version_hash}}",

10
notebook/tests/base/deprecated-require-paths.js
View File

@ -13,7 +13,7 @@ casper.notebook_test(function () {
[ [
'edit/js/savewidget', 'edit/js/savewidget',
'edit/js/main', // 'edit/js/main',
'edit/js/menubar', 'edit/js/menubar',
'edit/js/editor', 'edit/js/editor',
'edit/js/notificationarea', 'edit/js/notificationarea',
@ -26,15 +26,15 @@ casper.notebook_test(function () {
'base/js/events', 'base/js/events',
'base/js/security', 'base/js/security',
'base/js/page', 'base/js/page',
'auth/js/main', // 'auth/js/main',
'auth/js/logoutmain', 'auth/js/logoutmain',
'auth/js/loginmain', 'auth/js/loginmain',
'auth/js/loginwidget', 'auth/js/loginwidget',
'terminal/js/main', // 'terminal/js/main',
'terminal/js/terminado', 'terminal/js/terminado',
'notebook/js/toolbar', 'notebook/js/toolbar',
'notebook/js/savewidget', 'notebook/js/savewidget',
'notebook/js/main', // 'notebook/js/main',
'notebook/js/completer', 'notebook/js/completer',
'notebook/js/contexthint', 'notebook/js/contexthint',
'notebook/js/textcell', 'notebook/js/textcell',
@ -65,7 +65,7 @@ casper.notebook_test(function () {
'notebook/js/celltoolbar', 'notebook/js/celltoolbar',
'notebook/js/commandpalette', 'notebook/js/commandpalette',
'tree/js/sessionlist', 'tree/js/sessionlist',
'tree/js/main', // 'tree/js/main',
'tree/js/kernellist', 'tree/js/kernellist',
'tree/js/newnotebook', 'tree/js/newnotebook',
'tree/js/terminallist', 'tree/js/terminallist',