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 Universal Viewer embed code #3341

Merged
merged 1 commit into from
Oct 30, 2018
Merged

Fix Universal Viewer embed code #3341

merged 1 commit into from
Oct 30, 2018

Conversation

ghost
Copy link

@ghost ghost commented Oct 21, 2018

UV data-uri needs full URI otherwise the embed code won't work on other sites

Also, external sites will make a standard get request to the manifest, so we need to return the json manifest for both a json and html request

jcoyne
jcoyne previously approved these changes Oct 21, 2018
Copy link
Member

@jcoyne jcoyne left a comment

Choose a reason for hiding this comment

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

Looks good, but it seems like two distinct changes which would have been easier to review if each was its own pr.

@ghost ghost force-pushed the data_uri_uv branch 2 times, most recently from 5ef1356 to 40f8576 Compare October 21, 2018 19:58
@ghost
Copy link
Author

ghost commented Oct 21, 2018

@jcoyne good spot, there is a separate PR for the NL translation, which I've backed out of here.

Copy link
Member

@cjcolvar cjcolvar left a comment

Choose a reason for hiding this comment

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

👍 Looks good, but there is a failing test that is testing exact equality that needs to get updated here: https://github.com/samvera/hyrax/blob/master/spec/features/work_show_spec.rb#L46
It would probably be good to update the comment above that line as well.

@ghost
Copy link
Author

ghost commented Oct 24, 2018

The travis builds got all in a tangle when there were problems the other day, and now I can't seem to get them to run. Circle CI passed, is that enough?!

@ghost ghost changed the title Use polymorphic_url instead of _path for UV data-uri Fix Universal Viewer embed code Oct 24, 2018
@ghost ghost force-pushed the data_uri_uv branch 2 times, most recently from 8f1d236 to 9d4fe69 Compare October 24, 2018 13:27
and respond with json to html get request to the manifest url
@ghost ghost changed the title Fix Universal Viewer embed code [WIP] Fix Universal Viewer embed code Oct 24, 2018
@cjcolvar cjcolvar mentioned this pull request Oct 30, 2018
Copy link
Member

@cjcolvar cjcolvar left a comment

Choose a reason for hiding this comment

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

👍

@cjcolvar
Copy link
Member

I restarted the failed PR builds and now they don't have any test failures but are still exiting with an error. I'm going to go ahead and approve and merge this PR.

@cjcolvar cjcolvar merged commit 42adf60 into master Oct 30, 2018
@cjcolvar cjcolvar deleted the data_uri_uv branch October 30, 2018 17:53
@cjcolvar cjcolvar changed the title [WIP] Fix Universal Viewer embed code Fix Universal Viewer embed code Nov 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants