diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-23 15:48:55 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-23 15:48:55 -0400 |
| commit | 49671ec9111972ddd198acc7ef3eba7ad344719d (patch) | |
| tree | e487e639c2bbe69555532d2c55811d82f055ca5e | |
| parent | 57dc82f2214da7ef73beea63c3b9473e12163191 (diff) | |
#606 don't show event headers if live during snapshot
| -rw-r--r-- | www/js/EventCtrl.js | 1 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 85421126..9a8bfdf2 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -2900,6 +2900,7 @@ angular.module('zmApp.controllers') id: 'footage', showLive:sl, // seems bool is not allowed... snapshot:snapshot, + snapshotId: event.Event.MaxScoreFrameId, eventId:event.Event.Id }) .then(function(modal) diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 46da0956..1dd469e1 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -12,10 +12,10 @@ <!--<div style="color:white">connkey:{{connKey}}</div>--> <div style="width:100vw; height:100vh;"> - <div ng-if="isSnapShot()" class="event-modal-play"> + <div ng-if="isSnapShot() && !liveFeedMid" class="event-modal-play"> <button class="button button-assertive icon ion-play" ng-click="convertSnapShotToStream()"> {{'kPlay'|translate}}</button> </div> - <div ng-if="isSnapShot()"> + <div ng-if="isSnapShot() && !liveFeedMid"> <div class="events-range-modal-text">{{mName}} <i class="ion-arrow-right-b"></i> {{videoDynamicTime}} ({{humanizeTime}}) [{{d_eventId}}] <span class="events-range-modal-warning-text">{{eventWarning}}</span> </div> </div> |