Fix support for multiple scales for a visual property

rstudio · Jun 2, 2014 · 4a756e4 · hadley · Jun 3, 2014 · 4a756e4
1 parent f94e3a9
commit 4a756e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/R/ggvis.R b/R/ggvis.R
@@ -295,7 +295,7 @@ register_scale_info <- function(vis, props) {
   scale_infos <- compact(Map(build_info, names(props), props))
 
   # Add them to the vis
-  scales <- prop_to_scale(names(scale_infos))
+  scales <-vpluck(scale_infos, "scale", character(1))
   for (i in seq_along(scale_infos)) {
     vis <- add_scale_info(vis, scales[i], scale_infos[[i]])
   }

diff --git a/R/prop.R b/R/prop.R
@@ -139,7 +139,7 @@ prop_scale.default <- function(x, default_scale) {
 }
 
 # Reports whether this is a scaled prop
-prop_is_scaled <- function(prop) isTRUE(prop$scale)
+prop_is_scaled <- function(prop) prop$scale != FALSE
 
 # Generate a vega object for the individual mark.
 prop_vega <- function(x, default_scale) UseMethod("prop_vega")