Merge remote-tracking branch 'tbreloff/master'

This commit is contained in:
Michael K. Borregaard 2017-01-02 10:16:07 +01:00
commit 4ab51d4bfa
2 changed files with 3 additions and 2 deletions

View File

@ -1,3 +1,4 @@
__precompile__(false)
module Plots

View File

@ -86,8 +86,8 @@ end
# ----------------------------------------------------------------
function _show(io::IO, ::MIME"image/svg+xml", plt::Plot{PlotlyJSBackend})
if Plots.isijulia()
print(io, PlotlyJS.html_body(plt.o))
if isijulia() && !_use_remote[]
write(io, PlotlyJS.html_body(PlotlyJS.JupyterPlot(plt.o)))
else
show(io, MIME("text/html"), plt.o)
end