diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/EventModalCtrl.js | 36 | ||||
| -rw-r--r-- | www/js/NVR.js | 2 | ||||
| -rw-r--r-- | www/js/TimelineModalCtrl.js | 2 |
3 files changed, 12 insertions, 28 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index be97d773..e2f122f9 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -724,13 +724,10 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro url = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + - "&fid=" + $scope.slides[$scope.mycarousel.index - 1].id; + "&fid=" + $scope.slides[$scope.mycarousel.index - 1].id + $rootScope.authSession; - if ($rootScope.authSession != 'undefined') { - url += $rootScope.authSession; - - } + if ($rootScope.basicAuthToken) { url += "&basicauth=" + $rootScope.basicAuthToken; @@ -757,12 +754,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro if ($scope.slideIndex > 0) $scope.slideIndex--; - $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id; + $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id+ $rootScope.authSession; - if ($rootScope.authSession != 'undefined') { - $scope.selectEventUrl += $rootScope.authSession; - - } + if ($rootScope.basicAuthToken) { $scope.selectEventUrl += "&basicauth=" + $rootScope.basicAuthToken; @@ -783,12 +777,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro if ($scope.slideIndex < $scope.slideLastIndex) $scope.slideIndex++; - $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id; + $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id+ $rootScope.authSession; - if ($rootScope.authSession != 'undefined') { - $scope.selectEventUrl += $rootScope.authSession; - - } + if ($rootScope.basicAuthToken) { $scope.selectEventUrl += "&basicauth=" + $rootScope.basicAuthToken; @@ -810,12 +801,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.slideIndex = tempVar; - $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id; - - if ($rootScope.authSession != 'undefined') { - $scope.selectEventUrl += $rootScope.authSession; - - } + $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id+ $rootScope.authSession; + if ($rootScope.basicAuthToken) { $scope.selectEventUrl += "&basicauth=" + $rootScope.basicAuthToken; @@ -837,12 +824,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro if ($scope.slideIndex < $scope.slideLastIndex) $scope.slideIndex++; - $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id; + $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id+ $rootScope.authSession; - if ($rootScope.authSession != 'undefined') { - $scope.selectEventUrl += $rootScope.authSession; - - } + if ($rootScope.basicAuthToken) { $scope.selectEventUrl += "&basicauth=" + $rootScope.basicAuthToken; diff --git a/www/js/NVR.js b/www/js/NVR.js index 80f50a66..86b1224f 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -20,7 +20,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.060"; + var zmAppVersion = "1.3.061"; var isBackground = false; var justResumed = false; var timeSinceResumed = -1; diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js index 59210aa5..84952c56 100644 --- a/www/js/TimelineModalCtrl.js +++ b/www/js/TimelineModalCtrl.js @@ -122,7 +122,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' var img; //console.log("Image Mode " + imode); - img = "<img width='100%' ng-src='" + p + "/index.php?view=image&fid=" + id + "'>"; + img = "<img width='100%' ng-src='" + p + "/index.php?view=image&fid=" + id + $rootScope.authSession + "'>"; // console.log ("IS MULTISERVER SO IMAGE IS " + img); $rootScope.zmPopup = $ionicPopup.alert({ |