diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-11-22 18:20:39 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-11-22 18:20:39 -0400 |
| commit | 5eac484a44243b7d1a41036f4d25c4f23dcc6e76 (patch) | |
| tree | d54285d4b8e32f890a0def48fa8195459be14fed /www/js/EventCtrl.js | |
| parent | b9c58df13788fd7aec1a1e3a91d76beab5d8f01b (diff) | |
other video related updates
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 98557f7a..dc52846e 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -95,9 +95,7 @@ angular.module('zmApp.controllers') { showHiddenMonitors = false; } - // console.log (">>>>>>>>>>>>>>>>>SHOWHIDDEN IS " + showHiddenMonitors); - - // lets get the abbreviated version of TZ to display + if (NVRDataModel.getLogin().useLocalTimeZone) { $scope.tzAbbr = moment().tz(moment.tz.guess()).zoneAbbr(); @@ -203,22 +201,7 @@ angular.module('zmApp.controllers') $http.get(apiurl) .success(function(data) {}) .error(function(err) {}); - /* - myevents[i].Event.humanizeTime = humanizeTime(myevents[i].Event.StartTime); - myevents[i].Event.MonitorName = NVRDataModel.getMonitorName(myevents[i].Event.MonitorId); - // now construct base path - - myevents[i].Event.streamingURL = NVRDataModel.getStreamingURL(myevents[i].Event.MonitorId); - myevents[i].Event.baseURL = NVRDataModel.getBaseURL(myevents[i].Event.MonitorId); - myevents[i].Event.imageMode = NVRDataModel.getImageMode(myevents[i].Event.MonitorId); - // console.log ("***** MULTISERVER STREAMING URL FOR EVENTS " + myevents[i].Event.streamingURL); - - // console.log ("***** MULTISERVER BASE URL FOR EVENTS " + myevents[i].Event.baseURL); - - myevents[i].Event.ShowScrub = false; - myevents[i].Event.BasePath = computeBasePath(myevents[i]); - myevents[i].Event.relativePath = computeRelativePath(myevents[i]); - */ + } function getTextZoomCallback(tz) @@ -948,7 +931,7 @@ angular.module('zmApp.controllers') { template: $translate.instant('kPleaseWait') + "...", noBackdrop: true, - //duration: 10000 + duration: 20000 }); prepareImages(e) @@ -961,10 +944,10 @@ angular.module('zmApp.controllers') var ad = adjustAspect(e); console.log("SAVING W=" + ad.w + " H=" + ad.h); - //AnimatedGIF.setRepeat(null); + gifshot.createGIF( { - //'images': ['http://i.imgur.com/2OO33vX.jpg', 'http://i.imgur.com/qOwVaSN.png', 'http://i.imgur.com/Vo5mFZJ.gif'], + 'gifWidth': ad.w, 'gifHeight': ad.h, 'images': imgs, @@ -977,7 +960,7 @@ angular.module('zmApp.controllers') 'progressCallback': function (cp) { var p = Math.round(cp * 100); - $ionicLoading.show({template: $translate.instant('kPleaseWait') + "...("+p+"%)",noBackdrop: true});} + $ionicLoading.show({template: $translate.instant('kPleaseWait') + "...("+p+"%)",noBackdrop: true });} }, function(obj) { if (!obj.error) |