Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
Tom Breloff 2016-11-28 12:58:08 -05:00
commit 07f7fd3c7a

View File

@ -86,8 +86,12 @@ end
# ---------------------------------------------------------------- # ----------------------------------------------------------------
function _show(io::IO, ::MIME"image/svg+xml", plt::Plot{PlotlyJSBackend}) function _show(io::IO, ::MIME"image/svg+xml", plt::Plot{PlotlyJSBackend})
if Plots.isijulia()
print(io, PlotlyJS.html_body(plt.o))
else
show(io, MIME("text/html"), plt.o) show(io, MIME("text/html"), plt.o)
end end
end
function plotlyjs_save_hack(io::IO, plt::Plot{PlotlyJSBackend}, ext::String) function plotlyjs_save_hack(io::IO, plt::Plot{PlotlyJSBackend}, ext::String)
tmpfn = tempname() * "." * ext tmpfn = tempname() * "." * ext