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

merged 3 commits into from
Nov 21, 2018

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Nov 20, 2018

No description provided.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Copy link
Member Author

rullzer commented Nov 20, 2018

@MorrisJobke can you test safari
@juliushaertl can you test IE11 and edge?

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.

Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

Code looks good! Haven't tested though.

Copy link
Member

@juliusknorr juliusknorr left a comment

Choose a reason for hiding this comment

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

Works again. 👍

Tested on IE, Edge, Safari, FF, Chromium

@juliusknorr juliusknorr merged commit 7b2f239 into master Nov 21, 2018
@juliusknorr juliusknorr deleted the use_videojs branch November 21, 2018 09:13
@jancborchardt
Copy link
Member

Thanks a lot for fixing this @rullzer! 🎉

@MorrisJobke MorrisJobke mentioned this pull request Nov 22, 2018
7 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants