From da48c504975617bceb9191a06229d5c730f335f8 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 10 May 2019 11:37:32 -0400 Subject: general cleanup, also object notes tweaks, removed authSession undefined foo --- www/js/EventCtrl.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'www/js/EventCtrl.js') diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 77a50a64..e06309aa 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -974,10 +974,10 @@ angular.module('zmApp.controllers') //$rootScope.zmPopup = $ionicPopup.alert({title: kFrame+':'+fid+'/'+kEvent+':'+e,template:img, cssClass:'popup80'}); - if ($rootScope.authSession != 'undefined') { + $scope.imgsrc += $rootScope.authSession; $scope.fallbackImgSrc += $rootScope.authSession; - } + $scope.imgsrc += NVR.insertBasicAuthToken(); @@ -2316,7 +2316,7 @@ angular.module('zmApp.controllers') videoURL = event.Event.recordingURL + "/index.php?view=view_video&eid=" + event.Event.Id; - if ($rootScope.authSession != 'undefined') videoURL += $rootScope.authSession; + videoURL += $rootScope.authSession; videoURL += NVR.insertBasicAuthToken(); @@ -2965,7 +2965,7 @@ angular.module('zmApp.controllers') NVR.getSnapshotFrame()+"&eid="+event.Event.Id + "&width=" + event.Event.thumbWidth * 2 + "&height=" + event.Event.thumbHeight * 2; - if ($rootScope.authSession != 'undefined') stream += $rootScope.authSession; + stream += $rootScope.authSession; stream += NVR.insertBasicAuthToken(); return stream; @@ -2979,7 +2979,7 @@ angular.module('zmApp.controllers') stream = event.Event.recordingURL + "/index.php?view=image" + "&fid=" + slide.id + $scope.outlineMotionParam; - if ($rootScope.authSession != 'undefined') stream += $rootScope.authSession; + stream += $rootScope.authSession; stream += NVR.insertBasicAuthToken(); @@ -2994,7 +2994,7 @@ angular.module('zmApp.controllers') stream = event.Event.recordingURL + "/index.php?view=image&fid=" + alarm.id; if (motion) stream += $scope.outlineMotionParam; - if ($rootScope.authSession != 'undefined') stream += $rootScope.authSession; + stream += $rootScope.authSession; stream += NVR.insertBasicAuthToken(); // console.log ("alarm:"+stream); -- cgit v1.2.3