summaryrefslogtreecommitdiff
path: root/examples/demos/src/main/scala/advanced
diff options
context:
space:
mode:
authorLi Haoyi <haoyi@dropbox.com>2014-12-28 17:10:09 +0100
committerLi Haoyi <haoyi@dropbox.com>2014-12-28 17:10:09 +0100
commit47495632fb60bb6bdc4b61b3e00333dbe1182e7b (patch)
treeb3d80af29b2c3b640e34d3180d1608066a4ccfea /examples/demos/src/main/scala/advanced
parent63d9cf82d3c28b1d2aedd7ecb7c918342fcb5c50 (diff)
downloadhands-on-scala-js-47495632fb60bb6bdc4b61b3e00333dbe1182e7b.tar.gz
hands-on-scala-js-47495632fb60bb6bdc4b61b3e00333dbe1182e7b.tar.bz2
hands-on-scala-js-47495632fb60bb6bdc4b61b3e00333dbe1182e7b.zip
Shortened a bunch of imports, tweaked width
Diffstat (limited to 'examples/demos/src/main/scala/advanced')
-rw-r--r--examples/demos/src/main/scala/advanced/Async.scala2
-rw-r--r--examples/demos/src/main/scala/advanced/BasicRx.scala4
-rw-r--r--examples/demos/src/main/scala/advanced/Futures.scala6
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/demos/src/main/scala/advanced/Async.scala b/examples/demos/src/main/scala/advanced/Async.scala
index c4d7366..a76b78b 100644
--- a/examples/demos/src/main/scala/advanced/Async.scala
+++ b/examples/demos/src/main/scala/advanced/Async.scala
@@ -3,7 +3,7 @@ package advanced
import org.scalajs.dom
import concurrent._
import async.Async._
-import scala.scalajs.js.annotation.JSExport
+import scalajs.js.annotation.JSExport
import scalajs.concurrent.JSExecutionContext.Implicits.queue
@JSExport
diff --git a/examples/demos/src/main/scala/advanced/BasicRx.scala b/examples/demos/src/main/scala/advanced/BasicRx.scala
index 56b41b0..1c9a0c8 100644
--- a/examples/demos/src/main/scala/advanced/BasicRx.scala
+++ b/examples/demos/src/main/scala/advanced/BasicRx.scala
@@ -1,8 +1,8 @@
package advanced
import org.scalajs.dom
-import scala.scalajs.js
-import scala.scalajs.js.annotation.JSExport
+import scalajs.js
+import scalajs.js.annotation.JSExport
import rx._
import scalatags.JsDom.all._
diff --git a/examples/demos/src/main/scala/advanced/Futures.scala b/examples/demos/src/main/scala/advanced/Futures.scala
index 0d7107d..d1142b9 100644
--- a/examples/demos/src/main/scala/advanced/Futures.scala
+++ b/examples/demos/src/main/scala/advanced/Futures.scala
@@ -5,10 +5,10 @@ import org.scalajs.dom.XMLHttpRequest
import org.scalajs.dom.extensions.{Ajax, KeyCode}
import scala.collection.mutable
import scala.concurrent.Future
-import scala.scalajs.js
+import scalajs.js
import scalatags.JsDom.all._
-import scala.scalajs.js.annotation.JSExport
-import scala.scalajs.concurrent.JSExecutionContext.Implicits.runNow
+import scalajs.js.annotation.JSExport
+import scalajs.concurrent.JSExecutionContext.Implicits.runNow
@JSExport
object Futures {
def main(container: dom.HTMLDivElement,