Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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.

rullzer added 3 commits Nov 20, 2018
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 rullzer requested review from MorrisJobke and juliushaertl Nov 20, 2018
@rullzer rullzer force-pushed the use_videojs branch from 339e6b2 to 5a3b5b1 Nov 20, 2018
@rullzer rullzer mentioned this pull request Nov 20, 2018
@rullzer
Copy link
Member Author

@rullzer 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();

This comment has been minimized.

This comment has been minimized.

@rullzer

rullzer Nov 21, 2018
Author Member

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.

This comment has been minimized.

@rullzer

rullzer Nov 21, 2018
Author Member

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

This comment has been minimized.

@ChristophWurst

ChristophWurst Nov 21, 2018
Member

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.

This comment has been minimized.

@skjnldsv

skjnldsv Nov 21, 2018
Member

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

This comment has been minimized.

@ChristophWurst

ChristophWurst Nov 21, 2018
Member

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

Code looks good! Haven't tested though.

Copy link
Member

@juliushaertl juliushaertl left a comment

Works again. 👍

Tested on IE, Edge, Safari, FF, Chromium

@juliushaertl juliushaertl merged commit 7b2f239 into master Nov 21, 2018
3 checks passed
3 checks passed
continuous-integration/drone/pr the build was successful
Details
continuous-integration/drone/push the build was successful
Details
@fixupbot
fixupbot No fixup commits found. The commit history is clean
Details
@juliushaertl juliushaertl deleted the use_videojs branch Nov 21, 2018
@jancborchardt
Copy link
Member

@jancborchardt jancborchardt commented Nov 21, 2018

Thanks a lot for fixing this @rullzer! 🎉

@MorrisJobke MorrisJobke mentioned this pull request Nov 22, 2018
7 of 7 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants