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

fix display(d, m, x) where m expects a json string #756

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

fix display(d, m, x) where m expects a json string #756

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fd2a82f
fix display(d, m, x) where m expects a json string
cnliao Oct 9, 2018
f9aea33
add istextmime specialization
cnliao Oct 9, 2018
4e3a87e
jupyterlab 0.34.12 supports vega.v4 rather than v3
cnliao Oct 9, 2018
bd4afe7
refactor mime support
Oct 10, 2018
048f73b
merge things
Oct 10, 2018
1dfd237
improve upon #755 and add new mime for vega4
Oct 10, 2018
92b55f5
recklessly nuke workarounds for latex&js in inline.jl
Oct 10, 2018
8a7da6c
fix typo
Oct 12, 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
18 changes: 17 additions & 1 deletion src/inline.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const ipy_mime = [
"application/vnd.dataresource+json",
"application/vnd.vegalite.v2+json",
"application/vnd.vega.v3+json",
"application/vnd.vega.v4+json",
Copy link
Member

Choose a reason for hiding this comment

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

This also needs to be handled in the display_dict function, I think.

"text/html",
"text/latex",
"image/svg+xml",
Expand Down Expand Up @@ -47,14 +48,29 @@ function limitstringmime(mime::MIME, x)
return String(take!(buf))
end

const ipy_mime_json = [
"application/vnd.dataresource+json",
"application/vnd.vegalite.v2+json",
"application/vnd.vega.v3+json",
"application/vnd.vega.v4+json",
]
_display_dict(m::MIME, m_str, x) = Dict(m_str=>limitstringmime(m, x))
# escape JSON string correctly before send_ipython
for mime in ipy_mime_json
@eval begin
_display_dict(m::MIME{Symbol($mime)}, m_str, x) = Dict(m_str=>JSON.JSONText(limitstringmime(m, x)))
Base.Multimedia.istextmime(::MIME{Symbol($mime)}) = true
Copy link
Member

@stevengj stevengj Oct 9, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

I'm worried that this will conflict with other packages, since we don't "own" this type. (i.e. it is type piracy)

Maybe define _istextmime(::MIME{Symbol($mime)}) = true here, along with a fallback definition

_istextmime(m) = istextmime(m)

and then call _istextmime rather than textmime elsewhere in IJulia.

end
end

for mime in ipy_mime
@eval begin
function display(d::InlineDisplay, ::MIME{Symbol($mime)}, x)
send_ipython(publish[],
msg_pub(execute_msg, "display_data",
Dict(
"metadata" => metadata(x), # optional
"data" => Dict($mime => limitstringmime(MIME($mime), x)))))
"data" => _display_dict(MIME($mime), $mime, x))))
Copy link
Member

Choose a reason for hiding this comment

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

Rather than MIME($mime), you should just give the argument ::MIME{Symbol($mime)} a name, e.g. m, and use that. This way _display_dict will be dispatched statically here.

end
displayable(d::InlineDisplay, ::MIME{Symbol($mime)}) = true
end
Expand Down