From f27deb2f20070a82842d1e2ec94ecba9130545cf Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <philippjfr@continuum.io>
Date: Thu, 29 Nov 2018 15:23:05 +0000
Subject: [PATCH] Fixed initialization of scrubber widget (#3225)

---
 holoviews/plotting/bokeh/widgets.py  | 10 +++++-----
 holoviews/plotting/plotly/widgets.py | 11 ++++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/holoviews/plotting/bokeh/widgets.py b/holoviews/plotting/bokeh/widgets.py
index 0e9f1d7f05..9ade7e6da5 100644
--- a/holoviews/plotting/bokeh/widgets.py
+++ b/holoviews/plotting/bokeh/widgets.py
@@ -274,10 +274,6 @@ class BokehWidget(NdWidget):
         Optional javascript extension file for a particular backend.""")
 
     def _get_data(self):
-        # Get initial frame to draw immediately
-        if not self.plot.dynamic:
-            _, _, init_dim_vals = self.get_widgets()
-            self.plot.update(tuple(init_dim_vals))
         msg, metadata = self.renderer.components(self.plot, comm=False)
         data = super(BokehWidget, self)._get_data()
         return dict(data, init_html=msg['text/html'],
@@ -316,8 +312,12 @@ def _plot_figure(self, idx, fig_format='json'):
 
 
 class BokehSelectionWidget(BokehWidget, SelectionWidget):
-    pass
 
+    def _get_data(self):
+        if not self.plot.dynamic:
+            _, _, init_dim_vals = self.get_widgets()
+            self.plot.update(tuple(init_dim_vals))
+        return super(BokehSelectionWidget, self)._get_data()
 
 class BokehScrubberWidget(BokehWidget, ScrubberWidget):
     pass
diff --git a/holoviews/plotting/plotly/widgets.py b/holoviews/plotting/plotly/widgets.py
index 1eb4b4bd98..b6fbaf52e2 100644
--- a/holoviews/plotting/plotly/widgets.py
+++ b/holoviews/plotting/plotly/widgets.py
@@ -9,10 +9,6 @@ class PlotlyWidget(NdWidget):
         Optional javascript extension file for a particular backend.""")
 
     def _get_data(self):
-        # Get initial frame to draw immediately
-        if not self.plot.dynamic:
-            _, _, init_dim_vals = self.get_widgets()
-            self.plot.update(tuple(init_dim_vals))
         msg, metadata = self.renderer.components(self.plot, divuuid=self.id, comm=False)
         data = super(PlotlyWidget, self)._get_data()
         return dict(data, init_html=msg['text/html'],
@@ -33,7 +29,12 @@ def _plot_figure(self, idx, fig_format='json'):
 
 
 class PlotlySelectionWidget(PlotlyWidget, SelectionWidget):
-    pass
+
+    def _get_data(self):
+        if not self.plot.dynamic:
+            _, _, init_dim_vals = self.get_widgets()
+            self.plot.update(tuple(init_dim_vals))
+        return super(PlotlySelectionWidget, self)._get_data()
 
 class PlotlyScrubberWidget(PlotlyWidget, ScrubberWidget):
     pass