david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixded CM.Disp.GetTimeColor

Browse Source
This commit is contained in:
Daniel van Noord
2020-12-03 15:28:38 +01:00
parent 63c3a493fa
commit 95f19fbfd7
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CookieMonster.js
View File

@@ -1188,10 +1188,18 @@ CM.Disp.FormatTime = function(time, longFormat) {
*/ */
CM.Disp.GetTimeColor = function(time) { CM.Disp.GetTimeColor = function(time) {
var color; var color;
var text = CM.Disp.FormatTime(time); var text;
if (time < 0) {
if (CM.Config.TimeFormat) text = '00:00:00:00:00';
else text = 'Done!';
color = CM.Disp.colorGreen;
}
else {
text = CM.Disp.FormatTime(time);
if (time > 300) color = CM.Disp.colorRed; if (time > 300) color = CM.Disp.colorRed;
else if (time > 60) color = CM.Disp.colorOrange; else if (time > 60) color = CM.Disp.colorOrange;
else color = CM.Disp.colorYellow; else color = CM.Disp.colorYellow;
}
return {text: text, color: color}; return {text: text, color: color};
} }

10
src/Disp.js
View File

@@ -313,10 +313,18 @@ CM.Disp.FormatTime = function(time, longFormat) {
*/ */
CM.Disp.GetTimeColor = function(time) { CM.Disp.GetTimeColor = function(time) {
var color; var color;
var text = CM.Disp.FormatTime(time); var text;
if (time < 0) {
if (CM.Config.TimeFormat) text = '00:00:00:00:00';
else text = 'Done!';
color = CM.Disp.colorGreen;
}
else {
text = CM.Disp.FormatTime(time);
if (time > 300) color = CM.Disp.colorRed; if (time > 300) color = CM.Disp.colorRed;
else if (time > 60) color = CM.Disp.colorOrange; else if (time > 60) color = CM.Disp.colorOrange;
else color = CM.Disp.colorYellow; else color = CM.Disp.colorYellow;
}
return {text: text, color: color}; return {text: text, color: color};
} }