20
@@ -91,7 +91,6 @@
-
|
diff --git a/web/js/main.js b/web/js/main.js
index 6e31737..d431d57 100644
--- a/web/js/main.js
+++ b/web/js/main.js
@@ -168,6 +168,10 @@ $(document).ready(function() {
wsSend("setRightPoints", $("#mPunkteRight").val());
});
+ $("#newSumRes").click(function() {
+ wsSend("setSumRes", $("#mPunkteSum").val());
+ });
+
$("#alternateAnswerBtn").click(function(){
var is = $("#finalFragenSelect").val();
var answer = $("#alternateAnswer").val();
@@ -234,6 +238,12 @@ function setRightPoints(newPoints) {
}
}
+function setSumRes(newSumRes) {
+ $('#SumRes').text(newSumRes);
+ $("#mPunkteSum").val(newSumRes);
+ recalcSum(0);
+}
+
function startAnswerFail() {
if (sounds && (display || serverSound)) {
answerFail = new Audio('./sounds/failOriginal.ogg');
@@ -377,7 +387,6 @@ function changeFrage() {
}
function loadQuestionToGui(index) {
- console.log('oh noooo we are here');
$("#schweinchen3Img").hide();
$("#schweinchen1Img").hide();
$("#schweinchen2Img").hide();
@@ -389,7 +398,8 @@ function loadQuestionToGui(index) {
$("#ResSum_player1").toggle(isFinalMode);
$("#ResSum_player2").toggle(isFinalMode);
if (isFinalMode){
- $("#resultFinal").show();
+ $("#resultFinal").show();
+ $(".footer").hide();
} else {
$("#resultFinal").hide();
}
@@ -547,15 +557,8 @@ function recalcSum(s) {
function getAnswerString(str) {
if (isFinalMode){
- while(str.length < 21) {
- if (player2){
- str += " ";
- } else {
- str = " " + str;
- }
- }
- if (player2){
- str = str.replace(/ /g, " ");
+ while(str.length < 24) {
+ str = " " + str;
}
} else {
str += " ";
diff --git a/web/js/websocket.js b/web/js/websocket.js
index cf4e56b..4e140a2 100644
--- a/web/js/websocket.js
+++ b/web/js/websocket.js
@@ -159,6 +159,8 @@ var connectWs = function() {
setLeftPoints(value);
} else if(key == "setRightPoints") {
setRightPoints(value);
+ } else if(key == "setSumRes") {
+ setSumRes(value);
} else if(key == "startAnswerFail") {
startAnswerFail();
} else if(key == "startAnswerDuplicate") {
|