diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-11-23 16:24:56 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-11-23 16:24:56 -0400 |
| commit | d90a9534c04299c7eedefaf4388801722562ad09 (patch) | |
| tree | 9ce4da1f2e4f98e93ff90f8c89636470c5ea6745 /www/js/EventCtrl.js | |
| parent | 2118c797762d6ef2699a80b2dc3356a6f10d0bae (diff) | |
updates for #379 and #383 - you will now see both an MP4 and a GIF icon. MP4 will show only if you are on desktop and using 264 branch
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index dc52846e..830cc8d9 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -399,6 +399,13 @@ angular.module('zmApp.controllers') } + if (myevents[i].Event.imageMode == 'path') + //if (1) + myevents[i].Event.videoPath = myevents[i].Event.baseURL + "/events/" + myevents[i].Event.relativePath + myevents[i].Event.DefaultVideo; + else + myevents[i].Event.videoPath = myevents[i].Event.baseURL + "/index.php?view=view_video&eid=" + myevents[i].Event.Id; + + if (idfound) { $scope.events.push(myevents[i]); @@ -526,6 +533,16 @@ angular.module('zmApp.controllers') } + $scope.mp4warning = function() + { + $ionicPopup.alert( + { + title: $translate.instant('kNote'), + template: "{{'kVideoMp4Warning' | translate }}" + }); + }; + + $scope.showImage = function(p, r, f, fid, e, imode, id, parray, ndx) { var img; @@ -2121,6 +2138,15 @@ angular.module('zmApp.controllers') myevents[i].Event.BasePath = computeBasePath(myevents[i]); myevents[i].Event.relativePath = computeRelativePath(myevents[i]); myevents[i].Event.height = eventsListDetailsHeight; + + + if (myevents[i].Event.imageMode == 'path') + //if (1) + myevents[i].Event.videoPath = myevents[i].Event.baseURL + "/events/" + myevents[i].Event.relativePath + myevents[i].Event.DefaultVideo; + else + myevents[i].Event.videoPath = myevents[i].Event.baseURL + "/index.php?view=view_video&eid=" + myevents[i].Event.Id; + + if (idfound) $scope.events.push(myevents[i]); } |