Disambiguate classnames

Change the class of the plot_ly object (built but not widgetized)
to plotly_hash, and simplify print/knit_print methods. This fixes
compatibility issues with RStudio's upcoming R Notebook feature.

Author: jcheng5

NAMESPACE

@@ -12,7 +12,7 @@ S3method(geom2trace,GeomText)
 S3method(geom2trace,GeomTile)
 S3method(geom2trace,default)
 S3method(print,figure)
-S3method(print,plotly)
+S3method(print,plotly_hash)
 S3method(to_basic,GeomAbline)
 S3method(to_basic,GeomArea)
 S3method(to_basic,GeomBoxplot)
@@ -49,7 +49,7 @@ export(get_figure)
 export(gg2list)
 export(ggplotly)
 export(knit_print.figure)
-export(knit_print.plotly)
+export(knit_print.plotly_hash)
 export(last_plot)
 export(layout)
 export(offline)

R/print.R

@@ -5,9 +5,9 @@
 #' @export
 #' @importFrom htmlwidgets createWidget
 #' @importFrom htmlwidgets sizingPolicy
-print.plotly <- function(x, ...) {
-  if (!inherits(x, "htmlwidget")) x <- as.widget(x)
-  get("print.htmlwidget", envir = asNamespace("htmlwidgets"))(x, ...)
+print.plotly_hash <- function(x, ...) {
+  x <- as.widget(x)
+  print(x, ...)
 }
 
 #' Print a plotly object in a knitr doc
@@ -16,9 +16,9 @@ print.plotly <- function(x, ...) {
 #' @param options knitr options.
 #' @param ... additional arguments
 #' @export
-knit_print.plotly <- function(x, options, ...) {
-  if (!inherits(x, "htmlwidget")) x <- as.widget(x)
-  get("knit_print.htmlwidget", envir = asNamespace("htmlwidgets"))(x, options = options, ...)
+knit_print.plotly_hash <- function(x, options, ...) {
+  x <- as.widget(x)
+  knitr::knit_print(x, options, ...)
 }
 
 #' Convert a plotly object to an htmlwidget object

R/utils.R

@@ -36,7 +36,7 @@ hash_plot <- function(df, p) {
   assign(hash, p, envir = plotlyEnv)
   attr(df, "plotly_hash") <- hash
   # add plotly class mainly for printing method
-  class(df) <- unique(c("plotly", class(df)))
+  class(df) <- unique(c("plotly_hash", class(df)))
   # return a data frame to be compatible with things like dplyr
   df
 }