Offline viewer should always be a function

cpsievert · cpsievert · commit 4969d706db04 · 2015-08-26T15:42:16.000-05:00
diff --git a/R/offline.R b/R/offline.R
@@ -114,6 +114,6 @@ get_browser <- function() {
   # default web browser
   if (is.null(browseR) || !is.function(browseR) ||
       inherits(try(browseR('http://www.rstudio.com'), silent = TRUE), 'try-error'))
-    browseR = getOption("browser")
+    browseR = browseURL
   browseR
 }
diff --git a/R/print.R b/R/print.R
@@ -62,7 +62,7 @@ print.offline <- function(x, ...) {
   }
   index <- file.path(d, "index.html")
   res <- writeLines(html, index)
-  if (!is.null(x$viewer)) x$viewer(index)
+  if (is.function(x$viewer)) x$viewer(index)
 }
 
 #' Embed a plotly iframe into an R markdown document via \code{knit_print}

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,6 @@ get_browser <- function() {`
`114`	`114`	`# default web browser`
`115`	`115`	`if (is.null(browseR) \|\| !is.function(browseR) \|\|`
`116`	`116`	`inherits(try(browseR('http://www.rstudio.com'), silent = TRUE), 'try-error'))`
`117`		`- browseR = getOption("browser")`
	`117`	`+ browseR = browseURL`
`118`	`118`	`browseR`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ print.offline <- function(x, ...) {`
`62`	`62`	`}`
`63`	`63`	`index <- file.path(d, "index.html")`
`64`	`64`	`res <- writeLines(html, index)`
`65`		`- if (!is.null(x$viewer)) x$viewer(index)`
	`65`	`+ if (is.function(x$viewer)) x$viewer(index)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`#' Embed a plotly iframe into an R markdown document via \code{knit_print}`