simplify holoviews js and css

basnijholt · basnijholt · commit 76f7f858df98 · 2018-10-18T13:33:09.000+02:00
diff --git a/docs/source/_static/jquery.js b/docs/source/_static/jquery.js
@@ -0,0 +1 @@
+// This file is empty because we are already loading jQuery with holoviews in the <head>
diff --git a/docs/source/_templates/layout.html b/docs/source/_templates/layout.html
@@ -0,0 +1,6 @@
+{% extends "!layout.html" %}
+{% block extrahead %}
+      {%- for scriptfile in holoviews_js_files %}
+        {{ js_tag(scriptfile) }}
+      {%- endfor %}
+{% endblock %}
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -87,6 +87,7 @@
 #
 html_theme = 'sphinx_rtd_theme'
 
+
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
@@ -128,38 +129,22 @@
 }
 
 
-# -- Add Holoviews js and css ------------------------------------------------
-
-def setup(app):
+def get_holoviews_js_css():
     from holoviews.plotting import Renderer
+    dependencies = {**Renderer.core_dependencies,
+                    **Renderer.extra_dependencies}
+    required = ['jQueryUI', 'jQuery', 'require']
+    js = [url for name in required for url in dependencies[name].get('js', [])]
+    css = [url for name in required for url in dependencies[name].get('css', [])]
+    return js, css
 
-    hv_js, hv_css = Renderer.html_assets(
-        extras=False, backends=[], script=True)
-
-    fname_css = 'holoviews.css'
-    fname_js = 'holoviews.js'
-    static_dir = 'source/_static'
 
-    os.makedirs(static_dir, exist_ok=True)
+js, css = get_holoviews_js_css()
+html_context = {'holoviews_js_files': js}
 
-    with open(f'{static_dir}/{fname_css}', 'w') as f:
-        hv_css = hv_css.split('<style>')[1].replace('</style>', '')
-        f.write(hv_css)
 
-    with open(f'{static_dir}/{fname_js}', 'w') as f:
-        f.write(hv_js)
-
-    app.add_stylesheet(fname_css)
-    app.add_javascript(fname_js)
-
-    dependencies = {**Renderer.core_dependencies, **Renderer.extra_dependencies}
-    for name, type_url in dependencies.items():
-        if name in ['bootstrap']:
-            continue
-
-        for url in type_url.get('js', []):
-            app.add_javascript(url)
-        for url in type_url.get('css', []):
-            app.add_stylesheet(url)
+def setup(app):
+    for url in css:
+        app.add_stylesheet(url)
 
     app.add_javascript("https://unpkg.com/@jupyter-widgets/html-manager@0.14.4/dist/embed-amd.js")

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+// This file is empty because we are already loading jQuery with holoviews in the <head>`