diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-03-14 09:32:22 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-03-14 09:32:22 -0400 |
| commit | 5b6d9b5796475bed4f8fdcb9380bd6bc8baed661 (patch) | |
| tree | d57582efabce3cad6e35b1bea337c5ffa0a652cf /www/js/MontageCtrl.js | |
| parent | 7eb559a4f25ddef63ff9d35212e69f2f406172a8 (diff) | |
#598 new refresh mechanism
Diffstat (limited to 'www/js/MontageCtrl.js')
| -rw-r--r-- | www/js/MontageCtrl.js | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 7cf5b0d5..a88eed10 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -28,6 +28,7 @@ angular.module('zmApp.controllers') var ld; var refreshSec; var reloadPage = zm.forceMontageReloadDelay; + //var reloadPage = 30; var multiPortZms = 0; @@ -150,7 +151,34 @@ angular.module('zmApp.controllers') ld.reloadInMontage = true; NVRDataModel.log ("Reloading view to keep memory in check..."); NVRDataModel.setLogin(ld) - .then (function() {$window.location.reload();}); + .then (function() { + //window.location.reload(true); + //location.reload(); + //$ionicHistory.clearCache(); + //$state.go('app.montage'); + + console.log ("======HOPPAAAAA!!!========"+$state.current.name); + /*$ionicHistory.clearCache([$state.current.name]).then(function() { + $state.go('app.montage', $stateParams, {reload:true, inherit:false}); + });*/ + $ionicHistory.nextViewOptions({ + disableAnimate: true, + disableBack: true + }); + + $state.go('app.refresh', + { + "view": 'app.montage' + }); + + + /* $state.transitionTo($state.current, $stateParams, { + reload: true, + inherit: false, + notify: true + });*/ + + }); |
