diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-02-24 20:29:30 -0800 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2016-02-24 20:31:14 -0800 |
| commit | a41de68066007852d7d3dbf019d75b4caf7463ad (patch) | |
| tree | b4446408291c9f179e1c270a561523023ac6a105 /mavigator-server/src/main/twirl/mavigator | |
| parent | 245faaf1e2ff4d0fbda292dbb35f4b49426d4380 (diff) | |
| download | mavigator-a41de68066007852d7d3dbf019d75b4caf7463ad.tar.gz mavigator-a41de68066007852d7d3dbf019d75b4caf7463ad.tar.bz2 mavigator-a41de68066007852d7d3dbf019d75b4caf7463ad.zip | |
Major refactorings
Diffstat (limited to 'mavigator-server/src/main/twirl/mavigator')
| -rw-r--r-- | mavigator-server/src/main/twirl/mavigator/views/app.scala.html | 27 | ||||
| -rw-r--r-- | mavigator-server/src/main/twirl/mavigator/views/dashboard.scala.html | 11 |
2 files changed, 18 insertions, 20 deletions
diff --git a/mavigator-server/src/main/twirl/mavigator/views/app.scala.html b/mavigator-server/src/main/twirl/mavigator/views/app.scala.html index 00459a9..34d1fde 100644 --- a/mavigator-server/src/main/twirl/mavigator/views/app.scala.html +++ b/mavigator-server/src/main/twirl/mavigator/views/app.scala.html @@ -1,11 +1,16 @@ -@(appId: String)(args: (String, String)*) +@(title: String, appId: String, args: Map[String, String]) + +@* +* Provides the environment and loads a scalajs application. +*@ + +@main(title){ <div id="scalajs-error" class="alert alert-danger" style="display: none;"> <p><strong><i class="fa fa-bug"></i> Error! </strong> An uncaught exception occurred in the browser application, any information displayed on this website may be corrupt. This is NOT an error that should occur under normal operation, it is an indication of a bug in the software.</p> - <p>The error was: "<span id="scalajs-error-message"></span>" - </p> + <p>The error was: "<span id="scalajs-error-message"></span>"</p> </div> <div id="@appId"> @@ -17,28 +22,32 @@ <script type="text/javascript"> document.addEventListener("DOMContentLoaded", function(event) { try { + //root element that will contain the ScalaJS application var root0 = document.getElementById("@appId"); + //clear any existing content while (root0.firstChild) { root0.removeChild(root0.firstChild); } + //run ScalaJS application @{appId}().start({ root: root0, assetsBase: "/assets", - args: @args.map{ case (key, value) => + args: {@args.map{ case (key, value) => @key: "@value", - } + }} }); - } catch(err) { + } catch(ex) { + //display warning message in case of exception document.getElementById("scalajs-error").style.display = "block"; - document.getElementById("scalajs-error-message").innerHTML = err; - console.error(err); - throw err; + document.getElementById("scalajs-error-message").innerHTML = ex; + throw ex; } }); </script> <script type="text/javascript" src="/assets/js/mavigator-dashboard-opt.js"></script> +} diff --git a/mavigator-server/src/main/twirl/mavigator/views/dashboard.scala.html b/mavigator-server/src/main/twirl/mavigator/views/dashboard.scala.html deleted file mode 100644 index 2b08797..0000000 --- a/mavigator-server/src/main/twirl/mavigator/views/dashboard.scala.html +++ /dev/null @@ -1,11 +0,0 @@ -@(socket: String, remoteSystemId: Byte, systemId: Byte, componentId: Byte) - -@main("Main"){ - @app("mavigator_dashboard_Main")( - "socketUrl" -> socket, - "remoteSystemId" -> remoteSystemId.toString, - "systemId" -> systemId.toString, - "componentId" -> componentId.toString - ) -} - |