diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MontageCtrl.js | 11 | ||||
| -rwxr-xr-x | www/js/app.js | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index f8ff4b01..02128ebc 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -850,10 +850,15 @@ angular.module('zmApp.controllers') disableAnimate: true, disableBack: true }); - $state.go("app.montage", { + + $state.go('app.refresh', { + "view": 'app.montage' + }); + + /* $state.go("app.montage", { minimal: $scope.minimal, isRefresh: true - }); + });*/ return; }; @@ -1623,7 +1628,7 @@ angular.module('zmApp.controllers') $scope.constructStream = function (monitor) { var stream; - //if (areStreamsStopped) return ""; //getmode doing snapshot now + if (areStreamsStopped) return ""; stream = monitor.Monitor.streamingURL + "/nph-zms?mode=" + getMode() + "&monitor=" + monitor.Monitor.Id + diff --git a/www/js/app.js b/www/js/app.js index 01928d5e..f6da56cd 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -644,12 +644,12 @@ angular.module('zmApp', [ //console.log (">>>>>>>>>>>>> INTERCEPT OBJECT " + JSON.stringify(config)); - if ($rootScope.zmCookie) { - config.headers.Cookie = "ZMSESSID=" + $rootScope.zmCookie; + // if ($rootScope.zmCookie) { + // config.headers.Cookie = "ZMSESSID=" + // $rootScope.zmCookie; // console.log (">>>>> WOOOT HAVE COOKIE AND USING: "+$rootScope.zmCookie); - } else { + // } else { // console.log ("No cookie present in " + config.url); - } + // } if ($rootScope.apiAuth) { // console.log("********** API AUTH"); |