summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi@dropbox.com>2014-09-09 06:32:13 +0800
committerLi Haoyi <haoyi@dropbox.com>2014-09-09 06:32:13 +0800
commit0f2bbf620dc4e876fe0bdd483b79ca069cecdb37 (patch)
tree5865ad38a46955b4a8ef565ae344b4b78c5ae089
parent08a5731c8552b0887e7a8a3f2bd1cc4d09d114f8 (diff)
downloadworkbench-0f2bbf620dc4e876fe0bdd483b79ca069cecdb37.tar.gz
workbench-0f2bbf620dc4e876fe0bdd483b79ca069cecdb37.tar.bz2
workbench-0f2bbf620dc4e876fe0bdd483b79ca069cecdb37.zip
0.2.1
-rw-r--r--client/src/main/scala/workbench/WorkbenchClient.scala6
-rw-r--r--example/src/main/resources/index-dev.html3
-rw-r--r--example/src/main/scala/example/ScalaJSExample.scala2
3 files changed, 8 insertions, 3 deletions
diff --git a/client/src/main/scala/workbench/WorkbenchClient.scala b/client/src/main/scala/workbench/WorkbenchClient.scala
index c230db0..d5151ab 100644
--- a/client/src/main/scala/workbench/WorkbenchClient.scala
+++ b/client/src/main/scala/workbench/WorkbenchClient.scala
@@ -20,7 +20,11 @@ object Wire extends autowire.Server[Js.Value, upickle.Reader, upickle.Writer] wi
@JSExport
object WorkbenchClient extends Api{
@JSExport
- val shadowBody = dom.document.body.cloneNode(deep = true)
+ lazy val shadowBody = dom.document.body.cloneNode(deep = true)
+
+ // Trigger shadowBody to get captured when the page first loads
+ dom.addEventListener("load", (event: dom.Event) => shadowBody)
+
@JSExport
var interval = 1000
@JSExport
diff --git a/example/src/main/resources/index-dev.html b/example/src/main/resources/index-dev.html
index b102613..364241b 100644
--- a/example/src/main/resources/index-dev.html
+++ b/example/src/main/resources/index-dev.html
@@ -3,6 +3,7 @@
<head>
<title>Example Scala.js application</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <script type="text/javascript" src="/workbench.js"></script>
</head>
<body style="margin: 0px">
@@ -11,7 +12,7 @@
</div>
<script type="text/javascript" src="../example-fastopt.js"></script>
-<script type="text/javascript" src="/workbench.js"></script>
+
<script>
ScalaJSExample().main();
</script>
diff --git a/example/src/main/scala/example/ScalaJSExample.scala b/example/src/main/scala/example/ScalaJSExample.scala
index 7a41c44..cedc573 100644
--- a/example/src/main/scala/example/ScalaJSExample.scala
+++ b/example/src/main/scala/example/ScalaJSExample.scala
@@ -22,7 +22,7 @@ object ScalaJSExample {
val corners = Seq(Point(255, 255), Point(0, 255), Point(128, 0))
def clear() = {
- ctx.fillStyle = "white"
+ ctx.fillStyle = "red"
ctx.fillRect(0, 0, 255, 255)
}