Merge branch 'master' of github.com:ropensci/plotly into fix/ns

Author: cpsievert

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via 'plotly.js'
-Version: 4.3.5
+Version: 4.3.6
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Chris", "Parmer", role = c("aut", "cph"),

NEWS.md

@@ -1,4 +1,15 @@
-# 4.3.5 --
+# 4.3.6 -- 9 September 2016
+
+## CHANGES
+
+* Upgraded to plotly.js v1.17.0 -- https://github.com/plotly/plotly.js/releases/tag/v1.17.0
+
+## BUG FIXES
+
+* Fix for error handling in `add_bars()`.
+* More careful logic for inferring data variables. Fixes #712
+
+# 4.3.5 -- 5 September 2016
 
 ## NEW FEATURES
 

R/add.R

@@ -274,8 +274,8 @@ add_area <- function(p, x = NULL, ymax = NULL, ...) {
 add_bars <- function(p, x = NULL, y = NULL, ...) {
   x <- x %||% p$x$attrs[[1]][["x"]]
   y <- y %||% p$x$attrs[[1]][["y"]]
-  if (is.null(x) && is.null(y)) {
-    stop("Must supply `x` and/or `y` attributes", call. = FALSE)
+  if (is.null(x) || is.null(y)) {
+    stop("Must supply `x` and `y` attributes", call. = FALSE)
   }
   # TODO: provide type checking in plotly_build for this trace type
   add_trace_classed(
@@ -451,6 +451,17 @@ add_trace_classed <- function(p, class = "plotly_polygon", ...) {
   p
 }
 
+# retrieve the non-plotly.js attributes for a given trace
+special_attrs <- function(trace) {
+  switch(
+    class(trace)[[1]],
+    plotly_area = c("ymax"),
+    plotly_segment = c("xend", "yend"),
+    plotly_ribbon = c("ymin", "ymax")
+  )
+}
+
+
 
 # #' 
 # #' 

R/plotly_POST.R

@@ -31,7 +31,7 @@
 #' @author Carson Sievert
 #' @examples
 #' \dontrun{
-#' p <- plot_ly(mtcars, x = vs, type = "bar")
+#' p <- plot_ly(mtcars, x = ~factor(vs))
 #' plotly_POST(p, filename = "mtcars-bar-plot")
 #' }