Merge pull request #448 from ropensci/fix/ggplot2-domain

cpsievert · cpsievert · commit fde8b4078463 · 2016-02-02T11:36:53.000-05:00
Fix/ggplot2 domain
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via Plotly's JavaScript Graphing Library
-Version: 2.4.0
+Version: 2.4.1
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "cpsievert1@gmail.com"),
     person("Chris", "Parmer", role = c("aut", "cph"),
diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+2.4.1 -- 2 Feb 2015
+
+Attach base_url in as.widget() so it works in multiple contexts
+
 2.4.0 -- 1 Feb 2015
 
 * Pass plot configuration using ... to avoid conflicts in defaults/documentation
diff --git a/R/plotly.R b/R/plotly.R
@@ -97,8 +97,7 @@ plot_ly <- function(data = data.frame(), ..., type = "scatter",
     layout = NULL,
     url = NULL,
     width = width,
-    height = height,
-    base_url = get_domain()
+    height = height
   )
   
   if (evaluate) p <- plotly_build(p)
diff --git a/R/print.R b/R/print.R
@@ -38,6 +38,7 @@ as.widget <- function(x, ...) {
     list(b = 40, l = 60, t = 25, r = 10),
     p$layout$margin %||% list()
   )
+  p$base_url <- get_domain()
   # customize the JSON serializer (for htmlwidgets)
   attr(p, 'TOJSON_FUNC') <- to_JSON
   htmlwidgets::createWidget(

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,7 @@ plot_ly <- function(data = data.frame(), ..., type = "scatter",`
`97`	`97`	`layout = NULL,`
`98`	`98`	`url = NULL,`
`99`	`99`	`width = width,`
`100`		`- height = height,`
`101`		`- base_url = get_domain()`
	`100`	`+ height = height`
`102`	`101`	`)`
`103`	`102`
`104`	`103`	`if (evaluate) p <- plotly_build(p)`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ as.widget <- function(x, ...) {`
`38`	`38`	`list(b = 40, l = 60, t = 25, r = 10),`
`39`	`39`	`p$layout$margin %\|\|% list()`
`40`	`40`	`)`
	`41`	`+ p$base_url <- get_domain()`
`41`	`42`	`# customize the JSON serializer (for htmlwidgets)`
`42`	`43`	`attr(p, 'TOJSON_FUNC') <- to_JSON`
`43`	`44`	`htmlwidgets::createWidget(`