summaryrefslogtreecommitdiff
path: root/examples/demos/src
diff options
context:
space:
mode:
Diffstat (limited to 'examples/demos/src')
-rw-r--r--examples/demos/src/main/scala/advanced/Async.scala5
-rw-r--r--examples/demos/src/main/scala/scrollmenu/Controller.scala2
-rw-r--r--examples/demos/src/main/scala/scrollmenu/ScrollSpy.scala2
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)):_*
)
}