diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2015-03-27 12:35:51 +0100 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2015-03-27 12:35:51 +0100 |
| commit | f7f157cea1afd3386e46938a110c5a2ed72933fb (patch) | |
| tree | 22bdc2993769637212f066da45f841dc0701ed01 /vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala | |
| parent | 2881fb6ba97cbd496eebb4d785b2ba6e59fa303c (diff) | |
| parent | de730793fdb650e7e9a8dcc88ae84c3b153cd479 (diff) | |
| download | mavigator-f7f157cea1afd3386e46938a110c5a2ed72933fb.tar.gz mavigator-f7f157cea1afd3386e46938a110c5a2ed72933fb.tar.bz2 mavigator-f7f157cea1afd3386e46938a110c5a2ed72933fb.zip | |
Merge pull request #11 from jodersky/design/regions
New Layout
Diffstat (limited to 'vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala')
| -rw-r--r-- | vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala index 6f66208..5308b40 100644 --- a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala +++ b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala @@ -2,7 +2,6 @@ package vfd.dashboard.ui.panels import org.mavlink.messages.Attitude import org.scalajs.dom.html - import rx.core.Obs import scalatags.JsDom.all.bindNode import scalatags.JsDom.all.`class` @@ -16,10 +15,11 @@ import vfd.dashboard.MavlinkSocket import vfd.dashboard.ui.components.Altimeter import vfd.dashboard.ui.components.Compass import vfd.dashboard.ui.components.Horizon +import scalatags.jsdom.Frag object Primary { - def apply(socket: MavlinkSocket)(implicit env: Environment): html.Element = { + def apply(socket: MavlinkSocket)(implicit env: Environment): Frag = { val compass = new Compass val horizon = new Horizon @@ -39,7 +39,7 @@ object Primary { tr( td(compass.element), td(horizon.element), - td(altimeter.element)))).render + td(altimeter.element)))) } |