Skip to content

Revert "Fix #325. Upgrade to plotlyjs 1.2.1" #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 18, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: plotly
Title: Create Interactive Web Graphics via Plotly's JavaScript Graphing Library
Version: 2.0.16
Version: 2.0.15
Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
email = "[email protected]"),
person("Chris", "Parmer", role = c("aut", "cph"),
Expand Down
4 changes: 0 additions & 4 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
2.0.16 -- 16 Dec 2015

Fix #325

2.0.15 -- 13 Dec 2015

Fix #346
Expand Down
34 changes: 17 additions & 17 deletions inst/htmlwidgets/lib/plotlyjs/plotly-latest.min.js

Large diffs are not rendered by default.

191 changes: 2 additions & 189 deletions inst/htmlwidgets/plotly.yaml
Original file line number Diff line number Diff line change
@@ -1,192 +1,5 @@
dependencies:
plotly.js:
name: plotly.js
version: 1.2.1
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
3d-view:
name: 3d-view
version: 2.0.0
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
alpha-shape:
name: alpha-shape
version: 1.0.0
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
arraytools:
name: arraytools
version: 1.0.0
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
convex-hull:
name: convex-hull
version: 1.0.3
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
d3:
name: d3
version: 3.5.6
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
delaunay-triangulate:
name: delaunay-triangulate
version: 1.1.6
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
es6-promise:
name: es6-promise
version: 3.0.2
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
fast-isnumeric:
name: fast-isnumeric
version: 1.1.1
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
fs-extra:
name: fs-extra
version: 0.26.2
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-error2d:
name: gl-error2d
version: 1.0.0
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-error3d:
name: gl-error3d
version: 1.0.0
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-line2d:
name: gl-line2d
version: 1.2.1
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-line3d:
name: gl-line3d
version: 1.0.1
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-mat4:
name: gl-mat4
version: 1.1.2
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-mesh3d:
name: gl-mesh3d
version: 1.0.4
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-plot2d:
name: gl-plot2d
version: 1.1.6
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-plot3d:
name: gl-plot3d
version: 1.3.0
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-scatter2d:
name: gl-scatter2d
version: 1.0.5
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-scatter2d-fancy:
name: gl-scatter2d-fancy
- name: plotlyjs
version: 1.1.1
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-scatter3d:
name: gl-scatter3d
version: 1.0.4
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-select-box:
name: gl-select-box
version: 1.0.1
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-spikes2d:
name: gl-spikes2d
version: 1.0.1
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
gl-surface3d:
name: gl-surface3d
version: 1.0.6
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
mouse-change:
name: mouse-change
version: 1.1.1
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
mouse-wheel:
name: mouse-wheel
version: 1.0.2
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
ndarray:
name: ndarray
version: 1.0.16
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
ndarray-fill:
name: ndarray-fill
version: 1.0.1
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
ndarray-homography:
name: ndarray-homography
version: 1.0.0
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
ndarray-ops:
name: ndarray-ops
version: 1.2.2
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
node-sass:
name: node-sass
version: 3.4.1
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
right-now:
name: right-now
version: 1.0.0
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
robust-orientation:
name: robust-orientation
version: 1.1.3
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
sane-topojson:
name: sane-topojson
version: 1.2.0
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
superscript-text:
name: superscript-text
version: 1.0.0
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
tinycolor2:
name: tinycolor2
version: 1.1.2
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
topojson:
name: topojson
version: 1.6.19
src: htmlwidgets/lib/plotlyjs
script: plotly-latest.min.js
xml2js:
name: xml2js
version: 0.4.15
src: htmlwidgets/lib/plotlyjs
src: "htmlwidgets/lib/plotlyjs"
script: plotly-latest.min.js

24 changes: 0 additions & 24 deletions inst/plotlyjs.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,3 @@ download.file(
"https://raw.githubusercontent.com/plotly/plotly.js/master/LICENSE",
"inst/htmlwidgets/lib/plotlyjs/LICENSE"
)


# find plotlyjs dependencies and write yaml file
library(jsonlite)
pkg <- fromJSON("https://raw.githubusercontent.com/plotly/plotly.js/master/package.json")
deps <- pkg$dependencies
nms <- c(pkg$name, names(deps))
deps <- c(pkg$version, sub("^\\^", "", as.character(deps)))

f <- function(x, y) {
list(name = x,
version = y,
src = "htmlwidgets/lib/plotlyjs",
script = "plotly-latest.min.js"
)
}



depz <- list(dependencies = Map(f, nms, deps))
writeLines(yaml::as.yaml(depz), "inst/htmlwidgets/plotly.yaml")