esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

feature/MAPG-235-basic-challenge-mode #48

Merged
balazs merged 43 commits from feature/MAPG-235-basic-challenge-mode into develop 2021-05-28 20:41:09 +02:00
Conversation 0 Commits 43 Files Changed 28 +20 -10
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d4a279d2f4 - Show all commits

30
public/static/js/maps.js
View File

@ -67,17 +67,27 @@
var Util = { var Util = {
printTimeForHuman: function (time) { printTimeForHuman: function (time) {
if (time < 60) { const minutes = Math.floor(time / 60);
return '' + time + ' seconds'; const seconds = time % 60;
} else if (time == 60) { var time_str = '';
return '1 minute';
} else if (time % 60 == 0) { if (minutes == 1) {
return '' + Math.floor(time / 60) + ' minutes'; time_str += '1 minute';
} else if (time % 60 == 1) { } else if (minutes > 1) {
return '' + Math.floor(time / 60) + ' minutes and 1 second'; time_str += minutes + ' minutes';
} else {
return '' + Math.floor(time / 60) + ' minutes and ' + time % 60 + ' seconds';
} }
if (minutes > 0 && seconds > 0) {
time_str += ' and ';
}
if (seconds == 1) {
time_str += '1 second';
} else if (seconds > 1) {
time_str += seconds + ' seconds';
}
return time_str;
} }
}; };