From 9faf95be527b8b7c23e4ed4226c35bb771129f41 Mon Sep 17 00:00:00 2001 From: ARC Date: Fri, 1 May 2015 14:52:22 -0400 Subject: Made various tweaks to config files and code to make things work on Android. Using crosswalk for Android for better performance --- www/js/EventsGraphsCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/js/EventsGraphsCtrl.js') diff --git a/www/js/EventsGraphsCtrl.js b/www/js/EventsGraphsCtrl.js index 8523a5c7..5cd5e71a 100644 --- a/www/js/EventsGraphsCtrl.js +++ b/www/js/EventsGraphsCtrl.js @@ -87,7 +87,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', functio console.log("Monitor event URL:" + url); if (!ZMDataModel.isSimulated()) { - $http.get(url) + $http.get(url, {timeout:10000}) .success(function (data) { console.log("**** EVENT COUNT FOR MONITOR " + monitors[j].Monitor.Id + " IS " + data.pagination.count); -- cgit v1.2.3