diff options
author | Vincent Petry <pvince81@owncloud.com> | 2014-07-02 20:40:24 +0400 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2014-07-02 20:40:24 +0400 |
commit | e03e0e62e28a6448aaa5575a3d6eca13eeaddd3e (patch) | |
tree | 4c92d564127727bdfc85bd41f7bfa17c74664ec7 /files_videoviewer | |
parent | c46ef6b6929befdaa19efffd31c471c0843d58b2 (diff) | |
parent | 57b7f68b0ef7ae194b390d0b69d02da2a180043c (diff) |
Merge pull request #1826 from owncloud/videoviewer-fileactions
Fixed file actions for video viewer
Diffstat (limited to 'files_videoviewer')
-rw-r--r-- | files_videoviewer/js/viewer.js | 7 |
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(); |