From 5fa0e4fd15b3eb3c722a7e9c40e5105b503356ef Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Tue, 17 Nov 2015 12:26:52 -0500 Subject: #88 - sky's the limit for timeline in desktop mode Former-commit-id: 0e00a0a0ca672bb0906388e563f29b7839eeb117 --- www/js/TimelineCtrl.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'www/js') diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index c32d530e..1a7faae6 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -276,6 +276,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla console.log ("*********************** TIMELINE MAIN "); + // maxItems will be ignored during timeline draw if its desktop var maxItems = zm.graphItemMax; // THAT magic # --> 300 and ZM on my m/c cries $scope.maxItems = maxItems; $scope.graphLoaded = false; @@ -496,7 +497,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla for (var j = 0; j < data.length; j++) { var myevents = data[j]; - if (graphIndex > zm.graphItemMax) { + if (graphIndex > zm.graphItemMax && $rootScope.platformOS != "desktop") { ZMDataModel.zmLog("Exiting page count graph - reached limit of " + zm.graphItemMax); break; @@ -555,7 +556,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla - if (graphIndex > zm.graphItemMax) { + if (graphIndex > zm.graphItemMax && $rootScope.platformOS != "desktop") { ZMDataModel.zmLog("Exiting event graph - reached limit of " + zm.graphItemMax); break; -- cgit v1.2.3