From 6a50dabe66141929be7c41ac56251a11cb4af771 Mon Sep 17 00:00:00 2001 From: dularion Date: Mon, 1 Aug 2016 08:18:12 +0200 Subject: [PATCH] Black screen when using player #202 --- .../assets/javascripts/streama/services/player-service.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grails-app/assets/javascripts/streama/services/player-service.js b/grails-app/assets/javascripts/streama/services/player-service.js index e5bf5fbdc..19ba1898e 100644 --- a/grails-app/assets/javascripts/streama/services/player-service.js +++ b/grails-app/assets/javascripts/streama/services/player-service.js @@ -39,7 +39,7 @@ angular.module('streama').factory('playerService', setVideoOptions: function (video) { videoOptions = angular.copy(defaultVideoOptions); videoData = video; - videoOptions.videoSrc = $sce.trustAsResourceUrl(video.files[0].src); + videoOptions.videoSrc = $sce.trustAsResourceUrl(video.files[0].src || video.files[0].externalLink); videoOptions.videoType = video.files[0].contentType; if(video.subtitles && video.subtitles.length){ @@ -205,7 +205,7 @@ angular.module('streama').factory('playerService', var externalLink = video.files[0].externalLink; var basePath = location.origin + contextPath; - if(videoSource.indexOf(basePath) == -1 && !externalLink){ + if(videoSource && videoSource.indexOf(basePath) == -1 && !externalLink){ hasError = true; alertify.alert($filter('translate')('MESSAGES.WRONG_BASEPATH', {basePath: basePath}), function () { if(_.find($rootScope.currentUser.authorities, {authority: "ROLE_ADMIN"})){