Merge pull request #275 from ropensci/fix-jp-file-read

chriddyp · chriddyp · commit b7aaa8444b7e · 2015-08-26T17:11:48.000-04:00
maybe fix japanese file read error
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
@@ -41,7 +41,7 @@ knit_print.plotly <- function(x, options, ...) {
 #' @export
 print.offline <- function(x, ...) {
   off <- offline_bundle(jq = TRUE)
-  plotlyjs <- readChar(off, file.info(off)$size)
+  plotlyjs <- readChar(off, file.info(off)$size, useBytes=TRUE)
   html <- sprintf(
     '<!DOCTYPE html><html lang="en">
      <head>
@@ -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}
@@ -80,7 +80,7 @@ knit_print.offline <- function(x, options, ...) {
   # if this is the first plot, place bundle just before the plot
   if (length(knitr::knit_meta(class = "plotly", clean = FALSE)) == 0) {
     off <- offline_bundle(jq = TRUE)
-    b <- readChar(off, file.info(off)$size)
+    b <- readChar(off, file.info(off)$size, useBytes=TRUE)
     p <- paste0(
       sprintf('<script type="text/javascript">%s</script>', b),
       p

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`	`}`