From bf239e006e52349861a62dab2e2cdf2c5c484f58 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Fri, 20 Nov 2015 17:20:25 -0500 Subject: #104 - configurable timeline items Former-commit-id: 2aae9b3abc8f5498490768c4f027d5ac5b9ebdd2 --- www/js/DataModel.js | 1 + www/js/TimelineCtrl.js | 4 +++- www/templates/devoptions.html | 21 ++++++++++++++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/www/js/DataModel.js b/www/js/DataModel.js index fa64eeb8..1260f19b 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -57,6 +57,7 @@ angular.module('zmApp.controllers') 'montageOrder':'', 'montageHiddenOrder':'', 'montageArraySize':'0', + 'graphSize':200, }; diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 5569c0ca..7f100ff5 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -279,7 +279,9 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla console.log ("*********************** TIMELINE MAIN "); // maxItems will be ignored during timeline draw if its desktop - var maxItems = ($rootScope.platformOS == 'desktop') ? zm.graphDesktopItemMax: zm.graphItemMax; + // var maxItems = ($rootScope.platformOS == 'desktop') ? zm.graphDesktopItemMax: zm.graphItemMax; + var ld = ZMDataModel.getLogin(); + var maxItems = ld.graphSize || 200; $scope.maxItems = maxItems; $scope.graphLoaded = false; diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index 45140428..c60e13f0 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -41,7 +41,7 @@ -->
- Montage event scale(%)  + Montage image scale(%)  @@ -54,6 +54,25 @@
+
+ Max. items for Timeline  + +
+ +
+ +
+ +
+