diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-17 12:26:52 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-17 12:26:52 -0500 |
| commit | 5fa0e4fd15b3eb3c722a7e9c40e5105b503356ef (patch) | |
| tree | 786ee389726f5fe85f18f40bb403263e60a9a87e /www | |
| parent | acf7d6e40babb1622a9f0dddb2eff50d7fe23c48 (diff) | |
#88 - sky's the limit for timeline in desktop mode
Former-commit-id: 0e00a0a0ca672bb0906388e563f29b7839eeb117
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/TimelineCtrl.js | 5 | ||||
| -rw-r--r-- | www/templates/timeline.html | 3 |
2 files changed, 5 insertions, 3 deletions
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; diff --git a/www/templates/timeline.html b/www/templates/timeline.html index c3633b72..71071098 100644 --- a/www/templates/timeline.html +++ b/www/templates/timeline.html @@ -26,7 +26,8 @@ <ion-content> <div style="padding-left:15px; font-size:10px; color:grey"> - {{prettify(fromDate)}} - {{prettify(toDate)}} (only displaying last {{maxItems}} events) + {{prettify(fromDate)}} - {{prettify(toDate)}} + <span ng-show="$root.platformOS!='desktop'">(only displaying last {{maxItems}} events)</span> </div> <div ng-if="!graphLoaded"> |