Merge branch 'feature/transmit' of https://github.com/ropensci/plotly into feature/transmit

Author: cpsievert

DESCRIPTION

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

NEWS

@@ -1,3 +1,7 @@
+2.4.4 -- 13 Feb 2015
+
+as.widget() now returns htmlwidget objects untouched. See #449.
+
 2.4.3 -- 11 Feb 2015
 
 Ensure that we always return HTTPS links. Fixes #455

R/print.R

@@ -31,7 +31,9 @@ knit_print.plotly <- function(x, options, ...) {
 #' htmlwidgets::saveWidget(as.widget(p), "index.html")
 #' }
 #' 
+
 as.widget <- function(x, ...) {
+  if (inherits(x, "htmlwidget")) return(x)
   p <- plotly_build(x)
   # set some margin defaults if none are provided
   p$layout$margin <- modifyList(

inst/examples/Movies/server.R

@@ -1,7 +1,7 @@
 library(shiny)
 library(plotly)
+library(ggplot2movies) # movies is no longer contained within ggplot2 https://cran.r-project.org/web/packages/ggplot2movies/index.html
 
-data(movies, package = "ggplot2")
 minx <- min(movies$rating)
 maxx <- max(movies$rating)