diff options
author | Li Haoyi <haoyi@dropbox.com> | 2015-02-04 05:31:48 -0800 |
---|---|---|
committer | Li Haoyi <haoyi@dropbox.com> | 2015-02-04 05:31:48 -0800 |
commit | b094df4a6a6cf1bf7eeb36d842970aa8b3d94d5f (patch) | |
tree | 68db445a53fe7f2343a44773cb46d7e882dad7d1 /examples/demos/src/main/scala/advanced/Async.scala | |
parent | 49cf861b0a4e351e56ba797541d43cb1da345741 (diff) | |
download | hands-on-scala-js-b094df4a6a6cf1bf7eeb36d842970aa8b3d94d5f.tar.gz hands-on-scala-js-b094df4a6a6cf1bf7eeb36d842970aa8b3d94d5f.tar.bz2 hands-on-scala-js-b094df4a6a6cf1bf7eeb36d842970aa8b3d94d5f.zip |
first attempt at updating things for 0.6.0
Diffstat (limited to 'examples/demos/src/main/scala/advanced/Async.scala')
-rw-r--r-- | examples/demos/src/main/scala/advanced/Async.scala | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/examples/demos/src/main/scala/advanced/Async.scala b/examples/demos/src/main/scala/advanced/Async.scala index 7a7e5ff..3d70f27 100644 --- a/examples/demos/src/main/scala/advanced/Async.scala +++ b/examples/demos/src/main/scala/advanced/Async.scala @@ -1,6 +1,7 @@ package advanced import org.scalajs.dom +import dom.html import concurrent._ import async.Async._ import scalajs.js.annotation.JSExport @@ -8,7 +9,7 @@ import scalajs.concurrent.JSExecutionContext.Implicits.queue @JSExport object Async { - def init(canvas: dom.HTMLCanvasElement) = { + def init(canvas: html.Canvas) = { val renderer = canvas.getContext("2d") .asInstanceOf[dom.CanvasRenderingContext2D] @@ -22,7 +23,7 @@ object Async { renderer } @JSExport - def main(canvas: dom.HTMLCanvasElement) = { + def main(canvas: html.Canvas) = { val renderer = init(canvas) // async def rect = canvas.getBoundingClientRect() @@ -36,7 +37,7 @@ object Async { new Channel[ME](canvas.onmousedown = _) // Disabled due to scala-js#1469 - /*async{ + async{ while(true){ val start = await(mousedown()) renderer.beginPath() @@ -59,10 +60,10 @@ object Async { await(mouseup()) renderer.clearRect(0, 0, 1000, 1000) } - }*/ + } } @JSExport - def main0(canvas: dom.HTMLCanvasElement) = { + def main0(canvas: html.Canvas) = { val renderer = init(canvas) // traditional def rect = canvas.getBoundingClientRect() |