Skip to content

Commit e32a1e2

Browse files
use data-jupyter-kernel-id attribute for kernel id instead of global variable
1 parent 4a61880 commit e32a1e2

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

voila/static/main.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
// Initialize requirejs (for dynamically loading widgets)
33
// and render widgets on page.
44

5+
var kernel_id = null;
6+
var scripts = document.getElementsByTagName('script');
7+
Array.prototype.forEach.call(scripts, (script) => {
8+
kernel_id = script.getAttribute('data-jupyter-kernel-id') || kernel_id;
9+
})
10+
511
requirejs.config({
612
baseUrl: 'static/dist'
713
})
@@ -17,7 +23,7 @@ require(['libwidgets'], function(lib) {
1723
WSURL = 'ws://' + window.location.host
1824
}
1925

20-
var widgetApp = new lib.WidgetApplication(BASEURL, WSURL, lib.requireLoader, window.kernel_id);
26+
var widgetApp = new lib.WidgetApplication(BASEURL, WSURL, lib.requireLoader, kernel_id);
2127

2228
window.addEventListener("beforeunload", function (e) {
2329
widgetApp.cleanWidgets();

voila/templates/voila.tpl

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,18 @@
99
{%- block html_head -%}
1010
<meta charset="utf-8" />
1111
{% set nb_title = nb.metadata.get('title', '') or resources['metadata']['name'] %}
12-
<title>Voila: {{resources.kernel_id}} - {{nb_title}}</title>
13-
14-
<script>
15-
window.kernel_id = '{{resources.kernel_id}}'
16-
</script>
17-
12+
<title>Voila: {{nb_title}}</title>
1813

1914
<link rel="stylesheet" href="https://unpkg.com/[email protected]/css/font-awesome.min.css" type="text/css" />
2015

2116
<script
22-
data-main="static/main"
23-
src="/static/require.min.js"
17+
data-main="/voila/static/main"
18+
data-jupyter-kernel-id="{{resources.kernel_id}}"
19+
src="/voila/static/require.min.js"
2420
integrity="sha256-Ae2Vz/4ePdIu6ZyI/5ZGsYnb+m0JlOmKPjt6XZ9JJkA="
2521
crossorigin="anonymous">
2622
</script>
27-
<script src="static/jquery.min.js"></script>
23+
<script src="/voila/static/jquery.min.js"></script>
2824

2925

3026

0 commit comments

Comments
 (0)