diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2015-02-04 04:43:41 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2015-02-04 04:43:41 -0800 |
commit | 49cf861b0a4e351e56ba797541d43cb1da345741 (patch) | |
tree | 5b84193ecd9eefc05bd9f27b1766e833064182ae /examples/demos/src | |
parent | 2e9a726bfbea4a25183a2649e4e0b85519fe8e8a (diff) | |
parent | 33129113b3ebf3dd656bd58c34af476fb852e2f6 (diff) | |
download | hands-on-scala-js-49cf861b0a4e351e56ba797541d43cb1da345741.tar.gz hands-on-scala-js-49cf861b0a4e351e56ba797541d43cb1da345741.tar.bz2 hands-on-scala-js-49cf861b0a4e351e56ba797541d43cb1da345741.zip |
Merge pull request #19 from sjrd/scalajs-0.6
Upgrade and update the whole thing for Scala.js 0.6.0-RC2.
Diffstat (limited to 'examples/demos/src')
-rw-r--r-- | examples/demos/src/main/scala/advanced/Async.scala | 5 | ||||
-rw-r--r-- | examples/demos/src/main/scala/scrollmenu/Controller.scala | 2 | ||||
-rw-r--r-- | examples/demos/src/main/scala/scrollmenu/ScrollSpy.scala | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/examples/demos/src/main/scala/advanced/Async.scala b/examples/demos/src/main/scala/advanced/Async.scala index a76b78b..7a7e5ff 100644 --- a/examples/demos/src/main/scala/advanced/Async.scala +++ b/examples/demos/src/main/scala/advanced/Async.scala @@ -35,7 +35,8 @@ object Async { val mousedown = new Channel[ME](canvas.onmousedown = _) - async{ + // Disabled due to scala-js#1469 + /*async{ while(true){ val start = await(mousedown()) renderer.beginPath() @@ -58,7 +59,7 @@ object Async { await(mouseup()) renderer.clearRect(0, 0, 1000, 1000) } - } + }*/ } @JSExport def main0(canvas: dom.HTMLCanvasElement) = { diff --git a/examples/demos/src/main/scala/scrollmenu/Controller.scala b/examples/demos/src/main/scala/scrollmenu/Controller.scala index b56da31..cfef7b0 100644 --- a/examples/demos/src/main/scala/scrollmenu/Controller.scala +++ b/examples/demos/src/main/scala/scrollmenu/Controller.scala @@ -23,7 +23,7 @@ object Controller{ val Seq(main, menu, layout, menuLink) = Seq( "main", "menu", "layout", "menuLink" - ).map(dom.document.getElementById) + ).map(dom.document.getElementById(_).asInstanceOf[dom.HTMLElement]) val snippets = dom.document.getElementsByClassName("highlight-me") diff --git a/examples/demos/src/main/scala/scrollmenu/ScrollSpy.scala b/examples/demos/src/main/scala/scrollmenu/ScrollSpy.scala index f0b9dd4..9a64314 100644 --- a/examples/demos/src/main/scala/scrollmenu/ScrollSpy.scala +++ b/examples/demos/src/main/scala/scrollmenu/ScrollSpy.scala @@ -57,7 +57,7 @@ class ScrollSpy(structure: Tree[String], } js.Array( - menuItems.map(name => dom.document.getElementById(Controller.munge(name))) + menuItems.map(name => dom.document.getElementById(Controller.munge(name)).asInstanceOf[dom.HTMLElement]) .map((el) => () => offset(el, main)):_* ) } |