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

Get WebIO working on Binder #75

Merged
merged 5 commits into from
Mar 29, 2018
Merged

Get WebIO working on Binder #75

merged 5 commits into from
Mar 29, 2018

Conversation

djsegal
Copy link
Contributor

@djsegal djsegal commented Mar 21, 2018

@codecov-io
Copy link

codecov-io commented Mar 21, 2018

Codecov Report

Merging #75 into master will decrease coverage by 0.96%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master     #75      +/-   ##
=========================================
- Coverage   54.87%   53.9%   -0.97%     
=========================================
  Files          13      14       +1     
  Lines         390     397       +7     
=========================================
  Hits          214     214              
- Misses        176     183       +7
Impacted Files Coverage Δ
src/providers/ijulia_setup.jl 0% <0%> (ø) ⬆️
src/WebIO.jl 100% <0%> (ø) ⬆️
src/iframe.jl 0% <0%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2bc6667...2cf426e. Read the comment docs.

@djsegal djsegal changed the title Allow arbitrary jupyter host configs for setup Get WebIO working on Binder Mar 23, 2018
.match(/(.*)\\/notebooks\\/(.*)\\.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

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

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!

@djsegal
Copy link
Contributor Author

djsegal commented Mar 29, 2018

@shashi this is all done at this point.

hope i cleared up that one issue. let me know if you have any more thoughts. cheers!

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!

@shashi shashi merged commit a2e7a92 into JuliaGizmos:master Mar 29, 2018
@rdeits rdeits mentioned this pull request Mar 29, 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.

None yet

3 participants