Merge pull request 'MAPG-226 change remaining time calculation' (#21) from feature/MAPG-226-change-timeout-algorithm into develop

Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/21
MAPG-226 change remaining time calculation
2021-04-10 19:00:20 +02:00 · 2021-04-10 18:59:27 +02:00 · 2021-04-04 23:41:05 +02:00 · 2021-04-04 23:40:27 +02:00
2 changed files with 7 additions and 7 deletions
@@ -5,7 +5,7 @@ process.title = 'mapguesser-multi';
 class MultiGame {
    static ROUND_TIMEOUT_DEFAULT = 120000;
    static ROUND_TIMEOUT_MINIMUM = 15000;
-    static ROUND_TIMEOUT_DIVIDER = 2;
+    static ROUND_TIMEOUT_DIVIDER = 1.5;
    static ROUND_TIMEOUT_OFFSET = 500;

    constructor() {
@@ -155,7 +155,7 @@ class MultiGame {
        } else {
            round.timeout = round.timeout - (new Date() - round.timeoutStarted);
            if (round.timeout > MultiGame.ROUND_TIMEOUT_DIVIDER * MultiGame.ROUND_TIMEOUT_MINIMUM) {
-                round.timeout = round.timeout / MultiGame.ROUND_TIMEOUT_DIVIDER;
+                round.timeout = Math.round(round.timeout / MultiGame.ROUND_TIMEOUT_DIVIDER);
            } else if (round.timeout > MultiGame.ROUND_TIMEOUT_MINIMUM) {
                round.timeout = MultiGame.ROUND_TIMEOUT_MINIMUM;
            }
@@ -202,11 +202,6 @@
                    return;
                }

-                // TODO: refactor - it is necessary for mobile
-                if (window.getComputedStyle(document.getElementById('guess')).visibility === 'hidden') {
-                    document.getElementById('showGuessButton').click();
-                }
-
                document.getElementById('guessButton').disabled = true;
                document.getElementById('panoCover').style.visibility = 'visible';

@@ -466,6 +461,11 @@
        },

        showResultMap: function (result, resultBounds) {
+            // TODO: refactor - it is necessary for mobile
+            if (window.getComputedStyle(document.getElementById('guess')).visibility === 'hidden') {
+                document.getElementById('showGuessButton').click();
+            }
+
            if (Game.adaptGuess) {
                document.getElementById('guess').classList.remove('adapt');
            }
Author	SHA1	Message	Date
bence	1a40e3a18d	Merge pull request 'MAPG-226 change remaining time calculation' (#21) from feature/MAPG-226-change-timeout-algorithm into develop default-pipeline default-pipeline #106 Details Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/21	2021-04-10 19:00:20 +02:00
bence	1aa5d3b43e	MAPG-226 change remaining time calculation	2021-04-10 18:59:27 +02:00
bence	a418d5cf66	Merge pull request 'MAPG-213 move visibility workaround to Game.showResultMap' (#20) from bugfix/MAPG-213-result-map-not-show-on-mobile-after-reload into develop Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/20	2021-04-04 23:41:05 +02:00
bence	5cae286a5b	MAPG-213 move visibility workaround to Game.showResultMap	2021-04-04 23:40:27 +02:00