Merge pull request #426 from ioam/jsdependencies

Improved handling of JS and CSS dependencies

holoviews/ipython/__init__.py

@@ -81,7 +81,7 @@ def load_hvjs(logo=False, JS=True, message='HoloViewsJS successfully loaded.'):
     """
     # Evaluate load_notebook.html template with widgetjs code
     if JS:
-        widgetjs, widgetcss = Renderer.embed_assets()
+        widgetjs, widgetcss = Renderer.html_assets(extras=False, backends=[])
     else:
         widgetjs, widgetcss = '', ''
     templateLoader = jinja2.FileSystemLoader(os.path.dirname(os.path.abspath(__file__)))
@@ -165,8 +165,7 @@ def __call__(self, *args, **params):
         loaded = ', '.join(js_names[r] if r in js_names else r.capitalize()+'JS'
                            for r in resources)
 
-        load_hvjs(logo=p.logo,
-                  JS=('holoviews' in resources),
+        load_hvjs(logo=p.logo, JS=('holoviews' in resources),
                   message = '%s successfully loaded in this cell.' % loaded)
         for r in [r for r in resources if r != 'holoviews']:
             Store.renderers[r].load_nb(inline=p.inline)

holoviews/ipython/load_notebook.html

@@ -1,10 +1,6 @@
-<script type="text/javascript">
-{{ widgetjs|indent(8) }}
-</script>
+{{ widgetjs }}
 
-<style>
-{{ widgetcss|indent(8) }}
-</style>
+{{ widgetcss }}
 
 {% if logo %}
 <div>

holoviews/plotting/bokeh/renderer.py

@@ -37,9 +37,7 @@ class BokehRenderer(Renderer):
     widgets = {'scrubber': BokehScrubberWidget,
                'widgets': BokehSelectionWidget}
 
-    js_dependencies = Renderer.js_dependencies + CDN.js_files
-
-    css_dependencies = Renderer.css_dependencies + CDN.css_files
+    backend_dependencies = {'js': CDN.js_files, 'css': CDN.css_files}
 
     _loaded = False
 

holoviews/plotting/renderer.py

@@ -123,10 +123,16 @@ class Renderer(Exporter):
     # Define appropriate widget classes
     widgets = {'scrubber': ScrubberWidget, 'widgets': SelectionWidget}
 
-    js_dependencies = ['https://code.jquery.com/jquery-2.1.4.min.js',
-                       'https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.20/require.min.js']
+    core_dependencies = {'jQueryUI': {'js': ['https://code.jquery.com/ui/1.10.4/jquery-ui.min.js'],
+                                      'css': ['https://code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css']}}
 
-    css_dependencies = ['https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css']
+    extra_dependencies = {'jQuery': {'js': ['https://code.jquery.com/jquery-2.1.4.min.js']},
+                          'underscore': {'js': ['https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js']},
+                          'require': {'js': ['https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.20/require.min.js']},
+                          'bootstrap': {'css': ['https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css']}}
+
+    # Any additional JS and CSS dependencies required by a specific backend
+    backend_dependencies = {}
 
     def __init__(self, **params):
         super(Renderer, self).__init__(**params)
@@ -238,18 +244,8 @@ def static_html(self, obj, fmt=None, template=None):
         supplied format. Allows supplying a template formatting string
         with fields to interpolate 'js', 'css' and the main 'html'.
         """
-        css_html, js_html = '', ''
-        js, css = self.embed_assets()
-        for url in self.js_dependencies:
-            js_html += '<script src="%s" type="text/javascript"></script>' % url
-        js_html += '<script type="text/javascript">%s</script>' % js
-
-        for url in self.css_dependencies:
-            css_html += '<link rel="stylesheet" href="%s">' % url
-        css_html += '<style>%s</style>' % css
-
+        js_html, css_html = self.html_assets()
         if template is None: template = static_template
-
         html = self.html(obj, fmt)
         return template.format(js=js_html, css=css_html, html=html)
 
