3 files changed, 20 insertions, 18 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()
diff --git a/examples/demos/src/main/scala/advanced/BasicRx.scala b/examples/demos/src/main/scala/advanced/BasicRx.scala
index 1c9a0c8..99ccb84 100644
--- a/examples/demos/src/main/scala/advanced/BasicRx.scala
+++ b/examples/demos/src/main/scala/advanced/BasicRx.scala
@@ -5,11 +5,11 @@ import scalajs.js
 import scalajs.js.annotation.JSExport
 import rx._
 import scalatags.JsDom.all._
-
+import dom.html
 @JSExport
 object BasicRx {
   @JSExport
-  def main(container: dom.HTMLDivElement) = {
+  def main(container: html.Div) = {
     val txt = Var("")
     val numChars = Rx{txt().length}
     val numWords = Rx{
@@ -39,7 +39,7 @@ object BasicRx {
     )
   }
   @JSExport
-  def main2(container: dom.HTMLDivElement) = {
+  def main2(container: html.Div) = {
     val fruits = Seq(
       "Apple", "Apricot", "Banana", "Cherry",
       "Mango", "Mangosteen", "Mandarin",
diff --git a/examples/demos/src/main/scala/advanced/Futures.scala b/examples/demos/src/main/scala/advanced/Futures.scala
index d1142b9..995d768 100644
--- a/examples/demos/src/main/scala/advanced/Futures.scala
+++ b/examples/demos/src/main/scala/advanced/Futures.scala
@@ -1,8 +1,9 @@
 package advanced
 
 import org.scalajs.dom
+import dom.html
 import org.scalajs.dom.XMLHttpRequest
-import org.scalajs.dom.extensions.{Ajax, KeyCode}
+import org.scalajs.dom.ext.{Ajax, KeyCode}
 import scala.collection.mutable
 import scala.concurrent.Future
 import scalajs.js
@@ -11,8 +12,8 @@ import scalajs.js.annotation.JSExport
 import scalajs.concurrent.JSExecutionContext.Implicits.runNow
 @JSExport
 object Futures {
-  def main(container: dom.HTMLDivElement,
-            handle: (Seq[String], dom.HTMLDivElement) => Unit) = {
+  def main(container: html.Div,
+            handle: (Seq[String], html.Div) => Unit) = {
     val myInput = input(value:="London,Singapore,Berlin,New York").render
     val output = div.render
     myInput.onkeyup = (e: dom.KeyboardEvent) => {
@@ -42,7 +43,7 @@ object Futures {
                       .asInstanceOf[Double]
     kelvins - 272.15
   }
-  def formatResults(output: dom.HTMLElement, results: Seq[(String, Double)]) = {
+  def formatResults(output: html.Element, results: Seq[(String, Double)]) = {
     output.innerHTML = ""
     output.appendChild(ul(
       for((name, temp) <- results) yield li(
@@ -51,8 +52,8 @@ object Futures {
     ).render)
   }
   @JSExport
-  def main0(container: dom.HTMLDivElement) = {
-    def handle0(names: Seq[String], output: dom.HTMLDivElement) = {
+  def main0(container: html.Div) = {
+    def handle0(names: Seq[String], output: html.Div) = {
       val results = mutable.Buffer.empty[(String, Double)]
       for(name <- names){
         val xhr = new XMLHttpRequest
@@ -70,8 +71,8 @@ object Futures {
     main(container, handle0)
   }
   @JSExport
-  def main1(container: dom.HTMLDivElement) = {
-    def handle1(names: Seq[String], output: dom.HTMLDivElement) = {
+  def main1(container: html.Div) = {
+    def handle1(names: Seq[String], output: html.Div) = {
       val results = mutable.Buffer.empty[(String, Double)]
       for{
         name <- names
@@ -87,8 +88,8 @@ object Futures {
     main(container, handle1)
   }
   @JSExport
-  def main2(container: dom.HTMLDivElement) = {
-    def handle2(names: Seq[String], output: dom.HTMLDivElement) = {
+  def main2(container: html.Div) = {
+    def handle2(names: Seq[String], output: html.Div) = {
       val futures = for(name <- names) yield{
         Ajax.get(urlFor(name)).map( xhr =>
           (name, parseTemp(xhr.responseText))