Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -4,8 +4,8 @@ os:
   - linux
   # - osx
 julia:
+  - 1.0
   - 1
-  - 1.4
   - nightly
 
 matrix:
@@ -41,4 +41,4 @@ after_success:
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
   - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
-  - $TESTCMD -e 'using Pkg; if VERSION == v"1.4"; Pkg.resolve(); end; Pkg.pin(PackageSpec(name="FixedPointNumbers", version="0.7")); Pkg.build(); Pkg.test(coverage=true)'
+  - $TESTCMD -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'

appveyor.yml

@@ -1,8 +1,7 @@
 environment:
   matrix:
-  # - julia_version: 0.7
+  - julia_version: 1.0
   - julia_version: 1
-  - julia_version: 1.4
   - julia_version: nightly
 
 platform:
@@ -33,8 +32,7 @@ install:
   - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
 
 build_script:
-  - C:\julia\bin\julia --project=C:\projects\plots-jl -e "using Pkg;  if VERSION == v"""1.4"""; Pkg.resolve(); end; Pkg.pin(PackageSpec(name="""FixedPointNumbers""", version="""0.7"""))"
+  - echo "%JL_TEST_SCRIPT%"
-  - echo "%JL_BUILD_SCRIPT%"
   - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:

src/backends/plotlyjs.jl

@@ -42,8 +42,8 @@ _display(plt::Plot{PlotlyJSBackend}) = display(plotlyjs_syncplot(plt))
 
 @require WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29" begin
     function WebIO.render(plt::Plot{PlotlyJSBackend})
-        prepare_output(plt)
+        plt_html = sprint(show, MIME("text/html"), plt)
-        WebIO.render(plt.o)
+        return WebIO.render(dom"div"(innerHTML=plt_html))
     end
 end
 

src/series.jl

@@ -65,8 +65,10 @@ process_fillrange(range, plotattributes) = series_vector(range, plotattributes)
 process_ribbon(ribbon::Number, plotattributes) = [ribbon]
 process_ribbon(ribbon, plotattributes) = series_vector(ribbon, plotattributes)
 # ribbon as a tuple: (lower_ribbons, upper_ribbons)
-process_ribbon(ribbon::Tuple{Any,Any}, plotattributes) = collect(zip(series_vector(ribbon[1], plotattributes),
+process_ribbon(ribbon::Tuple{S, T}, plotattributes) where {S, T} = collect(zip(
-                                                     series_vector(ribbon[2], plotattributes)))
+    series_vector(ribbon[1], plotattributes),
+    series_vector(ribbon[2], plotattributes),
+))
 
 
 # --------------------------------------------------------------------
@@ -166,7 +168,7 @@ struct SliceIt end
 end
 
 # this is the default "type recipe"... just pass the object through
-@recipe f(::Type{T}, v::T) where {T<:Any} = v
+@recipe f(::Type{T}, v::T) where T = v
 
 # this should catch unhandled "series recipes" and error with a nice message
 @recipe f(::Type{V}, x, y, z) where {V<:Val} = error("The backend must not support the series type $V, and there isn't a series recipe defined.")
@@ -572,13 +574,7 @@ end
 end
 @recipe function f(fs::AbstractArray{F}, xmin::Number, xmax::Number) where F<:Function
     xscale, yscale = [get(plotattributes, sym, :identity) for sym=(:xscale,:yscale)]
-    xs = Array{Any}(undef, length(fs))
+    unzip(_scaled_adapted_grid.(fs, xscale, yscale, xmin, xmax))
-    ys = Array{Any}(undef, length(fs))
-    for (i, (x, y)) in enumerate(_scaled_adapted_grid(f, xscale, yscale, xmin, xmax) for f in fs)
-        xs[i] = x
-    	ys[i] = y
-    end
-    xs, ys
 end
 @recipe f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, u::AVec) where {F<:Function,G<:Function}  = mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u)
 @recipe f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, umin::Number, umax::Number, n = 200) where {F<:Function,G<:Function} = fx, fy, range(umin, stop = umax, length = n)