diff options
| -rw-r--r-- | config.xml | 4 | ||||
| -rw-r--r-- | www/js/EventDateTimeFilterCtrl.js | 18 |
2 files changed, 18 insertions, 4 deletions
@@ -174,9 +174,9 @@ </plugin> <plugin name="cordova-custom-config" spec="5.0.2" /> <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" /> - <engine name="android" spec="7.1.4" /> - <engine name="ios" spec="4.5.5" /> <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git"> <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" /> </plugin> + <engine name="android" spec="7.1.4" /> + <engine name="ios" spec="4.5.5" /> </widget> 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; }; } |