diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 7 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 5 | ||||
| -rwxr-xr-x | www/js/app.js | 2 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 2 | ||||
| -rw-r--r-- | www/templates/montage.html | 2 |
5 files changed, 10 insertions, 8 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, {}); } diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 88d29574..0ead585c 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -143,7 +143,7 @@ </ul> </div> <div ng-if="!showPTZ && displayControls" class="monitor-modal-text">{{monitorName}} - <i ng-if="isStreamGood=='bad'" class="animated infinite flash ion-alert-circled assertive"></i> + <i ng-if="streamState=='bad'" class="animated infinite flash ion-alert-circled assertive"></i> <span ng-style="{'background-color':stateColor()}"> {{monStatus}} </span> </div> </div> diff --git a/www/templates/montage.html b/www/templates/montage.html index 02e4fd30..0a900ede 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -159,7 +159,7 @@ <span ng-if="monitor.Monitor.isStamp && isDragabillyOn"> <i class="animated infinite flash ion-pin"></i> </span> - <i ng-if="monitor.Monitor.isStreamGood=='bad'" class="animated infinite flash ion-alert-circled assertive"></i> + <i ng-if="monitor.Monitor.streamState=='bad'" class="animated infinite flash ion-alert-circled assertive"></i> <i class="ion-ios-videocam"></i> {{monitor.Monitor.Name}} </figcaption> |