Merge branch 'master' of https://github.com/ropensci/plotly

Author: cpsievert

.travis.yml

@@ -20,7 +20,6 @@ script:
 
 after_success:
   - cd ../plotly-test-table
-  - ls -R
   - Rscript ../plotly/inst/build-push-comment.R
 
 env:

R/trace_generation.R

@@ -541,7 +541,9 @@ geom2trace <- list(
               mode="markers",
               marker=paramORdefault(params, aes2marker, marker.defaults))
     if("size" %in% names(data)){
-      L$text <- paste("size:", data$size)
+      if(!("text" %in% names(data))) {
+        L$text <- paste("size:", data$size)
+      }
       L$marker$sizeref <- default.marker.sizeref
       # Make sure sizes are passed as a list even when there is only one element.
       s <- data$size