Merge pull request #1826 from owncloud/videoviewer-fileactions

Fixed file actions for video viewer

1 files changed, 2 insertions, 5 deletions

diff --git a/files_videoviewer/js/viewer.js b/files_videoviewer/js/viewer.js
index 94bb84f00..dd4a5626f 100644
--- a/files_videoviewer/js/viewer.js
+++ b/files_videoviewer/js/viewer.js
@@ -55,8 +55,8 @@ var videoViewer = {
 	onView : function(file, data) {
 		videoViewer.file = file;
 		videoViewer.dir = data.dir;
-		videoViewer.location = videoViewer.getMediaUrl(file);
-		videoViewer.mime = data.fileActions.currentFile.parent().attr('data-mime');
+		videoViewer.location = data.fileList.getDownloadUrl(file, videoViewer.dir);
+		videoViewer.mime = data.$file.attr('data-mime');
 		
 		OC.addScript('files_videoviewer','mediaelement-and-player', function(){
 			OC.addScript('files_videoviewer','mep-extra', videoViewer.showPlayer);
@@ -88,9 +88,6 @@ var videoViewer = {
 
 		videoViewer.UI.hide();
 	},
-	getMediaUrl : function(file) {
-		return fileDownloadPath(videoViewer.dir, file);
-	},
 	onKeyDown : function(e) {
 		if (e.keyCode == 27 && !$('.mejs-container-fullscreen').length && videoViewer.player) {
 			 videoViewer.hidePlayer();