Small fixes for updating bokeh plots

holoviews/plotting/bokeh/util.py

@@ -164,8 +164,7 @@ def compute_static_patch(document, models):
     attributes and will break if new models have been added since
     the plot was first created.
     """
-    json = document.to_json()
-    references = refs(json)
+    references = refs(document.to_json())
     requested_updates = [m.ref['id'] for m in models]
 
     value_refs = {}

holoviews/plotting/bokeh/widgets.py

@@ -7,7 +7,7 @@
 from bokeh.util.notebook import get_comms
 
 from ..widgets import NdWidget, SelectionWidget, ScrubberWidget
-
+from .util import compute_static_patch
 
 class BokehWidget(NdWidget):
 
@@ -41,22 +41,17 @@ def _plot_figure(self, idx, fig_format='json'):
             html = self.renderer.html(self.plot, fig_format)
             return html
         else:
+            doc = self.plot.document
             if hasattr(doc, 'last_comms_handle'):
                 handle = doc.last_comms_handle
             else:
                 handle = _CommsHandle(get_comms(doc.last_comms_target),
                                       doc, doc.to_json())
                 doc.last_comms_handle = handle
 
-            to_json = doc.to_json()
-            if handle.doc is not doc:
-                msg = dict(doc=to_json)
-            else:
-                msg = Document._compute_patch_between_json(handle.json, to_json)
-            if isinstance(handle._json, dict):
-                handle._json[doc] = to_json
-            else:
-                handle._json = to_json
+            plotobjects = [h for handles in self.plot.traverse(lambda x: x.current_handles)
+                           for h in handles]
+            msg = compute_static_patch(doc, plotobjects)
             handle.comms.send(json.dumps(msg))
             return 'Complete'