diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2017-08-17 14:12:03 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2017-08-17 14:12:03 -0400 |
| commit | 881c482c2de2afded44c7065e97b865cface04fd (patch) | |
| tree | 192acb77f3db8f6bec6f1e237ad019f5f5f60fa3 /www | |
| parent | fd0fca20f936fd43945c3ff1caa39b9fb04e1e4e (diff) | |
#526 - tweaks to do a new refresh for each image to (hopefully) reduce memory buildup via caching
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/MontageCtrl.js | 14 | ||||
| -rw-r--r-- | www/templates/montage.html | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 027cd052..d1185a8c 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -25,6 +25,11 @@ angular.module('zmApp.controllers') var ld; var refreshSec; + $rootScope.$on("auth-success", function () { + NVRDataModel.debug("REAUTH"); + console.log ("RETAUTH"); + NVRDataModel.stopNetwork(); + }); //-------------------------------------------------------------------------------------- @@ -495,6 +500,12 @@ angular.module('zmApp.controllers') }); } + function randEachTime() { + $scope.randToAvoidCacheMem = new Date().getTime(); + //$scope.randToAvoidCacheMem = "1"; + console.log ("Generating:"+$scope.randToAvoidCacheMem); + } + //----------------------------------------------------------------------- // re-compute rand so snapshot in montage reloads //----------------------------------------------------------------------- @@ -502,6 +513,9 @@ angular.module('zmApp.controllers') function loadNotifications() { + randEachTime(); + console.log ($scope.randToAvoidCacheMem); + if ($scope.areImagesLoading) { NVRDataModel.debug("skipping image refresh, packery is still loading"); diff --git a/www/templates/montage.html b/www/templates/montage.html index f835ce65..e591179f 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -105,14 +105,14 @@ - <img class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{monitor.Monitor.streamingURL}}/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" /> + <img class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{monitor.Monitor.streamingURL}}/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{randToAvoidCacheMem}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" /> </div> <div ng-if = "minimal"> - <img id="img-{{$index}}" image-spinner-src="{{monitor.Monitor.streamingURL}}/zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" /> + <img id="img-{{$index}}" image-spinner-src="{{monitor.Monitor.streamingURL}}/zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{randToAvoidCacheMem}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" /> </div> </div> |