Merge pull request #133 from SimonDanisch/master

fixes webio
JunoLab · Oct 2, 2018 · 97ba532 · 97ba532
2 parents ec7df8b + 55e1050
commit 97ba532
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/display/webio.jl b/src/display/webio.jl
@@ -10,6 +10,14 @@ function isrunning(server)
     isassigned(server) && !istaskdone(server[].serve_task)
 end
 
+# Be ready for the deprecation of tohtml :P
+# once the no unsafe-script lands
+if isdefined(WebIO, :tohtml)
+    const tohtml = WebIO.tohtml
+else
+    tohtml(io, app) = show(io, MIME"text/html"(), app)
+end
+
 function routepages(req)
     target = req.target[2:end]
 
@@ -23,13 +31,13 @@ function routepages(req)
         <html>
         <head>
         <meta charset="UTF-8">
-        <script>var websocket_url = 'localhost:$(port[])/webio_websocket'</script>
+        <script>var websocket_url = 'ws://localhost:$(port[])/webio_websocket/'</script>
         <script src=$(repr(webio_script))></script>
         <script src=$(repr(ws_script))></script>
         </head>
         <body>
     """)
-    WebIO.tohtml(io, pages[target])
+    tohtml(io, pages[target])
     print(io, """
         </body>
         </html>