Skip to content
This repository has been archived by the owner on May 28, 2024. It is now read-only.

Fix videoplayback on NC15 #68

Merged
merged 3 commits into from
Nov 21, 2018
Merged

Fix videoplayback on NC15 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a29174
Work with stricter csp
rullzer Nov 20, 2018
2f98c9a
Load the viewer
rullzer Nov 20, 2018
5a3b5b1
Move to js
rullzer Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 videojs/src/font/vjs.eot → js/videojs/font/vjs.eot
View file
Open in desktop
File renamed without changes.
0 videojs/src/font/vjs.svg → js/videojs/font/vjs.svg
View file
Open in desktop
File renamed without changes
0 videojs/src/font/vjs.ttf → js/videojs/font/vjs.ttf
View file
Open in desktop
File renamed without changes.
0 videojs/src/font/vjs.woff → js/videojs/font/vjs.woff
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/ar.js → js/videojs/lang/ar.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/bg.js → js/videojs/lang/bg.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/ca.js → js/videojs/lang/ca.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/cs.js → js/videojs/lang/cs.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/de.js → js/videojs/lang/de.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/es.js → js/videojs/lang/es.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/fr.js → js/videojs/lang/fr.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/hu.js → js/videojs/lang/hu.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/it.js → js/videojs/lang/it.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/ja.js → js/videojs/lang/ja.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/ko.js → js/videojs/lang/ko.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/nl.js → js/videojs/lang/nl.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/pt-BR.js → js/videojs/lang/pt-BR.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/ru.js → js/videojs/lang/ru.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/tr.js → js/videojs/lang/tr.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/uk.js → js/videojs/lang/uk.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/vi.js → js/videojs/lang/vi.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/zh-CN.js → js/videojs/lang/zh-CN.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/lang/zh-TW.js → js/videojs/lang/zh-TW.js
View file
Open in desktop
File renamed without changes.
0 videojs/src/video-js.css → js/videojs/video-js.css
View file
Open in desktop
File renamed without changes.
0 videojs/src/video.js → js/videojs/video.js
View file
Open in desktop
File renamed without changes.
16 changes: 13 additions & 3 deletions js/viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,20 @@ var videoViewer = {
return $.when();
} else {
this.videoJSLoaded = true;
var stylePath = OC.filePath('files_videoplayer', 'videojs', 'src/video-js.css');
var stylePath = OC.filePath('files_videoplayer', 'js', 'videojs/video-js.css');
$('head').append($('<link rel="stylesheet" type="text/css" href="' + stylePath + '"/>'));
var scriptPath = OC.filePath('files_videoplayer', 'videojs', 'src/video.js');
return $.getScript(scriptPath, function (xhr) {eval(xhr);});
var scriptPath = OC.filePath('files_videoplayer', 'js', 'videojs/video.js');

var deferred = $.Deferred();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is duplicating https://github.com/nextcloud/server/blob/b7767a51f140d3f588278f053f3a9e1eb84e4346/core/js/js.js#L364-L385, isn't it? Does $.getScript load the script differently?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I have no idea why or how but it is different. With $.getScript I did not have a videojs funtion after loading. This way i do.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ChristophWurst but it probably would make sense to look into a generic approach here indeed. This is just the quick fix for 15.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, they are indeed a bit different. Let's use this fix for 15 now and look into a proper npm setup for 16 where we can use dependabot and video.js from https://www.npmjs.com/package/video.js.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could integrate that with the slideshow/big picture we discussed in nextcloud/server#12382

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, sounds good. So let's npm'ize this repo for 16, switch to Vue and use a standardized component for the overlay.

var script = document.createElement('script');
script.src = scriptPath;
script.setAttribute('nonce', btoa(OC.requestToken));
script.onload = function() {
deferred.resolve();
};
document.head.appendChild(script);

return deferred;
}
},
videoJSLoaded: false,
Expand Down