Skip to content

Commit eabbe01

Browse files
committed
Bump version; update NEWS; redocument; and various R CMD check fixes
1 parent 370d9d4 commit eabbe01

File tree

7 files changed

+23
-7
lines changed

7 files changed

+23
-7
lines changed

DESCRIPTION

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: plotly
22
Title: Create interactive web-based graphs via plotly's API
3-
Version: 1.0.1
3+
Version: 1.0.2
44
Authors@R: c(person("Chris", "Parmer", role = c("aut", "cph"),
55
email = "[email protected]"),
66
person("Scott", "Chamberlain", role = "aut",
@@ -38,6 +38,8 @@ Suggests:
3838
knitr,
3939
devtools,
4040
shiny,
41+
htmltools,
42+
curl,
4143
rmarkdown,
4244
RColorBrewer
4345
LazyData: true

NEWS

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
1.0.2 -- 2 Aug 2015
2+
3+
* last_plot() will now look for the last plotly object; if not found, it will try to find the last ggplot object.
4+
* Officially added the filename, fileopt, and world_readable arguments to plot_ly() and ggplotly().
5+
* If plotly offline is not available, the shiny.launch.browser option is changed to open a web brower. See #245.
6+
* Various namespace/documentation improvements for R CMD check.
7+
18
1.0.1 -- 2 Aug 2015
29

310
Removed the stream() function as it wasn't ready to be included.

man/add_trace.Rd

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ a different trace will be created for each unique value.}
2020

2121
\item{colors}{Either a colorbrewer2.org palette name (e.g. "YlOrRd" or "Blues"),
2222
or a vector of colors to interpolate in hexadecimal "#RRGGBB" format,
23-
or a color interpolation function like \link{grDevices::colorRamp}.}
23+
or a color interpolation function like \code{colorRamp}.}
2424

2525
\item{symbol}{Either a variable name or a (discrete) vector to use for symbol encoding.}
2626

man/ggplotly.Rd

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
\alias{ggplotly}
55
\title{Create plotly graphs using ggplot2 syntax}
66
\usage{
7-
ggplotly(p = ggplot2::last_plot())
7+
ggplotly(p = ggplot2::last_plot(), ...)
88
}
99
\arguments{
1010
\item{p}{a ggplot object.}
11+
12+
\item{...}{additional arguments for changing the filename of the plot, etc.}
1113
}
1214
\description{
1315
See up-to-date documentation and examples at

man/last_plot.Rd

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
% Please edit documentation in R/utils.R
33
\name{last_plot}
44
\alias{last_plot}
5-
\title{Retrive last plotly to be modified or created}
5+
\title{Retrive and create the last plotly (or ggplot).}
66
\usage{
7-
last_plot(...)
7+
last_plot(data = NULL)
8+
}
9+
\arguments{
10+
\item{data}{(optional) a data frame with a class of plotly (and a plotly_hash attribute).}
811
}
912
\description{
10-
Retrive last plotly to be modified or created
13+
Retrive and create the last plotly (or ggplot).
1114
}
1215
\seealso{
1316
\link{plotly_build}

man/plot_ly.Rd

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ a different trace will be created for each unique value.}
2222

2323
\item{colors}{Either a colorbrewer2.org palette name (e.g. "YlOrRd" or "Blues"),
2424
or a vector of colors to interpolate in hexadecimal "#RRGGBB" format,
25-
or a color interpolation function like \link{grDevices::colorRamp}.}
25+
or a color interpolation function like \code{colorRamp()}.}
2626

2727
\item{symbol}{Either a variable name or a (discrete) vector to use for symbol encoding.}
2828

tests/testthat/test-plotly-knitr.R

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ ggplotly(p)
99
"
1010
test_that("plotly embeds inside knitr", {
1111
html <- knitr::knit2html(text = txt)
12+
# why does this all of a sudden fail on Travis?
13+
# https://travis-ci.org/ropensci/plotly/builds/73902815
1214
expect_true(grepl("iframe", html))
1315
})
1416

0 commit comments

Comments
 (0)