Commit abc663e7 authored by auke.klazema's avatar auke.klazema
Browse files

Loaded all needed javascript in the index.html and removed all the...

Loaded all needed javascript in the index.html and removed all the eval(load()) constructs to enhance the debug capabilities.
parent a44bb83d
Pipeline #3 failed with stages
...@@ -127,6 +127,25 @@ ...@@ -127,6 +127,25 @@
<script src="js/load.js" type="application/javascript"></script> <script src="js/load.js" type="application/javascript"></script>
<script src="js/dt_websocket.js" type="application/javascript"></script>
<script src="js/dt_ui.js" type="application/javascript"></script>
<script src="js/trace.js" type="application/javascript"></script>
<script src="js/azel.js" type="application/javascript"></script>
<script src="js/j2000.js" type="application/javascript"></script>
<script src="js/status.js" type="application/javascript"></script>
<script src="js/manual.js" type="application/javascript"></script>
<script src="js/sun.js" type="application/javascript"></script>
<script src="js/moon.js" type="application/javascript"></script>
<script src="js/sat.js" type="application/javascript"></script>
<script src="js/dt_view.js" type="application/javascript"></script>
<script src="js/authorization.js" type="application/javascript"></script>
<script src="js/utils.js" type="application/javascript"></script>
<script src="js/offset.js" type="application/javascript"></script>
<script src="js/model.js" type="application/javascript"></script>
<script src="js/log.js" type="application/javascript"></script>
<script src="js/dt_status.js" type="application/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
/* /*
...@@ -150,25 +169,6 @@ ...@@ -150,25 +169,6 @@
*/ */
/* 'includes' */
eval(load("js/dt_ui.js"));
eval(load("js/trace.js"));
eval(load("js/azel.js"));
eval(load("js/j2000.js"));
eval(load("js/status.js"));
eval(load("js/manual.js"));
eval(load("js/sun.js"));
eval(load("js/moon.js"));
eval(load("js/sat.js"));
eval(load("js/dt_view.js"));
eval(load("js/authorization.js"));
eval(load("js/utils.js"));
eval(load("js/offset.js"));
eval(load("js/model.js"));
eval(load("js/dt_websocket.js"));
eval(load("js/log.js"));
eval(load("js/dt_status.js"));
new dt_websocket("ws://"+ window.location.host +"/dt"); new dt_websocket("ws://"+ window.location.host +"/dt");
/* /*
......
...@@ -24,10 +24,6 @@ var authorization_loaded; ...@@ -24,10 +24,6 @@ var authorization_loaded;
if (!authorization_loaded) { if (!authorization_loaded) {
authorization_loaded = true; authorization_loaded = true;
eval(load("js/dt_ui.js"));
eval(load("js/status.js"));
eval(load("js/dt_websocket.js"));
function authorization_tracker(name, ui_element, ind_element) function authorization_tracker(name, ui_element, ind_element)
{ {
this.name = name; this.name = name;
......
...@@ -34,12 +34,6 @@ var azel_loaded; ...@@ -34,12 +34,6 @@ var azel_loaded;
if (!azel_loaded) { if (!azel_loaded) {
azel_loaded = true; azel_loaded = true;
eval(load("js/utils.js"));
eval(load("js/dt_websocket.js"));
eval(load("js/dt_ui.js"));
function azel(element_name) { function azel(element_name) {
var azel_this = this; var azel_this = this;
......
...@@ -22,7 +22,6 @@ var dt_status_loaded; ...@@ -22,7 +22,6 @@ var dt_status_loaded;
if (!dt_status_loaded) { if (!dt_status_loaded) {
dt_status_loaded = true; dt_status_loaded = true;
function dt_status(element_name) { function dt_status(element_name) {
var dt_status_this = this; var dt_status_this = this;
......
...@@ -37,8 +37,6 @@ dt_ui_color_indicator_red = "#ff0000"; ...@@ -37,8 +37,6 @@ dt_ui_color_indicator_red = "#ff0000";
dt_ui_padding_height_window = 10; dt_ui_padding_height_window = 10;
dt_ui_padding_width_window = 10; dt_ui_padding_width_window = 10;
eval(load("js/trace.js"));
function strip_px(pos) function strip_px(pos)
{ {
return parseInt(pos.replace("px", "")) | 0; return parseInt(pos.replace("px", "")) | 0;
......
...@@ -29,9 +29,6 @@ j2000_loaded = true; ...@@ -29,9 +29,6 @@ j2000_loaded = true;
Communication with the tracker Communication with the tracker
*/ */
eval(load("js/dt_ui.js"));
eval(load("js/status.js"));
function j2000_command (url, ident) function j2000_command (url, ident)
{ {
this.ident = ident; this.ident = ident;
......
...@@ -23,9 +23,6 @@ var log_loaded; ...@@ -23,9 +23,6 @@ var log_loaded;
if (!log_loaded) { if (!log_loaded) {
log_loaded = true; log_loaded = true;
eval(load("js/dt_ui.js"));
eval(load("js/status.js"));
function log(element_name) { function log(element_name) {
var log_this = this; var log_this = this;
......
...@@ -24,9 +24,6 @@ var manual_loaded; ...@@ -24,9 +24,6 @@ var manual_loaded;
if (!manual_loaded) { if (!manual_loaded) {
manual_loaded = true; manual_loaded = true;
eval(load("js/dt_ui.js"));
var manual_command_url = "command.cgi_manual"; var manual_command_url = "command.cgi_manual";
......
...@@ -23,9 +23,6 @@ var model_loaded; ...@@ -23,9 +23,6 @@ var model_loaded;
if (!model_loaded) { if (!model_loaded) {
model_loaded = true; model_loaded = true;
eval(load("js/dt_ui.js"));
eval(load("js/status.js"));
function model(element_name) { function model(element_name) {
var model_this = this; var model_this = this;
......
...@@ -24,9 +24,6 @@ var moon_loaded; ...@@ -24,9 +24,6 @@ var moon_loaded;
if (!moon_loaded) { if (!moon_loaded) {
moon_loaded = true; moon_loaded = true;
eval(load("js/dt_ui.js"));
eval(load("js/utils.js"));
var moon_status_url = "status.cgi"; var moon_status_url = "status.cgi";
var moon_command_url = "command.cgi_moon"; var moon_command_url = "command.cgi_moon";
......
...@@ -23,11 +23,6 @@ var offset_loaded; ...@@ -23,11 +23,6 @@ var offset_loaded;
if (!offset_loaded) { if (!offset_loaded) {
offset_loaded = true; offset_loaded = true;
eval(load("js/dt_ui.js"));
eval(load("js/status.js"));
eval(load("js/dt_websocket.js"));
eval(load("js/utils.js"));
function offset(element_name) { function offset(element_name) {
var offset_this = this; var offset_this = this;
......
...@@ -27,10 +27,6 @@ sat_loaded = true; ...@@ -27,10 +27,6 @@ sat_loaded = true;
Communication with the tracker Communication with the tracker
*/ */
eval(load("js/dt_ui.js"));
eval(load("js/dt_view.js"));
eval(load("js/status.js"));
var sat_status_url = "status.cgi"; var sat_status_url = "status.cgi";
var sat_command_url = "command.cgi_sat"; var sat_command_url = "command.cgi_sat";
......
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
*/ */
eval(load("js/dt_websocket.js"));
var status_connected; var status_connected;
var status_priv_list = new Array(); var status_priv_list = new Array();
......
...@@ -24,10 +24,6 @@ var sun_loaded; ...@@ -24,10 +24,6 @@ var sun_loaded;
if (!sun_loaded) { if (!sun_loaded) {
sun_loaded = true; sun_loaded = true;
eval(load("js/dt_ui.js"));
eval(load("js/utils.js"));
eval(load("js/status.js"));
var sun_status_url = "status.cgi"; var sun_status_url = "status.cgi";
var sun_command_url = "command.cgi_sun"; var sun_command_url = "command.cgi_sun";
......
...@@ -21,9 +21,6 @@ var trace_loaded; ...@@ -21,9 +21,6 @@ var trace_loaded;
if (!trace_loaded) { if (!trace_loaded) {
trace_loaded = true; trace_loaded = true;
eval(load("js/dt_websocket.js"));
var trace_connected; var trace_connected;
function trace_cb_default (obj, time, value, unit) function trace_cb_default (obj, time, value, unit)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment