diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-11-21 15:29:41 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-11-21 15:29:41 -0500 |
| commit | a9dff8d4aa7bd617ab20a6107fa474e17643e9f8 (patch) | |
| tree | 1e963eefe2c5de58bf74428ee13f724731b5c2ea /www/js/TimelineCtrl.js | |
| parent | 167ffb6505ccbf6f126a90d6b85c60940fc9c27b (diff) | |
#866 don't force a max viewport and recompute height on redraw
Diffstat (limited to 'www/js/TimelineCtrl.js')
| -rw-r--r-- | www/js/TimelineCtrl.js | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 450f5a6e..d030c131 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -326,6 +326,28 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla });*/ + + $scope.$on('sizechanged', function() { + + $timeout (function () { + if (timeline_instance) { + options.maxHeight = $rootScope.devHeight-100; + timeline_instance.setOptions(options); + timeline_instance.redraw(); + // console.log ('******* TIMELINE REDRAW'); + } + },10); + + }); + + + + + $scope.$on('$ionicView.beforeLeave', function () { + // window.removeEventListener("resize", redrawTimeline, false); + + }); + $scope.$on('$ionicView.beforeEnter', function () { $ionicSideMenuDelegate.canDragContent(false); $scope.$on ( "process-push", function () { @@ -356,7 +378,6 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla }; $scope.newEvents = ''; - if ($rootScope.platformOS == 'desktop') { @@ -1109,7 +1130,9 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla showCurrentTime: true, editable: false, verticalScroll: true, - height: '100%', + //height: '100%', + //maxHeight:"80%", + maxHeight:$rootScope.devHeight-100, //zoomKey: 'ctrlKey', //groupHeightMode:'fixed', |