merge with master

Author: cpsievert

.gitignore

@@ -3,3 +3,4 @@ Rapp.history
 *.Rhistory
 *.RData
 *.Rproj.user
+.Rproj.user

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via Plotly's JavaScript Graphing Library
-Version: 2.2.1
+Version: 2.2.2
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "cpsievert1@gmail.com"),
     person("Chris", "Parmer", role = c("aut", "cph"),

NEWS

@@ -1,7 +1,11 @@
-2.2.1 -- 13 Jan 2015
+2.2.2 -- 18 Jan 2015
 
 Fix bar orientation when we detect geom_bar() + coord_flip() in ggplotly(). Fixes #390.
 
+2.2.1 -- 18 Jan 2015
+
+Search for axis title in scene object. fixes #393.
+
 2.2.0 -- 13 Jan 2015
 
 The default for layout.hovermode is now 'closest' for non-line scatter traces

R/plotly.R

@@ -449,7 +449,7 @@ axis_titles <- function(x, l) {
   scene <- if (isTRUE(d$type %in% c("scatter3d", "surface"))) TRUE else FALSE
   for (i in c("x", "y", "z")) {
     ax <- paste0(i, "axis")
-    t <- x$layout[[ax]]$title
+    t <- x$layout[[ax]]$title %||% x$layout$scene[[ax]]$title
     if (is.null(t)) {
       idx <- which(names(argz) %in% i)
       if (length(idx)) {