@@ -340,10 +336,13 @@ class needed to render it with the current renderer.
 
 
     @classmethod
-    def embed_assets(cls):
+    def html_assets(cls, core=True, extras=True, backends=None):
         """
         Returns JS and CSS and for embedding of widgets.
         """
+        if backends is None:
+            backends = [cls.backend] if cls.backend else []
+
         # Get all the widgets and find the set of required js widget files
         widgets = [wdgt for r in Renderer.__subclasses__()
                    for wdgt in r.widgets.values()]
@@ -358,7 +357,26 @@ def embed_assets(cls):
                              if f is not None )
         widgetcss = '\n'.join(open(find_file(path, f), 'r').read()
                               for f in css if f is not None)
-        return widgetjs, widgetcss
+
+        dependencies = {}
+        if core:
+            dependencies.update(cls.core_dependencies)
+        if extras:
+            dependencies.update(cls.extra_dependencies)
+        for backend in backends:
+            dependencies['backend'] = Store.renderers[backend].backend_dependencies
+
+        js_html, css_html = '', ''
+        for _, dep in sorted(dependencies.items(), key=lambda x: x[0]):
+            for js in dep.get('js', []):
+                js_html += '\n<script src="%s" type="text/javascript"></script>' % js
+            for css in dep.get('css', []):
+                css_html += '\n<link rel="stylesheet" href="%s">' % css
+
+        js_html += '\n<script type="text/javascript">%s</script>' % widgetjs
+        css_html += '\n<style>%s</style>' % widgetcss
+
+        return js_html, css_html
 
 
     @classmethod

holoviews/plotting/widgets/jsslider.css

@@ -11,6 +11,10 @@ form.holoform {
     padding: 0.8em;
 }
 
+div.holowidgets {
+    padding-right: 0;
+}
+
 div.holoslider {
     min-height: 0 !important;
     height: 0.8em;
@@ -24,7 +28,7 @@ div.holoformgroup {
 
 div.hologroup {
     padding-left: 0;
-    padding-right: 0.6em;
+    padding-right: 0;
 }
 
 .holoselect {

holoviews/plotting/widgets/jsslider.jinja

@@ -24,15 +24,15 @@
                         </div>
                     </div>
                     <script>
-                        /* Load JQuery UI CSS */
+                        // Slider JS Block START
                         function loadcssfile(filename){
                             var fileref=document.createElement("link")
                             fileref.setAttribute("rel", "stylesheet")
                             fileref.setAttribute("type", "text/css")
                             fileref.setAttribute("href", filename)
                             document.getElementsByTagName("head")[0].appendChild(fileref)
                         }
-                        loadcssfile("https://code.jquery.com/ui/1.10.4/themes/ui-lightness/jquery-ui.css");
+                        loadcssfile("https://code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css");
                         /* Check if jQuery and jQueryUI have been loaded
                          otherwise load with require.js */
                         var jQuery = window.jQuery,
@@ -102,7 +102,7 @@
                                     } else {
                                         var dim_val = vals[ui.value];
                                     }
-                                    $('#textInput{{ id }}_{{ widget_data['dim'] }}').val(dim_val);
+									$('#textInput{{ id }}_{{ widget_data['dim'] }}').val((dim_val*1).toString());
                                     anim{{ id }}.set_frame(dim_val, {{ widget_data['dim_idx'] }});
                                     if (Object.keys(next_vals).length > 0) {
                                         var new_vals = next_vals[dim_val];
@@ -141,8 +141,9 @@
                                     }
                                 }
                             });
-                            $('#textInput{{ id }}_{{ widget_data['dim'] }}').val(vals[0]);
+                            $('#textInput{{ id }}_{{ widget_data['dim'] }}').val((vals[0]*1).toString());
                         });
+						// Slider JS Block END
                     </script>
                 {% elif widget_data['type']=='dropdown' %}
                     <div class="form-group control-group" style='{{ widget_data['visibility'] }}'>