From 9ecda4846526b3130e343f808d8cb0e60604a6c6 Mon Sep 17 00:00:00 2001 From: Ben Acland Date: Wed, 15 Aug 2018 21:55:43 -0500 Subject: [PATCH] use compat for UUIDs --- src/display.jl | 2 ++ src/displays/electron.jl | 6 +++--- src/displays/ijulia.jl | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/display.jl b/src/display.jl index 408e3c99..936cb159 100644 --- a/src/display.jl +++ b/src/display.jl @@ -120,6 +120,8 @@ Base.copy(sp::SyncPlot) = fork(sp) # defined by each SyncPlot{TD} # Display frontends # # ----------------- # +using Compat.UUIDs + @require Juno include("displays/juno.jl") @require WebIO include("displays/webio.jl") include("displays/electron.jl") diff --git a/src/displays/electron.jl b/src/displays/electron.jl index 9261dbc3..e72684ef 100644 --- a/src/displays/electron.jl +++ b/src/displays/electron.jl @@ -3,14 +3,14 @@ # ----------- # mutable struct ElectronDisplay <: AbstractPlotlyDisplay - divid::Base.Random.UUID + divid::UUIDs.UUID w end const ElectronPlot = SyncPlot{ElectronDisplay} -ElectronDisplay() = ElectronDisplay(Base.Random.uuid4(), nothing) -ElectronDisplay(divid::Base.Random.UUID) = ElectronDisplay(divid, nothing) +ElectronDisplay() = ElectronDisplay(UUIDs.uuid4(), nothing) +ElectronDisplay(divid::UUIDs.UUID) = ElectronDisplay(divid, nothing) ElectronDisplay(p::Plot) = ElectronDisplay(p.divid) ElectronPlot(p::Plot) = ElectronPlot(p, ElectronDisplay(p.divid)) diff --git a/src/displays/ijulia.jl b/src/displays/ijulia.jl index 9ae77bdb..9f6a5744 100644 --- a/src/displays/ijulia.jl +++ b/src/displays/ijulia.jl @@ -3,7 +3,7 @@ # ---------------------- # mutable struct JupyterDisplay <: AbstractPlotlyDisplay - divid::Base.Random.UUID + divid::UUIDs.UUID displayed::Bool cond::Condition # for getting data back from js end