Skip to content

Commit 28c9ad9

Browse files
committed
Fix spelling and make dynamic URLs work for pluto rendering
1 parent 641df69 commit 28c9ad9

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

src/VegaLite.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ const vegaliate_app_includes_canvas = Ref{Bool}()
3333
const vlschema = Ref{Dict{String, Any}}()
3434

3535
function __init__()
36-
vegaliate_app_includes_canvas[] = ispath(vegaliate_app_path("node_modules", "canvas"))
36+
vegaliate_app_includes_canvas[] = ispath(vegalite_app_path("node_modules", "canvas"))
3737
vlschema[] = JSON.parsefile(
38-
vegaliate_app_path("schemas", "vega-lite-schema.json")
38+
vegalite_app_path("schemas", "vega-lite-schema.json")
3939
)
4040
end
4141

src/rendering/render.jl

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,17 @@
55
######################################################################
66
using JSON
77

8-
asset(url...) = normpath(vegaliate_app_path("minified", url...))
8+
asset(url...) = normpath(vegalite_app_path("minified", url...))
99

10-
package_json = JSON.parsefile(joinpath(vegaliate_app_path, "package.json"))
11-
version(package) = package_json["dependencies"][package]
10+
const package_json = Ref{Dict{String, Any}}()
11+
12+
function version(package)
13+
if !isassigned(package_json)
14+
package_json[] = JSON.parsefile(vegalite_app_path("package.json"))
15+
end
16+
17+
return package_json[]["dependencies"][package]
18+
end
1219

1320
# Vega Scaffold: https://github.com/vega/vega/wiki/Runtime
1421

src/rendering/show.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
function convert_vl_to_vg(v::VLSpec)
2-
vl2vg_script_path = vegaliate_app_path("vl2vg.js")
3-
p = open(Cmd(`$(nodejs_cmd()) $vl2vg_script_path`, dir=vegaliate_app_path()), "r+")
2+
vl2vg_script_path = vegalite_app_path("vl2vg.js")
3+
p = open(Cmd(`$(nodejs_cmd()) $vl2vg_script_path`, dir=vegalite_app_path()), "r+")
44
writer = @async begin
55
our_json_print(p, v)
66
close(p.in)
@@ -15,9 +15,9 @@ function convert_vl_to_vg(v::VLSpec)
1515
end
1616

1717
function convert_vl_to_x(v::VLSpec, second_script)
18-
vl2vg_script_path = vegaliate_app_path("vl2vg.js")
19-
full_second_script_path = vegaliate_app_path("node_modules", "vega-cli", "bin", second_script)
20-
p = open(pipeline(Cmd(`$(nodejs_cmd()) $vl2vg_script_path`, dir=vegaliate_app_path()), Cmd(`$(nodejs_cmd()) $full_second_script_path -l error`, dir=vegaliate_app_path())), "r+")
18+
vl2vg_script_path = vegalite_app_path("vl2vg.js")
19+
full_second_script_path = vegalite_app_path("node_modules", "vega-cli", "bin", second_script)
20+
p = open(pipeline(Cmd(`$(nodejs_cmd()) $vl2vg_script_path`, dir=vegalite_app_path()), Cmd(`$(nodejs_cmd()) $full_second_script_path -l error`, dir=vegalite_app_path())), "r+")
2121
writer = @async begin
2222
our_json_print(p, v)
2323
close(p.in)
@@ -34,7 +34,7 @@ end
3434
function convert_vl_to_svg(v::VLSpec)
3535
vl2vg_script_path = vegalite_app_path("vl2vg.js")
3636
vg2svg_script_path = vegalite_app_path("vg2svg.js")
37-
p = open(pipeline(Cmd(`$(nodejs_cmd()) $vl2vg_script_path`, dir=vegaliate_app_path()), Cmd(`$(nodejs_cmd()) $vg2svg_script_path`, dir=vegaliate_app_path())), "r+")
37+
p = open(pipeline(Cmd(`$(nodejs_cmd()) $vl2vg_script_path`, dir=vegalite_app_path()), Cmd(`$(nodejs_cmd()) $vg2svg_script_path`, dir=vegalite_app_path())), "r+")
3838
writer = @async begin
3939
our_json_print(p, v)
4040
close(p.in)

0 commit comments

Comments
 (0)