ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2807 from matakuka/mediafile_project_2706 

Bind mediafile to projector scope (fixes #2706)
This commit is contained in:
Norman Jäckel 2017-01-06 11:05:33 +01:00 committed by GitHub
parent 85c70b27f5 912dc1af8f
commit 85298554a3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openslides/mediafiles/static/js/mediafiles/projector.js
View File

@ -21,15 +21,14 @@ angular.module('OpenSlidesApp.mediafiles.projector', [
'Mediafile',
function ($scope, Mediafile) {
// load mediafile object
var mediafile = Mediafile.get($scope.element.id);
$scope.mediafile = mediafile;
Mediafile.bindOne($scope.element.id, $scope, 'mediafile');
// Allow the elements to render properly
setTimeout(function() {
if ($scope.mediafile) {
if ($scope.mediafile.is_pdf) {
$scope.pdfName = mediafile.title;
$scope.pdfUrl = mediafile.mediafileUrl;
$scope.pdfName = $scope.mediafile.title;
$scope.pdfUrl = $scope.mediafile.mediafileUrl;
} else if ($scope.mediafile.is_video) {
var player = angular.element.find('#video-player')[0];
if ($scope.element.playing) {