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

Merge pull request #2707 from emanuelschuetze/fix-js-error

Browse Source 
Fix JS error after project pdf file.
This commit is contained in:
Norman Jäckel 2016-12-01 10:22:08 +01:00 committed by GitHub
commit 4604d687f1
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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