summaryrefslogtreecommitdiff
path: root/www/js/MontageCtrl.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/MontageCtrl.js')
-rw-r--r--www/js/MontageCtrl.js30
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
+ });*/
+
+ });