diff options
| -rw-r--r-- | www/index.html | 1 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 30 | ||||
| -rw-r--r-- | www/templates/refresh.html | 17 |
3 files changed, 47 insertions, 1 deletions
diff --git a/www/index.html b/www/index.html index 9a18d2a3..81753e52 100644 --- a/www/index.html +++ b/www/index.html @@ -131,6 +131,7 @@ <script src="js/EventsModalGraphCtrl.js"></script> <script src="js/InvalidApiCtrl.js"></script> <script src="js/MomentCtrl.js"></script> + <script src="js/RefreshCtrl.js"></script> 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 + });*/ + + }); diff --git a/www/templates/refresh.html b/www/templates/refresh.html new file mode 100644 index 00000000..e320f99b --- /dev/null +++ b/www/templates/refresh.html @@ -0,0 +1,17 @@ +<ion-view view-title="{{$root.appName}}" hide-nav-bar="true" hide-back-button="true" cache-view="false"> + <ion-content class="pin-background"> + <div style="margin-left:20px; margin-right:20px"> + <center> + <br/> + <br/> + <br/> + <span style="color:white"> + <h4 style="color:rgb(156, 156, 156)">{{'kLoading' | translate}}</h2> + + + </span> + <br/> + </center> + </div> + </ion-content> +</ion-view> |