Skip to content

Commit

Permalink
Merge c2e1da0 into 1cf01c3
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed May 9, 2019
2 parents 1cf01c3 + c2e1da0 commit 6a3d6da
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions holoviews/plotting/bokeh/element.py
Expand Up @@ -2130,16 +2130,16 @@ def update_frame(self, key, ranges=None, element=None):
if element is not None:
ranges = self.compute_ranges(range_obj, key, ranges)

# Update plot options
plot_opts = self.lookup_options(element, 'plot').options
inherited = self._traverse_options(element, 'plot',
self._propagate_options,
defaults=False)
plot_opts.update(**{k: v[0] for k, v in inherited.items() if k not in plot_opts})
self.param.set_param(**plot_opts)

if element and not self.overlaid and not self.tabs and not self.batched:
self._update_ranges(element, ranges)
# Update plot options
plot_opts = self.lookup_options(element, 'plot').options
inherited = self._traverse_options(element, 'plot',
self._propagate_options,
defaults=False)
plot_opts.update(**{k: v[0] for k, v in inherited.items() if k not in plot_opts})
self.param.set_param(**plot_opts)

if not self.overlaid and not self.tabs and not self.batched:
self._update_ranges(element, ranges)

# Determine which stream (if any) triggered the update
triggering = [stream for stream in self.streams if stream._triggering]
Expand Down

0 comments on commit 6a3d6da

Please sign in to comment.