diff options
Diffstat (limited to 'www')
| -rwxr-xr-x | www/js/DataModel.js | 4 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index b8bd10a6..7f297f5f 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -1646,6 +1646,7 @@ angular.module('zmApp.controllers') debug ("DataModel: Regenerating connkeys..."); for (var i=0; i < monitors.length; i++){ monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); + monitors[i].Monitor.rndKey = (Math.floor((Math.random() * 999999) + 1)).toString(); } }, @@ -1706,6 +1707,7 @@ angular.module('zmApp.controllers') monitors[i].Monitor.listDisplay = 'show'; monitors[i].Monitor.isAlarmed = false; monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); + monitors[i].Monitor.rndKey = (Math.floor((Math.random() * 999999) + 1)).toString(); var serverFound = false; for (var j = 0; j < multiservers.length; j++) { @@ -1796,6 +1798,7 @@ angular.module('zmApp.controllers') //monitors[i].Monitor.listDisplay = 'show'; monitors[i].Monitor.isAlarmed = false; monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); + monitors[i].Monitor.rndKey = (Math.floor((Math.random() * 999999) + 1)).toString(); var st2 = loginData.streamingurl; @@ -1847,6 +1850,7 @@ angular.module('zmApp.controllers') //monitors[i].Monitor.listDisplay = 'show'; monitors[i].Monitor.isAlarmed = false; monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); + monitors[i].Monitor.rndKey = (Math.floor((Math.random() * 999999) + 1)).toString(); var st = loginData.streamingurl; if (zmsPort >0) { // we need to insert minport diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index d224c4fc..eaca75ab 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -1258,7 +1258,7 @@ angular.module('zmApp.controllers') // let modal go to snapshot mode in render $timeout (function () { $scope.modal.remove(); - }) + }); // We now need to regen connkeys // once regenerated @@ -1766,6 +1766,7 @@ angular.module('zmApp.controllers') "&monitor="+monitor.Monitor.Id + "&scale="+$scope.LoginData.montageQuality + $rootScope.authSession + + "&rand="+monitor.Monitor.rndKey; //"&rand="+$scope.randToAvoidCacheMem + appendConnKey (monitor.Monitor.connKey); |