Merge branch 'master' of https://github.com/ropensci/plotly into fix-ggplot2-dev

Author: cpsievert

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create interactive web-based graphs via plotly's API
-Version: 1.0.3
+Version: 1.0.4
 Authors@R: c(person("Chris", "Parmer", role = c("aut", "cph"),
     email = "[email protected]"),
     person("Scott", "Chamberlain", role = "aut",

NEWS

@@ -1,3 +1,7 @@
+1.0.4 -- 14 Aug 2015
+
+Bug fix for subplot. See #265
+
 1.0.3 -- 7 Aug 2015
 
 Improved legend positioning. See #241

R/plotly.R

@@ -218,8 +218,8 @@ plotly_build <- function(l = last_plot()) {
   for (i in seq_along(l$data)) {
     d <- l$data[[i]]
     # if appropriate, evaluate trace arguments in a suitable environment
-    idx <- names(d) %in% c("args", "env")
-    if (sum(idx) == 2) {
+    idx <- names(d) %in% c("args", "env", "enclos")
+    if (sum(idx) == 3) {
       dat <- c(d[!idx], eval(d$args, as.list(d$env), d$enclos))
       dat[c("args", "env", "enclos")] <- NULL
       # start processing specially named arguments
@@ -275,8 +275,8 @@ plotly_build <- function(l = last_plot()) {
   }
   for (i in seq_along(l$layout)) {
     layout <- l$layout[[i]]
-    idx <- names(layout) %in% c("args", "env")
-    x$layout[[i]] <- if (sum(idx) == 2) {
+    idx <- names(layout) %in% c("args", "env", "enclos")
+    x$layout[[i]] <- if (sum(idx) == 3) {
       c(layout[!idx], eval(layout$args, as.list(layout$env), layout$enclos)) 
     } else {
       layout
@@ -287,8 +287,8 @@ plotly_build <- function(l = last_plot()) {
   if (!is.null(l$style)) {
     for (i in seq_along(l$style)) {
       sty <- l$style[[i]]
-      idx <- names(sty) %in% c("args", "env")
-      new_sty <- if (sum(idx) == 2) c(sty[!idx], eval(sty$args, as.list(sty$env), sty$enclos)) else sty
+      idx <- names(sty) %in% c("args", "env", "enclos")
+      new_sty <- if (sum(idx) == 3) c(sty[!idx], eval(sty$args, as.list(sty$env), sty$enclos)) else sty
       for (k in sty$traces) x$data[[k]] <- modifyList(x$data[[k]], new_sty)
     }
   }

R/plotly_POST.R

@@ -31,10 +31,9 @@ plotly_POST <- function(x) {
   # empty keyword arguments can cause problems
   kwargs <- x[get_kwargs()]
   kwargs <- kwargs[sapply(kwargs, length) > 0]
-  
+
   # filename & fileopt are keyword arguments required by the API
   # (note they can also be specified by the user)
-  
   if (!is.null(x$url) || !is.null(kwargs$filename)) kwargs$fileopt <- "overwrite"
   if (is.null(kwargs$filename)) {
     kwargs$filename <- 

R/subplots.R

@@ -75,12 +75,13 @@ subplot <- function(..., nrows = 1, which_layout = "merge", margin = 0.02) {
   # bump x/y axis anchors appropriately
   p_info$xaxis <- sub("x1", "x", paste0("x", p_info$key))
   p_info$yaxis <- sub("y1", "y", paste0("y", p_info$key))
-  
   # Only do domain computations if they are _completely_ missing
   # (I don't think it makes sense to support partial specification of domains)
   if (all(is.na(with(p_info, c(xstart, xend, ystart, yend))))) {
-    p_info[c("xstart", "xend", "yend", "ystart")] <- 
-      get_domains(max(p_info$key), nrows, margin)
+    doms <- get_domains(max(p_info$key), nrows, margin)
+    doms$plot <- as.character(seq_len(nrow(doms)))
+    p_info <- p_info[!names(p_info) %in% c("xstart", "xend", "ystart", "yend")]
+    p_info <- plyr::join(p_info, doms, by = "plot")
   }
   # empty plot container that we'll fill up with new info
   p <- list(