showing nicer loading message for realtime map

matomo-org · Feb 27, 2013 · 046e966 · 046e966
1 parent 9d5a287
commit 046e966
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/plugins/UserCountryMap/.gitignore b/plugins/UserCountryMap/.gitignore
diff --git a/plugins/UserCountryMap/js/realtime-map.js b/plugins/UserCountryMap/js/realtime-map.js
@@ -265,6 +265,7 @@
 
                     // hide loading indicator
                     $('.realTimeMap_overlay img').hide();
+                    $('.realTimeMap_overlay .loading_data').hide();
 
                     // store current timestamp
                     now = new Date().getTime() / 1000;
@@ -304,21 +305,20 @@
                     }
 
                     if (report.length) {
-
                         // filter results without location
                         report = $.grep(report, function(r) {
                             return r.latitude !== null;
                         });
+                    }
 
-                        // check wether we got any geolocated visits left
-                        if (!report.length) {
-                            $('.realTimeMap_overlay').hide();
-                            $('#RealTimeMap_meta .noDataForReport').show();
-                            return;
-                        } else {
-                            $('#RealTimeMap_meta .noDataForReport').hide();
-                            $('.realTimeMap_overlay').show();
-                        }
+                    // check wether we got any geolocated visits left
+                    if (!report.length) {
+                        $('.realTimeMap_overlay .showing_visits_of').hide();
+                        $('.realTimeMap_overlay .no_data').show();
+                        return;
+                    } else {
+                        $('.realTimeMap_overlay .showing_visits_of').show();
+                        $('.realTimeMap_overlay .no_data').hide();
 
                         lastVisits = [].concat(report).concat(lastVisits).slice(0, maxVisits);
                         oldest = lastVisits[lastVisits.length-1].lastActionTimestamp;