diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-28 07:09:10 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-28 07:09:10 -0400 |
| commit | 6437d687721a6e1c03ea1227101cb806fc1dc145 (patch) | |
| tree | a69f8f826b0020c730da673ed2ed8ded87391edf /www/js | |
| parent | 92af0c08230d7c27048c818a4ff79c460dd44a08 (diff) | |
make sure video scrubbing inside event list works
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/EventCtrl.js | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index ebdff76e..5e228077 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -803,6 +803,13 @@ angular.module('zmApp.controllers') } } + $scope.readyToPlay = function(api) { + + api.mediaElement.attr("playsinline", ""); + + + }; + $scope.downloadFileToDevice = function(path, eid) { @@ -2457,10 +2464,10 @@ angular.module('zmApp.controllers') var videoURL; //if (event.Event.imageMode == 'path') - if (1) - videoURL = event.Event.baseURL + "/events/" + event.Event.relativePath + event.Event.DefaultVideo; - else - videoURL = event.Event.baseURL + "/index.php?view=view_video&eid=" + event.Event.Id; + + /* videoURL = event.Event.baseURL + "/events/" + event.Event.relativePath + event.Event.DefaultVideo;*/ + videoURL = event.Event.baseURL + "/index.php?view=view_video&eid=" + event.Event.Id; + // console.log("************** VIDEO IS " + videoURL); event.Event.video.config = { |