summaryrefslogtreecommitdiff
path: root/www/js/EventModalCtrl.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-05-12 08:12:23 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-05-12 08:12:23 -0400
commit0d81a588d42c73c92d313f853461b433f8543ae4 (patch)
tree08590e3caad35938ec92c7a04bc3206409011284 /www/js/EventModalCtrl.js
parent971741dc3e0eaa26c3a56ceeab6ce6eece61b6ce (diff)
file formatting
Diffstat (limited to 'www/js/EventModalCtrl.js')
-rw-r--r--www/js/EventModalCtrl.js80
1 files changed, 41 insertions, 39 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index e16e1830..ebc4bafc 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -955,11 +955,13 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
if (m.snapshot == 'enabled') {
isSnapShotEnabled = true;
currentStreamState = streamState.SNAPSHOT;
- if (m.snapshotId) {
- $scope.snapshotFrameId = m.snapshotId;
- isGlobalFid = true;
+ if (m.snapshotId) {
+ $scope.snapshotFrameId = m.snapshotId;
+ isGlobalFid = true;
+ } else {
+ $scope.snapshotFrameId = 1;
+ isSnapShotEnabled = false;
}
- else { $scope.snapshotFrameId = 1; isSnapShotEnabled = false;}
eventId = m.eventId;
$scope.eventId = m.eventId;
@@ -1152,44 +1154,44 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
var ld = NVRDataModel.getLogin();
-
-
- var cmd;
- $scope.isPaused = false;
- switch (val) {
- case 'ff':
- cmd = 4;
- break;
- case 'fr':
- cmd = 7;
- break;
- case 'np':
- cmd = 2;
- break;
- case 'p':
- cmd = 1;
- $scope.isPaused = true;
- break;
- default:
- cmd = 0;
- }
- $ionicLoading.show({
- template: $translate.instant('kPleaseWait') + "...",
- noBackdrop: true,
- duration: zm.httpTimeout
- });
- sendCommand(cmd, $scope.connKey)
- .then(function (success) {
- $ionicLoading.hide();
+ var cmd;
+ $scope.isPaused = false;
+ switch (val) {
+ case 'ff':
+ cmd = 4;
+ break;
+ case 'fr':
+ cmd = 7;
+ break;
+ case 'np':
+ cmd = 2;
+ break;
+ case 'p':
+ cmd = 1;
+ $scope.isPaused = true;
+ break;
+ default:
+ cmd = 0;
+ }
- },
- function (err) {
- $ionicLoading.hide();
- NVRDataModel.debug("Error in adjust speed: " + JSON.stringify(err));
- }
- );
+ $ionicLoading.show({
+ template: $translate.instant('kPleaseWait') + "...",
+ noBackdrop: true,
+ duration: zm.httpTimeout
+ });
+
+ sendCommand(cmd, $scope.connKey)
+ .then(function (success) {
+ $ionicLoading.hide();
+
+ },
+ function (err) {
+ $ionicLoading.hide();
+ NVRDataModel.debug("Error in adjust speed: " + JSON.stringify(err));
+ }
+ );
};