Skip to content

Commit 12c51d2

Browse files
committed
Merge pull request #272 from ropensci/fix-markdownToHTML
Fix markdownToHTML for offline mode
2 parents 1bd2e70 + 9ccb6fe commit 12c51d2

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

Diff for: DESCRIPTION

+3-3
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.4
3+
Version: 1.0.5
44
Authors@R: c(person("Chris", "Parmer", role = c("aut", "cph"),
55
email = "[email protected]"),
66
person("Scott", "Chamberlain", role = "aut",
@@ -17,8 +17,8 @@ Authors@R: c(person("Chris", "Parmer", role = c("aut", "cph"),
1717
email = "[email protected]"))
1818
License: MIT + file LICENSE
1919
Description: Create interactive web-based graphs via plotly's API.
20-
Easily translate ggplot2 plots to plotly and/or create custom plotly graphs.
21-
Once uploaded to a plotly account, plotly graphs (and the data behind them)
20+
Easily translate ggplot2 plots to plotly and/or create custom plotly graphs.
21+
Once uploaded to a plotly account, plotly graphs (and the data behind them)
2222
can be viewed and modified in a web browser.
2323
URL: https://github.com/ropensci/plotly
2424
BugReports: https://github.com/ropensci/plotly/issues

Diff for: NEWS

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
1.0.5 -- 20 Aug 2015
2+
3+
Fix issue converting plotly offline markdown documents to HTML when using `markdown::markdownToHTML`
4+
15
1.0.4 -- 14 Aug 2015
26

37
Bug fix for subplot. See #265
@@ -19,7 +23,7 @@ Removed the stream() function as it wasn't ready to be included.
1923

2024
1.0.0 -- 31 July 2015
2125

22-
A major reworking of package internals which includes a few backwards incompatible changes.
26+
A major reworking of package internals which includes a few backwards incompatible changes.
2327

2428
Major changes include:
2529

@@ -49,7 +53,7 @@ Let gg2list() return a figure object (backwards incompatible change).
4953

5054
0.5.29 -- 16 April 2015
5155

52-
geom_density() as filled area chart #202
56+
geom_density() as filled area chart #202
5357

5458
0.5.28 -- 15 April 2015
5559

Diff for: R/offline.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ offline <- function(p = last_plot(), height = 400, width = "100%",
6060

6161
new_offline <- function(data, layout, height, width, id) {
6262
sprintf(
63-
'<div class="%s loading" style="color: rgb(50,50,50);">Drawing...</div><div id="%s" style="height: %s; width: %s;" ></div><script type="text/javascript">Plotly.plot("%s", %s, %s).then(function() {$(".%s.loading").remove();})</script>',
63+
'<div class="%s loading" style="color: rgb(50,50,50);">Drawing...</div><div id="%s" style="height: %s; width: %s;" ></div>\n<script type="text/javascript">Plotly.plot("%s", %s, %s).then(function() {$(".%s.loading").remove();})</script>',
6464
id, id, height, width, id, data, layout, id
6565
)
6666
}

0 commit comments

Comments
 (0)