diff options
author | Jakob Odersky <jakob@odersky.com> | 2016-02-02 18:43:38 -0800 |
---|---|---|
committer | Jakob Odersky <jakob@odersky.com> | 2016-02-02 18:43:38 -0800 |
commit | 3acbe7f93b89c87373d222b20de218d60e328d24 (patch) | |
tree | cd27c83d0c93196242d3d0d3ce2fae1df8dd7864 /mavigator-dashboard/src/main/scala/mavigator/dashboard/Main.scala | |
parent | db026b7d40f01a4a42ec542e98ef301bd75e9266 (diff) | |
download | mavigator-3acbe7f93b89c87373d222b20de218d60e328d24.tar.gz mavigator-3acbe7f93b89c87373d222b20de218d60e328d24.tar.bz2 mavigator-3acbe7f93b89c87373d222b20de218d60e328d24.zip |
Move javascript to new layout
Diffstat (limited to 'mavigator-dashboard/src/main/scala/mavigator/dashboard/Main.scala')
-rw-r--r-- | mavigator-dashboard/src/main/scala/mavigator/dashboard/Main.scala | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/mavigator-dashboard/src/main/scala/mavigator/dashboard/Main.scala b/mavigator-dashboard/src/main/scala/mavigator/dashboard/Main.scala index 71c5378..d313008 100644 --- a/mavigator-dashboard/src/main/scala/mavigator/dashboard/Main.scala +++ b/mavigator-dashboard/src/main/scala/mavigator/dashboard/Main.scala @@ -1,25 +1,22 @@ -package vfd.dashboard +package mavigator.dashboard import scala.scalajs.js import scala.scalajs.js.annotation.JSExport import org.scalajs.dom.html -import vfd.dashboard.ui.Layout +import mavigator.dashboard.ui.Layout +import mavigator.util.Environment + +import scalatags.JsDom.all._ @JSExport("Main") -object Main { +object Main extends mavigator.util.Application { - @JSExport - def main(rootElement: html.Element, assetsBase: String, args: js.Dictionary[String]) = { - implicit val env = new Environment { - def root = rootElement - def asset(file: String) = assetsBase + "/" + file - } - + override def main(args: Map[String, String])(implicit env: Environment): Unit = { val socket = new MavlinkSocket(args("socketUrl"), args("remoteSystemId").toInt) val layout = new Layout(socket) env.root.appendChild(layout.element) } -}
\ No newline at end of file +} |