From 45aad4ccbebc878b568e3bbbb24cf0fae83c3a03 Mon Sep 17 00:00:00 2001
From: Gregor Aisch <contact@vis4.net>
Date: Tue, 15 Jan 2013 07:05:41 +0100
Subject: [PATCH] 'auto commit'
---
js/realtime-map.js | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/js/realtime-map.js b/js/realtime-map.js
index 7126d768eb..f5056676e5 100644
--- a/js/realtime-map.js
+++ b/js/realtime-map.js
@@ -122,7 +122,7 @@ RealTimeMap.run = function(config) {
// icons
ico(r.countryFlag)+ico(r.browserIcon)+ico(r.operatingSystemIcon)+'<br/>'+
// last action
- (ad && ad.length ? ad[ad.length-1].pageTitle+'<br/>' : '')+
+ (ad && ad.length && ad[ad.length-1].pageTitle ? ad[ad.length-1].pageTitle+'<br/>' : '')+
// time of visit
(ds < 90 ? RealTimeMap._.seconds_ago.replace('%s', '<b>'+val(ds)+'</b>')
: ds < 5400 ? RealTimeMap._.minutes_ago.replace('%s', '<b>'+val(ds/60)+'</b>')
@@ -221,9 +221,7 @@ RealTimeMap.run = function(config) {
* If firstRun is true, the SymbolGroup is initialized
*/
function refreshVisits(firstRun) {
- ajax(_reportParams(firstRun))
- .done(function(report) {
-
+ function gotNewReport(report) {
// successful request, so set timeout for next API call
nextReqTimer = setTimeout(refreshVisits, config.liveRefreshAfterMs);
@@ -245,6 +243,9 @@ RealTimeMap.run = function(config) {
evt.stopPropagation();
}
});
+
+ // clear existing report
+ lastVisits = [];
}
if (report.length) {
@@ -297,7 +298,15 @@ RealTimeMap.run = function(config) {
}
- });
+ }
+
+ if (firstRun && lastVisits.length) {
+ // zoom changed, use cached report data
+ gotNewReport(lastVisits.slice());
+ } else {
+ // request API for new data
+ ajax(_reportParams(firstRun)).done(gotNewReport);
+ }
}
/*
--
GitLab