diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 7 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 5 | ||||
| -rwxr-xr-x | www/js/app.js | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index 2d4d3bca..4b58de4f 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -576,7 +576,8 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ }; $scope.imageLoaded = function () { - console.log ("**** SINGLE IMAGE LOADED"); + NVR.debug ('single view image load complete'); + //console.log ("**** SINGLE IMAGE LOADED"); imageLoaded(); }; @@ -1454,12 +1455,12 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ NVR.log ("Single view: regenerating Connkey as Failed:"+query); $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); - $scope.isStreamGood = 'bad'; + $scope.streamState = 'bad'; } else if (succ.data && succ.data.result && succ.data.result == "Ok") { - $scope.isStreamGood = 'good'; + $scope.streamState = 'good'; } }, diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 4fba4ea0..fa5494ee 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -2093,14 +2093,15 @@ angular.module('zmApp.controllers') if (succ.data && succ.data.result && succ.data.result == "Error") { - $scope.MontageMonitors[i].Monitor.isStreamGood = 'bad'; + $scope.MontageMonitors[i].Monitor.streamState = 'bad'; NVR.log ("Montage View: Regenerating Connkey as Failed:"+query); $scope.MontageMonitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); } else if (succ.data && succ.data.result && succ.data.result == "Ok"){ - $scope.MontageMonitors[i].Monitor.isStreamGood = 'good'; + $scope.MontageMonitors[i].Monitor.streamState = 'good'; + //console.log (JSON.stringify(succ)); } }, diff --git a/www/js/app.js b/www/js/app.js index 2f2746ec..ebe73e8c 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -585,7 +585,7 @@ angular.module('zmApp', [ loader.remove(); if ($attributes.imageonload) { - console.log (">>>> IMAGE LOADED CBK"); + $scope.$apply($attributes.imageonload); // fn($scope, {}); } |