Merge pull request #297 from rafaqz/body

add `body` keyword to `Window`

src/AtomShell/window.jl

@@ -42,14 +42,16 @@ const window_defaults = Dict(
 
 raw_window(a::Electron, opts) = @js a createWindow($(merge(window_defaults, opts)))
 
-function Window(a::Shell, opts::AbstractDict = Dict(); async=false)
+function Window(a::Shell, opts::AbstractDict = Dict(); async=false, body=nothing)
   # TODO: Custom urls don't support async b/c don't load Blink.js. (Same as https://github.com/JunoLab/Blink.jl/issues/150)
-  return haskey(opts, :url) ?
+  window = haskey(opts, :url) ?
     Window(raw_window(a, opts), a, nothing, nothing) :
-    Window(a, Page(), opts, async=async)
+    Window(a, Page(), opts; async=async)
+  isnothing(body) || body!(window, body)
+  return window
 end
 
-function Window(a::Shell, content::Page, opts::AbstractDict = Dict(); async=false)
+function Window(a::Shell, content::Page, opts::AbstractDict = Dict(); async=false, body=nothing)
   id, callback_cond = Blink.callback!()
   url = Blink.localurl(content) * "?callback=$id"
 
@@ -74,6 +76,8 @@ function Window(a::Shell, content::Page, opts::AbstractDict = Dict(); async=fals
     wait(w)
   end
 
+  isnothing(body) || body!(w, body)
+
   return w
 end
 

test/webio.jl

@@ -35,7 +35,6 @@ end
     end
 
     @testset "button click" begin
-        w = Window(Dict(:show => false))
         scope = Scope()
         obs = Observable(scope, "obs", false)
         obschannel = Channel(1)
@@ -47,7 +46,7 @@ end
                 end
             )
         ))
-        body!(w, scope)
+        w = Window(Dict(:show => false); body=scope)
 
         # Sleep to allow WebIO scope to mount in Electron
         sleep(0.25)