diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-02-18 19:46:26 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-02-18 19:46:26 -0500 |
| commit | bdb68568d403220a381406a28fa5efe9389d636b (patch) | |
| tree | 4dcbf4bee331fb6817a744c490669243a75f35f8 /www/js/EventDateTimeFilterCtrl.js | |
| parent | 2bab34cae8b1d20b93ded717cb06faa3369f1244 (diff) | |
fix broken filters -> WKWebView goBack() doesn't seem to work
Diffstat (limited to 'www/js/EventDateTimeFilterCtrl.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; }; } |
