WIP: 0.7 Requires.jl code

JuliaPlots · Aug 24, 2018 · 527211a · 527211a
1 parent ca5a349
commit 527211a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 67 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -1,8 +1,7 @@
 julia 0.7
 JSON 0.7
-Blink 0.3.3
-DocStringExtensions
+Blink 0.8
 Requires
-PlotlyBase 0.1.2
+PlotlyBase 
 Reexport 0.2.0
 Compat 0.69
diff --git a/recession_dates.tsv b/recession_dates.tsv
diff --git a/src/PlotlyJS.jl b/src/PlotlyJS.jl
@@ -68,8 +68,6 @@ export
     # frontend methods
     init_notebook
 
-@require Rsvg include("savefig_cairo.jl")
-
 function _savefig_cairo(x...)
     msg = """
     Rsvg.jl must be loaded in order to save in this format. Please ensure
@@ -79,6 +77,34 @@ function _savefig_cairo(x...)
     error(msg)
 end
 
+
+function __init__()
+    @require IJulia="7073ff75-c697-5162-941a-fcdaad2a7d2a" begin
+        import IJulia
+        using IJulia.send_comm  # needed for _call_js above to work
+        global const _ijulia_eval_comm = Ref{IJulia.CommManager.Comm{:plotlyjs_eval}}()
+        if IJulia.inited
+            _ijulia_eval_comm[] = IJulia.CommManager.Comm(:plotlyjs_eval)
+        end
+        init_notebook()
+
+        function IJulia.display_dict(p::JupyterPlot)
+            if p.view.displayed
+                Dict()
+            else
+                p.view.displayed = true
+                Dict("text/html" => html_body(p),
+                     "application/vnd.plotly.v1+json" => JSON.lower(p))
+            end
+        end
+        set_display!(JupyterDisplay)
+    end
+    @require Rsvg="c4c386cf-5103-5370-be45-f3a111cca3b8" include("savefig_cairo.jl")
+    @require Juno="e5e0dc1b-0480-54bc-9374-aad01c23163d" include("displays/juno.jl")
+    @require WebIO="0f1e0344-ec1d-5b48-a673-e5cf874b6c29"include("displays/webio.jl")
+end
+
+
 @init begin
     if !isfile(_js_path)
         info("plotly.js javascript libary not found -- downloading now")

diff --git a/src/display.jl b/src/display.jl
@@ -122,8 +122,6 @@ Base.copy(sp::SyncPlot) = fork(sp)  # defined by each SyncPlot{TD}
 
 using Compat.UUIDs
 
-@require Juno include("displays/juno.jl")
-@require WebIO include("displays/webio.jl")
 include("displays/electron.jl")
 include("displays/ijulia.jl")
 

diff --git a/src/displays/ijulia.jl b/src/displays/ijulia.jl
@@ -215,29 +215,3 @@ extendtraces!(jd::JupyterDisplay, update::AbstractDict=Dict(),
 prependtraces!(jd::JupyterDisplay, update::AbstractDict=Dict(),
                indices::Vector{Int}=[1], maxpoints=-1;) =
     _call_plotlyjs(jd, "prependTraces", update, indices-1, maxpoints)
-
-
-# --------------------------------------------- #
-# Code to run once when the notebook starts up! #
-# --------------------------------------------- #
-
-@require IJulia begin
-    import IJulia
-    using IJulia.send_comm  # needed for _call_js above to work
-    global const _ijulia_eval_comm = Ref{IJulia.CommManager.Comm{:plotlyjs_eval}}()
-    if IJulia.inited
-        _ijulia_eval_comm[] = IJulia.CommManager.Comm(:plotlyjs_eval)
-    end
-    init_notebook()
-
-    function IJulia.display_dict(p::JupyterPlot)
-        if p.view.displayed
-            Dict()
-        else
-            p.view.displayed = true
-            Dict("text/html" => html_body(p),
-                 "application/vnd.plotly.v1+json" => JSON.lower(p))
-        end
-    end
-    set_display!(JupyterDisplay)
-end