From 59df9b978400e0e96ef2415a98fdaef02824ca33 Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Sun, 29 Sep 2013 16:30:29 +0000 Subject: web: modernized JS usage, fixed several bugs [Firehawke] --- web/index.html | 112 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 57 insertions(+), 55 deletions(-) (limited to 'web') diff --git a/web/index.html b/web/index.html index aded79c362b..c9d52419666 100644 --- a/web/index.html +++ b/web/index.html @@ -19,21 +19,23 @@ var writeConnectionStatus = function(message) { // Update the statusbar on each subpage at the same time. - document.getElementById('main_statusbar_connectionstatus').innerHTML = message; - document.getElementById('command_statusbar_connectionstatus').innerHTML = message; - document.getElementById('option_statusbar_connectionstatus').innerHTML = message; - document.getElementById('slider_statusbar_connectionstatus').innerHTML = message; - document.getElementById('driver_statusbar_connectionstatus').innerHTML = message; - document.getElementById('image_statusbar_connectionstatus').innerHTML = message; - document.getElementById('info_statusbar_connectionstatus').innerHTML = message; - document.getElementById('logs_statusbar_connectionstatus').innerHTML = message; + $("td#main_statusbar_connectionstatus").html(message); + $("td#command_statusbar_connectionstatus").html(message); + $("td#option_statusbar_connectionstatus").html(message); + $("td#slider_statusbar_connectionstatus").html(message); + $("td#driver_statusbar_connectionstatus").html(message); + $("td#image_statusbar_connectionstatus").html(message); + $("td#info_statusbar_connectionstatus").html(message); + $("td#logs_statusbar_connectionstatus").html(message); }; function takeScreenshot() { // First, we need to generate a random number to make absolutely sure we bypass browser caching. var random=Math.floor(Math.random()*999999999) - document.getElementById('screenshot').innerHTML = ''; + $("#screenshot").html(''); + // Navigate back to home so we can see the screenshot. + window.location.hash='#mainmenu'; } function executeCommands(command) @@ -148,28 +150,28 @@ maindesc_parent.push(data.parent); maindesc_sourcefile.push(data.source_file); - document.getElementById('main_statusbar_runningdriver').innerHTML = statusbar_runningdriver.join(''); - document.getElementById('main_statusbar_ispaused').innerHTML = statusbar_ispaused.join(''); - document.getElementById('command_statusbar_runningdriver').innerHTML = statusbar_runningdriver.join(''); - document.getElementById('command_statusbar_ispaused').innerHTML = statusbar_ispaused.join(''); - document.getElementById('option_statusbar_runningdriver').innerHTML = statusbar_runningdriver.join(''); - document.getElementById('option_statusbar_ispaused').innerHTML = statusbar_ispaused.join(''); - document.getElementById('slider_statusbar_runningdriver').innerHTML = statusbar_runningdriver.join(''); - document.getElementById('slider_statusbar_ispaused').innerHTML = statusbar_ispaused.join(''); - document.getElementById('driver_statusbar_runningdriver').innerHTML = statusbar_runningdriver.join(''); - document.getElementById('driver_statusbar_ispaused').innerHTML = statusbar_ispaused.join(''); - document.getElementById('image_statusbar_runningdriver').innerHTML = statusbar_runningdriver.join(''); - document.getElementById('image_statusbar_ispaused').innerHTML = statusbar_ispaused.join(''); - document.getElementById('info_statusbar_runningdriver').innerHTML = statusbar_runningdriver.join(''); - document.getElementById('info_statusbar_ispaused').innerHTML = statusbar_ispaused.join(''); - document.getElementById('logs_statusbar_runningdriver').innerHTML = statusbar_runningdriver.join(''); - document.getElementById('logs_statusbar_ispaused').innerHTML = statusbar_ispaused.join(''); - document.getElementById('maindesc_name').innerHTML = maindesc_name.join(''); - document.getElementById('maindesc_description').innerHTML = maindesc_description.join(''); - document.getElementById('maindesc_year').innerHTML = maindesc_year.join(''); - document.getElementById('maindesc_manufacturer').innerHTML = maindesc_manufacturer.join(''); - document.getElementById('maindesc_parent').innerHTML = maindesc_parent.join(''); - document.getElementById('maindesc_sourcefile').innerHTML = maindesc_sourcefile.join(''); + $("td#main_statusbar_runningdriver").html(statusbar_runningdriver.join('')); + $("td#main_statusbar_ispaused").html(statusbar_ispaused.join('')); + $("td#command_statusbar_runningdriver").html(statusbar_runningdriver.join('')); + $("td#command_statusbar_ispaused").html(statusbar_ispaused.join('')); + $("td#option_statusbar_runningdriver").html(statusbar_runningdriver.join('')); + $("td#option_statusbar_ispaused").html(statusbar_ispaused.join('')); + $("td#slider_statusbar_runningdriver").html(statusbar_runningdriver.join('')); + $("td#slider_statusbar_ispaused").html(statusbar_ispaused.join('')); + $("td#driver_statusbar_runningdriver").html(statusbar_runningdriver.join('')); + $("td#driver_statusbar_ispaused").html(statusbar_ispaused.join('')); + $("td#image_statusbar_runningdriver").html(statusbar_runningdriver.join('')); + $("td#image_statusbar_ispaused").html(statusbar_ispaused.join('')); + $("td#info_statusbar_runningdriver").html(statusbar_runningdriver.join('')); + $("td#info_statusbar_ispaused").html(statusbar_ispaused.join('')); + $("td#logs_statusbar_runningdriver").html(statusbar_runningdriver.join('')); + $("td#logs_statusbar_ispaused").html(statusbar_ispaused.join('')); + $("#maindesc_name").html(maindesc_name.join('')); + $("#maindesc_description").html(maindesc_description.join('')); + $("#maindesc_year").html(maindesc_year.join('')); + $("#maindesc_manufacturer").html(maindesc_manufacturer.join('')); + $("#maindesc_parent").html(maindesc_parent.join('')); + $("#maindesc_sourcefile").html(maindesc_sourcefile.join('')); }, error: function (request, status, error) { alert(status + ", " + error); } }); @@ -264,9 +266,9 @@

- - - + + +

@@ -467,9 +469,9 @@

- - - + + +

@@ -522,9 +524,9 @@

- - - + + +

@@ -578,9 +580,9 @@

- - - + + +

@@ -633,9 +635,9 @@

- - - + + +

@@ -688,9 +690,9 @@

- - - + + +

@@ -743,9 +745,9 @@

- - - + + +

@@ -798,9 +800,9 @@

- - - + + +

-- cgit v1.2.3-70-g09d2