Skip to content

Commit 8c9aebf

Browse files
committed
adds new file custom-preload that is loaded in a different order before the main.js script is executed
1 parent 3196dc6 commit 8c9aebf

File tree

7 files changed

+35
-2
lines changed

7 files changed

+35
-2
lines changed
+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// leave at least 2 line with only a star on it below, or doc generation fails
2+
/**
3+
*
4+
*
5+
* Same goal as custom.js, but loaded in a different order, before the main.js script is executed
6+
*
7+
*
8+
* @module IPython
9+
* @namespace IPython
10+
* @class custompreloadjs
11+
* @static
12+
*/
13+

nbclassic/static/edit/js/main.js

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ requirejs([
1515
'edit/js/notificationarea',
1616
'bidi/bidi',
1717
'auth/js/loginwidget',
18+
'custom-preload'
1819
], function(
1920
$,
2021
contents_service,

nbclassic/static/notebook/js/main.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ requirejs([
5353
'notebook/js/searchandreplace',
5454
'notebook/js/clipboard',
5555
'bidi/bidi',
56-
'notebook/js/celltoolbarpresets/tags'
56+
'notebook/js/celltoolbarpresets/tags',
57+
'custom-preload'
5758
], function(
5859
$,
5960
contents_service,

nbclassic/static/terminal/js/main.js

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ requirejs([
88
'auth/js/loginwidget',
99
'services/config',
1010
'terminal/js/terminado',
11+
'custom-preload'
1112
], function(
1213
$,
1314
utils,

nbclassic/static/tree/js/main.js

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ requirejs([
3838
'tree/js/shutdownbutton',
3939
'auth/js/loginwidget',
4040
'bidi/bidi',
41+
'custom-preload'
4142
], function(
4243
$,
4344
contents_service,

nbclassic/templates/page.html

+13
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
paths: {
3131
'auth/js/main': 'auth/js/main.min',
3232
custom : '{{ base_url }}custom',
33+
'custom-preload' : '{{ base_url }}custom-preload',
3334
nbextensions : '{{ base_url }}nbextensions',
3435
kernelspecs : '{{ base_url }}kernelspecs',
3536
underscore : 'components/underscore/underscore-min',
@@ -99,6 +100,18 @@
99100
}
100101
})
101102

103+
// error-catching custom-preload.js shim.
104+
define("custom-preload", function (require, exports, module) {
105+
try {
106+
var custom = require('custom/custom-preload');
107+
console.debug('loaded custom-preload.js');
108+
return custom;
109+
} catch (e) {
110+
console.error("error loading custom-preload.js", e);
111+
return {};
112+
}
113+
})
114+
102115
document.nbjs_translations = {{ nbjs_translations|safe }};
103116
document.documentElement.lang = navigator.language.toLowerCase();
104117
</script>

tools/build-main.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ var rjs_config = {
2828
"xtermjs-fit": 'components/xterm.js-fit/index',
2929
"jquery-typeahead": 'components/jquery-typeahead/dist/jquery.typeahead.min',
3030
contents: 'empty:',
31-
custom: 'empty:',
31+
custom: 'empty:',
32+
'custom-preload': 'empty:',
33+
3234
},
3335
map: { // for backward compatibility
3436
"*": {
@@ -60,6 +62,7 @@ var rjs_config = {
6062

6163
exclude: [
6264
"custom/custom",
65+
"custom/custom-preload",
6366
]
6467
};
6568

0 commit comments

Comments
 (0)