Skip to content

Commit 9e2d138

Browse files
committed
Merge branch 'master' of github.com:ropensci/plotly into fix/subplot
2 parents a8c1628 + d8d8d65 commit 9e2d138

File tree

5 files changed

+54
-44
lines changed

5 files changed

+54
-44
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: plotly
22
Title: Create Interactive Web Graphics via 'plotly.js'
3-
Version: 3.4.10
3+
Version: 3.4.12
44
Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
55
email = "[email protected]"),
66
person("Chris", "Parmer", role = c("aut", "cph"),

NEWS

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
3.4.12 -- 5 Apr 2016
2+
3+
CHANGES:
4+
5+
Upgrade to plotlyjs v1.8.0 -- https://github.com/plotly/plotly.js/releases/tag/v1.8.0
6+
7+
3.4.11 -- 2 Apr 2016
8+
9+
BUGFIX:
10+
11+
Fix bug when altering modebar button defaults
12+
113
3.4.10 -- 1 Apr 2016
214

315
BUGFIX:

R/print.R

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,8 @@ as.widget <- function(x, ...) {
4040
list(b = 40, l = 60, t = 25, r = 10),
4141
p$layout$margin %||% list()
4242
)
43-
p$config$modeBarButtonsToRemove <- modifyList(
44-
list("sendDataToCloud"),
45-
p$config$modeBarButtonsToRemove %||% list()
46-
)
43+
p$config$modeBarButtonsToRemove <-
44+
i(p$config$modeBarButtonsToRemove %||% "sendDataToCloud")
4745
p$base_url <- get_domain()
4846
# customize the JSON serializer (for htmlwidgets)
4947
attr(p, 'TOJSON_FUNC') <- to_JSON

inst/htmlwidgets/lib/plotlyjs/plotly-latest.min.js

Lines changed: 38 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

inst/htmlwidgets/plotly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: plotlyjs
3-
version: 1.6.1
3+
version: 1.8.0
44
src: "htmlwidgets/lib/plotlyjs"
55
script: plotly-latest.min.js
66
stylesheet: plotly-htmlwidgets.css

0 commit comments

Comments
 (0)