From ccb5194bb5ecb1a5623824f3d99938824c1a5be1 Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <fredrik.ekre@chalmers.se>
Date: Mon, 4 Jun 2018 10:18:59 +0200
Subject: [PATCH] make fallback method a method of _show instead of show fix
 #1529

---
 src/backends/plotly.jl   | 3 +--
 src/backends/plotlyjs.jl | 5 ++---
 src/output.jl            | 9 ++-------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/backends/plotly.jl b/src/backends/plotly.jl
index 64c9f21d..474efb68 100644
--- a/src/backends/plotly.jl
+++ b/src/backends/plotly.jl
@@ -922,8 +922,7 @@ end
 # ----------------------------------------------------------------
 
 
-function Base.show(io::IO, ::MIME"text/html", plt::Plot{PlotlyBackend})
-    prepare_output(plt)
+function _show(io::IO, ::MIME"text/html", plt::Plot{PlotlyBackend})
     write(io, html_head(plt) * html_body(plt))
 end
 
diff --git a/src/backends/plotlyjs.jl b/src/backends/plotlyjs.jl
index 1bcc3845..10213214 100644
--- a/src/backends/plotlyjs.jl
+++ b/src/backends/plotlyjs.jl
@@ -1,5 +1,5 @@
 @require Revise begin
-    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "plotlyjs.jl")) 
+    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "plotlyjs.jl"))
 end
 
 # https://github.com/spencerlyon2/PlotlyJS.jl
@@ -88,8 +88,7 @@ end
 
 # ----------------------------------------------------------------
 
-function Base.show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend})
-    prepare_output(plt)
+function _show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend})
     if isijulia() && !_use_remote[]
         write(io, PlotlyJS.html_body(PlotlyJS.JupyterPlot(plt.o)))
     else
diff --git a/src/output.jl b/src/output.jl
index e4b7e657..55d677e3 100644
--- a/src/output.jl
+++ b/src/output.jl
@@ -177,7 +177,7 @@ const _best_html_output_type = KW(
 )
 
 # a backup for html... passes to svg or png depending on the html_output_format arg
-function Base.show(io::IO, ::MIME"text/html", plt::Plot)
+function _show(io::IO, ::MIME"text/html", plt::Plot)
     output_type = Symbol(plt.attr[:html_output_format])
     if output_type == :auto
         output_type = get(_best_html_output_type, backend_name(plt.backend), :svg)
@@ -191,7 +191,7 @@ function Base.show(io::IO, ::MIME"text/html", plt::Plot)
     elseif output_type == :txt
         show(io, MIME("text/plain"), plt)
     else
-        error("only png or svg allowed. got: $output_type")
+        error("only png or svg allowed. got: $(repr(output_type))")
     end
 end
 
@@ -309,11 +309,6 @@ end
             out
         end
 
-        # default text/plain passes to html... handles Interact issues
-        function Base.show(io::IO, m::MIME"text/plain", plt::Plot)
-            show(io, MIME("text/html"), plt)
-        end
-
         ENV["MPLBACKEND"] = "Agg"
     end
 end