Merge 4d833bf into 86b39b3

queryverse · Apr 25, 2018 · 087a834 · 087a834
2 parents 86b39b3 + 4d833bf
commit 087a834
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/deps/build.jl b/deps/build.jl
@@ -3,10 +3,10 @@
 using BinDeps
 @BinDeps.setup
 
-uschema   = "https://vega.github.io/schema/vega-lite/v2.1.3.json"
-uvega     = "https://cdnjs.cloudflare.com/ajax/libs/vega/3.1.0/vega.min.js"
-uvegalite = "https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.1.3/vega-lite.min.js"
-uembed    = "https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.0.0/vega-embed.min.js"
+uschema   = "https://vega.github.io/schema/vega-lite/v2.4.0.json"
+uvega     = "https://cdnjs.cloudflare.com/ajax/libs/vega/3.3.1/vega.min.js"
+uvegalite = "https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.4.0/vega-lite.min.js"
+uembed    = "https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.7.1/vega-embed.min.js"
 
 destdir      = joinpath(@__DIR__, "lib")
 

diff --git a/deps/package.json b/deps/package.json
@@ -3,8 +3,8 @@
   "version": "1.0.1",
   "dependencies": {
     "rw": "^1.3.3",
-    "vega": "^3.1.0",
-    "vega-lite": "^2.1.3",
+    "vega": "^3.3.1",
+    "vega-lite": "^2.4.0",
     "xmlhttprequest": "^1.8.0"
   }
 }
diff --git a/src/render.jl b/src/render.jl
@@ -96,9 +96,9 @@ function writehtml_partial(io::IO, spec::String; title="VegaLite plot")
 
     requirejs.config({
         paths: {
-          vg: "https://cdnjs.cloudflare.com/ajax/libs/vega/3.1.0/vega.min.js?noext",
-          vl: "https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.1.3/vega-lite.min.js?noext",
-          vg_embed: "https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.0.0/vega-embed.min.js?noext"
+          vg: "https://cdnjs.cloudflare.com/ajax/libs/vega/3.3.1/vega.min.js?noext",
+          vl: "https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.4.0/vega-lite.min.js?noext",
+          vg_embed: "https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.7.1/vega-embed.min.js?noext"
         },
         shim: {
           vg_embed: {deps: ["vg.global", "vl.global"]},

diff --git a/src/schema_parsing.jl b/src/schema_parsing.jl
@@ -151,11 +151,11 @@ fn = joinpath(@__DIR__, "../deps/lib/", "vega-lite-schema.json")
 schema = JSON.parsefile(fn)
 # showall(keys(schema["definitions"]))
 # schema["definitions"]["TopLevelProperties"]
-# schema["definitions"]["TopLevelExtendedSpec"]
+# schema["definitions"]["TopLevelSpec"]
 # collect(Iterators.filter(n -> startswith(n, "TopLevel"), keys(schema["definitions"])))
 
 refs = Dict{String, SpecDef}()
-rootSpec = toDef(schema["definitions"]["TopLevelExtendedSpec"])
+rootSpec = toDef(schema["definitions"]["TopLevelSpec"])
 
 # length(refs) # 124
 # dl = rootSpec.items[2].props["layer"]