Skip to content

Don't fetch widget dependencies if no yaml file exists #277

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.

Sign up for GitHub

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

Closed
cpsievert wants to merge 3 commits into from
Closed

Don't fetch widget dependencies if no yaml file exists #277

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73caab6
return only the htmlwidgets dependency if no config file exists, addr…
cpsievert Jun 1, 2017
0125ff9
ensure config/jsfile are system files before checking whether config …
cpsievert Jun 6, 2017
1c1ace4
better comment
cpsievert Jun 6, 2017
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
32 changes: 21 additions & 11 deletions R/utils.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,26 @@ toJSON <- function(x) {
#' @param name name of the widget.
#' @param package name of the package, defaults to the widget name.
#' @export
getDependency <- function(name, package = name){
config = sprintf("htmlwidgets/%s.yaml", name)
jsfile = sprintf("htmlwidgets/%s.js", name)

config = yaml::yaml.load_file(
system.file(config, package = package)
getDependency <- function(name, package = name) {
htmlWidgetDep <- htmlDependency(
"htmlwidgets",
packageVersion("htmlwidgets"),
src = system.file("www", package = "htmlwidgets"),
script = "htmlwidgets.js"
)

config <- system.file(sprintf("htmlwidgets/%s.yaml", name), package = package)
jsfile <- system.file(sprintf("htmlwidgets/%s.js", name), package = package)

# htmlwidget authors may need to place dependencies *before* the binding
# (i.e., jsfile) at print time. So, if no yaml exists, we just include the
# htmlwidgets.js dependency and leave it to the author to declare their
# binding dependency inside htmlwidget::createWidget()
if (identical(config, "")) {
return(list(htmlWidgetDep))
}

config <- yaml::yaml.load_file(config)
widgetDep <- lapply(config$dependencies, function(l){
l$src = system.file(l$src, package = package)
do.call(htmlDependency, l)
Expand All @@ -61,7 +74,7 @@ getDependency <- function(name, package = name){
if (packageVersion('htmltools') < '0.3.3') {
bindingDir <- tempfile("widgetbinding")
dir.create(bindingDir, mode = "0700")
file.copy(system.file(jsfile, package = package), bindingDir)
file.copy(jsfile, bindingDir)
} else argsDep <- list(all_files = FALSE)
}
bindingDep <- do.call(htmlDependency, c(list(
Expand All @@ -70,10 +83,7 @@ getDependency <- function(name, package = name){
), argsDep))

c(
list(htmlDependency("htmlwidgets", packageVersion("htmlwidgets"),
src = system.file("www", package="htmlwidgets"),
script = "htmlwidgets.js"
)),
list(htmlWidgetDep),
widgetDep,
list(bindingDep)
)
Expand Down