From bd6a7606c0d2364fd472f7903260a72f37b31f3b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 25 Jan 2014 23:21:01 +0100
Subject: Intégration statistiques
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Quelques corrections
https://github.com/marienfressinaud/FreshRSS/pull/390
en particulier correction bug chargement asynchrone JavaScript
Pour https://github.com/marienfressinaud/FreshRSS/issues/90
---
 app/views/index/stats.phtml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'app/views/index')

diff --git a/app/views/index/stats.phtml b/app/views/index/stats.phtml
index ab9d0a881..b1f0b8eb3 100644
--- a/app/views/index/stats.phtml
+++ b/app/views/index/stats.phtml
@@ -58,6 +58,15 @@
 </div>
 
 <script>
+"use strict";
+function initStats() {
+	if (!window.Flotr) {
+		if (window.console) {
+			console.log('FreshRSS waiting for Flotr…');
+		}
+		window.setTimeout(initStats, 50);
+		return;
+	}
 	// Entry per day
 	Flotr.draw(document.getElementById('statsEntryPerDay'),
 		[<?php echo $this->count ?>],
@@ -65,7 +74,7 @@
 			bars: {horizontal: false, show: true},
 			xaxis: {noTicks: 6, showLabels: false, tickDecimals: 0},
 			yaxis: {showLabels: false},
-			mouse: {relative: true, track: true, trackDecimals: 0,trackFormatter: function(obj) {return obj.y;}}
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.y;}}
 		});
 	// Feed per category
 	Flotr.draw(document.getElementById('statsFeedPerCategory'),
@@ -89,4 +98,6 @@
 			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.y;}},
 			legend: {container: document.getElementById('statsEntryPerCategoryLegend')}
 		});
-</script>
\ No newline at end of file
+}
+initStats();
+</script>
-- 
cgit v1.2.3