diff --git a/static/scripts/frontpageControls.js b/static/scripts/frontpageControls.js index dc0bb784..52896efc 100644 --- a/static/scripts/frontpageControls.js +++ b/static/scripts/frontpageControls.js @@ -149,15 +149,27 @@ function moveAction(direction) { function processStatusMessage(data){ //console.log(data) - if (data.uploadFlag){ - if (!isDisabled){ + if (data.uploadFlag==1){ + if (isDisabled!=data.uploadFlag){ $('.disabler').prop('disabled', true); - isDisabled = true; + $('.ndisabler').prop('disabled', false); + $('.gcdisabler').prop('disabled', true); + isDisabled =data.uploadFlag; } - } else { - if (isDisabled){ + } else if (data.uploadFlag==2 || data.uploadFlag==-1 ){ + if (isDisabled!=data.uploadFlag){ + $('.gcdisabler').prop('disabled', true); $('.disabler').prop('disabled', false); - isDisabled = false; + $('.ndisabler').prop('disabled', false); + isDisabled = data.uploadFlag; + } + } + else { + if (isDisabled!=data.uploadFlag){ + $('.disabler').prop('disabled', false); + $('.ndisabler').prop('disabled', true); + $('.gcdisabler').prop('disabled', false); + isDisabled = data.uploadFlag; } } $("#currentTool").text(data.currentTool.toString()); diff --git a/templates/frontpage3d.html b/templates/frontpage3d.html index a902f1c6..ffbd31ec 100644 --- a/templates/frontpage3d.html +++ b/templates/frontpage3d.html @@ -24,44 +24,44 @@

Controls

-
+
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -71,10 +71,10 @@

Controls

- +
- +
@@ -84,10 +84,10 @@

Controls

- +
- +
diff --git a/templates/frontpage3d_mobilecontrols.html b/templates/frontpage3d_mobilecontrols.html index 2aeb7354..366076a1 100644 --- a/templates/frontpage3d_mobilecontrols.html +++ b/templates/frontpage3d_mobilecontrols.html @@ -16,51 +16,51 @@

Controls

-
-
-
-
-
-
-
-
-
@@ -73,12 +73,12 @@

Controls

- +
- +
@@ -89,7 +89,7 @@

Controls

- +
@@ -100,10 +100,10 @@

Controls

- +
- +