diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-02-03 20:56:44 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-03 20:56:44 +0300 |
commit | edba6e1dab7244b1eb235d44db533ebe2774753e (patch) | |
tree | 4f29dee6b07fa542290481e79266718a0e131a9f | |
parent | a6a357fc72d6884a4b830e946c5be28787694fa7 (diff) | |
parent | ce39dd4c59145590e6b33d5b0325dfcc764bd151 (diff) |
Merge pull request #21 from nextcloud/encoding-fix-fixv12.0.0beta4v12.0.0beta3v12.0.0beta2v12.0.0beta1v12.0.0RC3v12.0.0RC2v12.0.0RC1v12.0.0
URL encoding fix
-rwxr-xr-x | js/viewer.js | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/js/viewer.js b/js/viewer.js index c6ffeb1..29d51c4 100755 --- a/js/viewer.js +++ b/js/viewer.js @@ -62,20 +62,15 @@ var videoViewer = { 'video/x-flv', 'video/ogg', 'video/quicktime', - 'video/x-matroska', + 'video/x-matroska' ], mimeTypeAliasses: { - 'video/x-matroska': 'video/webm' // chrome is a little kid that refuses to play mkv if it knows it's an mkv, webm uses the same container format + 'video/x-matroska': 'video/webm' // mkv support for Chrome. webm uses the same container format }, onView : function(file, data) { videoViewer.file = file; videoViewer.dir = data.dir; - if ($('#isPublic').length){ - // No seek for public videos atm, sorry - videoViewer.location = data.fileList.getDownloadUrl(file, videoViewer.dir); - } else { - videoViewer.location = OC.linkToRemote('webdav') + OC.joinPaths(videoViewer.dir, file); - } + videoViewer.location = data.fileList.getDownloadUrl(file, videoViewer.dir); videoViewer.mime = data.$file.attr('data-mime'); if (videoViewer.mimeTypeAliasses.hasOwnProperty(videoViewer.mime)) { videoViewer.mime = videoViewer.mimeTypeAliasses[videoViewer.mime]; |