tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

JS/ui: fix "running" timesince/timeuntil

Browse Source 
Broken got this by better English ;)
This commit is contained in:
Thomas Gelf 2014-06-20 13:54:16 +02:00
parent bd57f8f02a
commit 834a73f926
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/js/icinga/ui.js
View File

@ -511,25 +511,25 @@
refreshTimeSince: function () { refreshTimeSince: function () {
$('.timesince').each(function (idx, el) { $('.timesince').each(function (idx, el) {
var m = el.innerHTML.match(/^(-?\d+)m\s(-?\d+)s/); var m = el.innerHTML.match(/^(.*?)(-?\d+)m\s(-?\d+)s/);
if (m !== null) { if (m !== null) {
var nm = parseInt(m[1]); var nm = parseInt(m[2]);
var ns = parseInt(m[2]); var ns = parseInt(m[3]);
if (ns < 59) { if (ns < 59) {
ns++; ns++;
} else { } else {
ns = 0; ns = 0;
nm++; nm++;
} }
$(el).html(nm + 'm ' + ns + 's'); $(el).html(m[1] + nm + 'm ' + ns + 's');
} }
}); });
$('.timeuntil').each(function (idx, el) { $('.timeuntil').each(function (idx, el) {
var m = el.innerHTML.match(/^(-?\d+)m\s(-?\d+)s/); var m = el.innerHTML.match(/^(.*?)(-?\d+)m\s(-?\d+)s/);
if (m !== null) { if (m !== null) {
var nm = parseInt(m[1]); var nm = parseInt(m[2]);
var ns = parseInt(m[2]); var ns = parseInt(m[3]);
var signed = ''; var signed = '';
var sec = 0; var sec = 0;
@ -541,11 +541,11 @@
} else if (nm == 0 && ns == 0) { } else if (nm == 0 && ns == 0) {
signed = '-'; signed = '-';
sec = 1; sec = 1;
} else if (nm == 0 && m[1][0] == '-') { } else if (nm == 0 && m[2][0] == '-') {
signed = '-'; signed = '-';
sec = ns; sec = ns;
sec++; sec++;
} else if (nm == 0 && m[1][0] != '-') { } else if (nm == 0 && m[2][0] != '-') {
sec = ns; sec = ns;
sec--; sec--;
} else { } else {
@ -557,7 +557,7 @@
nm = Math.floor(sec/60); nm = Math.floor(sec/60);
ns = sec - nm * 60; ns = sec - nm * 60;
$(el).html(signed + nm + 'm ' + ns + 's'); $(el).html(m[1] + signed + nm + 'm ' + ns + 's');
} }
}); });
}, },