diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/EventDateTimeFilterCtrl.js | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js index a7e1763d..07eea5db 100644 --- a/www/js/EventDateTimeFilterCtrl.js +++ b/www/js/EventDateTimeFilterCtrl.js @@ -50,7 +50,14 @@ angular.module('zmApp.controllers') //console.log (">>> BACKVIEW="+$ionicHistory.backTitle()); if ($ionicHistory.backTitle() == 'Timeline') { - $ionicHistory.goBack(); + $ionicHistory.nextViewOptions({ + disableBack: true + }); + $state.go("app.timeline", { + "id": 0, + "playEvent": false + }); + return; } else // in events, backview is undefined? { $ionicHistory.nextViewOptions({ @@ -112,7 +119,14 @@ angular.module('zmApp.controllers') // // var startDate = moment(temp).format("YYYY-MM-DD hh:mm:ss"); NVR.debug("DateTimeFilter: From/To is now: " + $rootScope.fromString + " & " + $rootScope.toString); - $ionicHistory.goBack(); + $ionicHistory.nextViewOptions({ + disableBack: true + }); + $state.go("app.events", { + "id": 0, + "playEvent": false + }); + return; }; } |