diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-20 17:20:25 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-20 17:20:25 -0500 |
| commit | bf239e006e52349861a62dab2e2cdf2c5c484f58 (patch) | |
| tree | 37e058aa0c40da78e94c748f36ef9f0b03b730a2 | |
| parent | 8454b1836c03d70c2591b2e42d5ca28be7528a96 (diff) | |
#104 - configurable timeline items
Former-commit-id: 2aae9b3abc8f5498490768c4f027d5ac5b9ebdd2
| -rw-r--r-- | www/js/DataModel.js | 1 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 4 | ||||
| -rw-r--r-- | 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 @@ --> <div class="item item-input-inset"> - Montage event scale(%) + Montage image scale(%) <label class="item-input-wrapper"> <input type="tel" placeholder="max is 70" ng-model="loginData.montageQuality"> </label> @@ -54,6 +54,25 @@ </label> </div> + <div class="item item-input-inset"> + Max. items for Timeline + <label class="item-input-wrapper"> + <input type="tel" placeholder="200" ng-model="loginData.graphSize"> + <br/> + + </label> + <br/> + + </div> + + <div class="item" style="background-color:#C8F7C5" ng-if="loginData.graphSize > 400"> + <label class="animated fadeInDown item-text-wrap" > + + A value larger than 200 for mobile devices and 500 for desktops can affect timeline performance. + + </label> + </div> + <label> <ion-toggle ng-model="loginData.enableDebug" ng-checked="{{loginData.enableDebug}}" |