Merge pull request jupyter#487 from michaelpacer/new_mimetypes

Fixing the widget calls, conditionally embedding the script tag
mpacer · Dec 13, 2016 · 5d1287b · 5d1287b
2 parents d87a474 + 71f3965
commit 5d1287b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/nbconvert/templates/html/basic.tpl b/nbconvert/templates/html/basic.tpl
@@ -242,7 +242,7 @@ var element = $('#{{ div_id }}');
 
 {%- block footer %}
 {% set mimetype = 'application/vnd.jupyter.widget-state+json'%} 
-{% if mimetype in nb.metadata.widgets %}
+{% if mimetype in nb.metadata.get("widgets",{})%}
 <script type="{{ mimetype }}">
 {{ nb.metadata.widgets[mimetype] | json_dumps }}
 </script>

diff --git a/nbconvert/templates/html/full.tpl b/nbconvert/templates/html/full.tpl
@@ -10,6 +10,10 @@
 <meta charset="utf-8" />
 <title>{{resources['metadata']['name']}}</title>
 
+{%- if "widgets" in nb.metadata -%}
+<script src="https://unpkg.com/jupyter-js-widgets@2.0.*/dist/embed.js"></script>
+{%- endif-%}
+
 <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.10/require.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>