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.

Sign up for GitHub

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

Get WebIO working on Binder #75

Merged
merged 5 commits into from
Mar 29, 2018
Merged

Get WebIO working on Binder #75

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4c79c4
Allow arbitrary jupyter host configs for setup
djsegal Mar 21, 2018
4fbbe1b
Get webcomponents working in safari and firefox
djsegal Mar 23, 2018
541ece0
Get WebIO working with appmode in jupyter
djsegal Mar 28, 2018
23a455a
Scrub jupyter page of output divs after js loading
djsegal Mar 29, 2018
2cf426e
Replace script removal with padding collapsing
djsegal Mar 29, 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
8 changes: 7 additions & 1 deletion assets/webio/dist/bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3030,7 +3030,13 @@ module.exports = isArray || function (val) {
if (!webComponentsSupported) {
var script = document.createElement('script');
script.async = true;
script.src = '/pkg/WebIO/webio/dist/webcomponents-lite.min.js';

if ( document.getElementsByTagName("base").length === 0 ) {
script.src = '/pkg/WebIO/webio/dist/webcomponents-lite.min.js';
} else {
script.src = 'pkg/WebIO/webio/dist/webcomponents-lite.min.js';
}

document.head.appendChild(script);
document.addEventListener("WebComponentsReady", function () {
if (customElements.get("unsafe-script") === undefined) {
Expand Down
8 changes: 7 additions & 1 deletion assets/webio/unsafe_script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@
if (!webComponentsSupported) {
var script = document.createElement('script');
script.async = true;
script.src = '/pkg/WebIO/webio/dist/webcomponents-lite.min.js';

if ( document.getElementsByTagName("base").length === 0 ) {
script.src = '/pkg/WebIO/webio/dist/webcomponents-lite.min.js';
} else {
script.src = 'pkg/WebIO/webio/dist/webcomponents-lite.min.js';
}

document.head.appendChild(script);
document.addEventListener("WebComponentsReady", function () {
if (customElements.get("unsafe-script") === undefined) {
Expand Down
23 changes: 21 additions & 2 deletions src/providers/ijulia_setup.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,34 @@ function WebIO.register_renderable(T::Type)
end

function main()
display(HTML("<script src='/pkg/WebIO/webio/dist/bundle.js'></script>"))
display(HTML("<script src='/pkg/WebIO/providers/ijulia_setup.js'></script>"))
display(HTML("""
<script class='js-remove-script'>
var curMatch =
window.location.href
.match(/(.*)\\/notebooks\\/.*\\.ipynb/);

curMatch = curMatch ||
window.location.href
.match(/(.*)\\/apps\\/.*\\.ipynb/);

if ( curMatch ) {
\$('head').append('<base href="' + curMatch[1] + '/">');
Copy link
Member

Choose a reason for hiding this comment

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

is curMatch[1] correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know if it is as correct as much as it works.

The original idea at the time of writing it was that I was trying to parse out the hostname too.

It does work, though.

Alternatively, we just change:

                .match(/(.*)\\/notebooks\\/(.*)\\.ipynb/);

            if ( curMatch ) {
                \$('head').append('<base href="' + curMatch[1] + '/">');

to

                .match(/.*\\/notebooks\\/(.*)\\.ipynb/);

            if ( curMatch ) {
                \$('head').append('<base href="' + curMatch[0] + '/">');

Copy link
Member

Choose a reason for hiding this comment

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

It's confusing to me why you want to extract the name of the notebook.

I thought you wanted to set the base url to everything leading up to the /notebooks/. I'm probably misunderstanding something.

Copy link
Contributor Author

@djsegal djsegal Mar 29, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

what i said was completely wrong.

  • curMatch[0] = the full url (not a partial of the url)

Copy link
Member

Choose a reason for hiding this comment

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

LOL why not?

Copy link
Contributor Author

@djsegal djsegal Mar 29, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Sorry. That warning about not accepting PR was pre some other changes.

API for match is:

Quick example for the JS console:

> tmpMatch = window.location.href.match(/(.*)\/JuliaGizmos/)

["https://github.com/JuliaGizmos", "https://github.com", index: 0, input: "https://github.com/JuliaGizmos/WebIO.jl/pull/75", groups: undefined]

and then

> tmpMatch[0]
"https://github.com/JuliaGizmos"

> tmpMatch[1]
"https://github.com"

> tmpMatch[2]
undefined

Copy link
Member

Choose a reason for hiding this comment

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

Ah, nice! Looks good then. Sorry for not being schooled about how match works. If you revert the scrub output divs commit, I'll hit merge. Appreciate this useful feature!

}
</script>
"""))

display(HTML("<script class='js-remove-script' src='pkg/WebIO/webio/dist/bundle.js'></script>"))
display(HTML("<script class='js-remove-script' src='pkg/WebIO/providers/ijulia_setup.js'></script>"))

display(HTML("<script class='js-remove-script'>\$('.js-remove-script').closest('.output_area').remove();</script>"))
Copy link
Member

Choose a reason for hiding this comment

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

This will cause reloading the page to lose the JS....

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Very interesting... I'll just do a padding = 0 trick then!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry for trying to slip that in

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!


comm = Comm(:webio_comm)
conn = IJuliaConnection(comm)
comm.on_msg = function (msg)
data = msg.content["data"]
WebIO.dispatch(conn, data)
end

nothing
end

Expand Down