summaryrefslogtreecommitdiff
path: root/example/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'example/src/main')
-rw-r--r--example/src/main/resources/index-dev.html2
-rw-r--r--example/src/main/resources/index-opt.html2
-rw-r--r--example/src/main/scala/example/ScalaJSExample.scala7
3 files changed, 5 insertions, 6 deletions
diff --git a/example/src/main/resources/index-dev.html b/example/src/main/resources/index-dev.html
index 364241b..6f27812 100644
--- a/example/src/main/resources/index-dev.html
+++ b/example/src/main/resources/index-dev.html
@@ -14,7 +14,7 @@
<script type="text/javascript" src="../example-fastopt.js"></script>
<script>
- ScalaJSExample().main();
+ example.ScalaJSExample().main();
</script>
</body>
</html>
diff --git a/example/src/main/resources/index-opt.html b/example/src/main/resources/index-opt.html
index 5abb478..d8ad3ab 100644
--- a/example/src/main/resources/index-opt.html
+++ b/example/src/main/resources/index-opt.html
@@ -12,7 +12,7 @@
<script type="text/javascript" src="../example-opt.js"></script>
<script>
- ScalaJSExample().main();
+ example.ScalaJSExample().main();
</script>
</body>
</html>
diff --git a/example/src/main/scala/example/ScalaJSExample.scala b/example/src/main/scala/example/ScalaJSExample.scala
index 0255262..3298e4f 100644
--- a/example/src/main/scala/example/ScalaJSExample.scala
+++ b/example/src/main/scala/example/ScalaJSExample.scala
@@ -1,6 +1,7 @@
package example
import scala.scalajs.js.annotation.JSExport
import org.scalajs.dom
+import org.scalajs.dom.html
import scala.util.Random
case class Point(x: Int, y: Int){
@@ -8,14 +9,12 @@ case class Point(x: Int, y: Int){
def /(d: Int) = Point(x / d, y / d)
}
-// Seems like you need this for sbt ~fastOptJS to work
-// mkdir ~/.sbt/0.13/plugins/target/scala-2.10/sbt-0.13/classes
@JSExport
object ScalaJSExample {
val ctx =
dom.document
.getElementById("canvas")
- .asInstanceOf[dom.HTMLCanvasElement]
+ .asInstanceOf[html.Canvas]
.getContext("2d")
.asInstanceOf[dom.CanvasRenderingContext2D]
@@ -41,6 +40,6 @@ object ScalaJSExample {
}
@JSExport
def main(): Unit = {
- dom.setInterval(() => run, 10)
+ dom.window.setInterval(() => run, 10)
}
}