Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/files_videoplayer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2017-02-02 14:23:02 +0300
committerBjörn Korella <bjoern.korella@markenfilm-crossing.de>2017-02-03 17:59:54 +0300
commitf4dc04a55ebda4aa209c2b0bef9205f710315090 (patch)
tree3d982f8bd605b6744369bbb89b00acd33478ea4a /js
parenta6a357fc72d6884a4b830e946c5be28787694fa7 (diff)
Use proper encoded url - fixes #63
Signed-off-by: Björn Korella <bjoern.korella@markenfilm-crossing.de>
Diffstat (limited to 'js')
-rwxr-xr-xjs/viewer.js9
1 files 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];