Skip to content

Commit

Permalink
get rid of all the visibilityChangedAt code
Browse files Browse the repository at this point in the history
  • Loading branch information
jasoncalabrese committed Jul 28, 2015
1 parent 93240c5 commit 9902ea6
Showing 1 changed file with 14 additions and 24 deletions.
38 changes: 14 additions & 24 deletions static/js/client.js
Expand Up @@ -70,7 +70,6 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
, contextHeight
, dateFn = function (d) { return new Date(d.mills) }
, documentHidden = false
, visibilityChangedAt = Date.now()
, brush
, brushTimer
, brushInProgress = false
Expand Down Expand Up @@ -1287,21 +1286,17 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
var level = ago.status
, alarm = getClientAlarm(level + 'TimeAgo');

var visibilityChanged = Date.now() - visibilityChangedAt <= ONE_MIN_IN_MS;

if (!visibilityChanged) {
if (isStale(ago) && notAcked(alarm)) {
currentAlarmType = alarm.type;
console.info('generating timeAgoAlarm', alarm.type);
container.addClass('alarming-timeago');
var message = {'title': 'Last data received ' + [ago.value, ago.label].join(' ')};
var sound = level === 'warn' ? alarmSound : urgentAlarmSound;
generateAlarm(sound, message);
}

container.toggleClass('alarming-timeago', ago.status !== 'current');
if (isStale(ago) && notAcked(alarm)) {
currentAlarmType = alarm.type;
console.info('generating timeAgoAlarm', alarm.type);
container.addClass('alarming-timeago');
var message = {'title': 'Last data received ' + [ago.value, ago.label].join(' ')};
var sound = level === 'warn' ? alarmSound : urgentAlarmSound;
generateAlarm(sound, message);
}

container.toggleClass('alarming-timeago', ago.status !== 'current');

if (alarmingNow() && ago.status === 'current' && isTimeAgoAlarmType(currentAlarmType)) {
stopAlarm(true, ONE_MIN_IN_MS);
}
Expand All @@ -1327,17 +1322,13 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
}
}

if (Date.now() - visibilityChangedAt <= ONE_MIN_IN_MS && ago.status !== 'current' && !forceUpdate) {
console.info('visibility is changing now, wait till next tick to check time ago');
} else {
lastEntry.removeClass('current warn urgent');
lastEntry.addClass(ago.status);
lastEntry.removeClass('current warn urgent');
lastEntry.addClass(ago.status);

if (ago.status !== 'current') {
updateTitle();
}
checkTimeAgoAlarm(ago);
if (ago.status !== 'current') {
updateTitle();
}
checkTimeAgoAlarm(ago);

updateTimeAgoPill();
}
Expand Down Expand Up @@ -1441,7 +1432,6 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;

if (prevHidden && !documentHidden) {
console.info('Document now visible, updating - ' + new Date());
visibilityChangedAt = Date.now();
refreshChart(true);
}
});
Expand Down

0 comments on commit 9902ea6

Please sign in to comment.