From f4dc04a55ebda4aa209c2b0bef9205f710315090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 2 Feb 2017 12:23:02 +0100 Subject: Use proper encoded url - fixes #63 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Korella --- js/viewer.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/js/viewer.js b/js/viewer.js index c6ffeb1..0d2a103 100755 --- a/js/viewer.js +++ b/js/viewer.js @@ -62,7 +62,7 @@ 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 @@ -70,12 +70,7 @@ var videoViewer = { 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]; -- cgit v1.2.3 From ce39dd4c59145590e6b33d5b0325dfcc764bd151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Korella?= Date: Fri, 3 Feb 2017 16:02:27 +0100 Subject: improve comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Korella --- js/viewer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/viewer.js b/js/viewer.js index 0d2a103..29d51c4 100755 --- a/js/viewer.js +++ b/js/viewer.js @@ -65,7 +65,7 @@ var videoViewer = { '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; -- cgit v1.2.3