Merge pull request #4178 from minrk/data_javascript

add missing data_javascript

IPython/nbconvert/templates/html_basic.tpl

@@ -135,6 +135,12 b' unknown type {{ cell.type }}'
 </pre>
 {%- endblock -%}
 
+{%- block data_javascript %}
+<script type="text/javascript">
+{{ output.javascript }}
+</script>
+{%- endblock -%}
+
 {%- block display_data scoped -%}
 <div class="box-flex1 output_subarea output_display_data">
 {{ super() }}

IPython/nbconvert/templates/latex/skeleton/display_priority.tplx

@@ -30,10 +30,13 b''
             ((*- block data_text -*))
             ((*- endblock -*))
         ((*- endif -*))
-
         ((*- if type in ['latex']*))
             ((*- block data_latex -*))
             ((*- endblock -*))
         ((*- endif -*))
+        ((*- if type in ['javascript']*))
+            ((*- block data_javascript -*))
+            ((*- endblock -*))
+        ((*- endif -*))
     ((*- endfor -*))
 ((*- endblock data_priority -*))

IPython/nbconvert/templates/skeleton/Makefile

@@ -1,10 +1,10 b''
 
 
-all: tex/null.tplx tex/display_priority.tplx
+all: ../latex/skeleton/null.tplx ../latex/skeleton/display_priority.tplx
 
 # convert jinja syntax to tex
 # cf http://flask.pocoo.org/snippets/55/
-tex/%.tplx: %.tpl
+../latex/skeleton/%.tplx: %.tpl
 	@echo 'generating tex equivalent of $^: $@'
 	@echo '((= autogenerated file do not edit =))' > $@
 	@sed \
@@ -20,4 +20,4 b' tex/%.tplx: %.tpl'
 
 clean:
 	@echo "cleaning generated tplx files..."
-	@rm tex/*
+	@rm ../latex/skeleton/*

IPython/nbconvert/templates/skeleton/display_priority.tpl

@@ -29,10 +29,13 b''
             {%- block data_text -%}
             {%- endblock -%}
         {%- endif -%}
-
         {%- if type in ['latex']%}
             {%- block data_latex -%}
             {%- endblock -%}
         {%- endif -%}
+        {%- if type in ['javascript']%}
+            {%- block data_javascript -%}
+            {%- endblock -%}
+        {%- endif -%}
     {%- endfor -%}
 {%- endblock data_priority -%}