Force arguments

rstudio · Mar 17, 2021 · 6e50dd5 · 6e50dd5
1 parent a8c7452
commit 6e50dd5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/R/html_dependency.R b/R/html_dependency.R
@@ -446,7 +446,8 @@ makeDependencyRelative <- function(dependency, basepath, mustWork = TRUE) {
 #'
 #' @param dependencies A list of \code{htmlDependency} objects.
 #' @param srcType The type of src paths to use; valid values are \code{file} or
-#'   \code{href}.
+#'   \code{href}. If both types are available to a dependency, and both types
+#'    are supplied to this argument, then the 1st type is preferred.
 #' @param encodeFunc The function to use to encode the path part of a URL. The
 #'   default should generally be used.
 #' @param hrefFilter A function used to transform the final, encoded URLs of

diff --git a/R/html_print.R b/R/html_print.R
@@ -86,6 +86,7 @@ save_html <- function(html, file, background = "white", libdir = "lib", lang = "
 
   rendered <- renderTags(html)
 
+  browser()
   deps <- lapply(rendered$dependencies, function(dep) {
     dep <- copyDependencyToDir(dep, libdir, FALSE)
     dep <- makeDependencyRelative(dep, dir, FALSE)
@@ -99,6 +100,7 @@ save_html <- function(html, file, background = "white", libdir = "lib", lang = "
     "</body>"
   }
 
+  browser()
   # build the web-page
   html <- c("<!DOCTYPE html>",
             sprintf('<html lang="%s">', lang),

diff --git a/R/tags.R b/R/tags.R
@@ -302,6 +302,8 @@ tagAppendAttributes.shiny.tag <- function(tag, ...) {
 
 #' @export
 tagAppendAttributes.shiny.tag.function <- function(tag, ...) {
+  force(tag)
+  force(...)
   tagFunction(function() {
     tag <- doTagFunction(tag)
     tagAppendAttributes(tag, ...)
@@ -350,6 +352,8 @@ tagAppendChild.shiny.tag <- function(tag, child) {
 
 #' @export
 tagAppendChild.shiny.tag.function <- function(tag, child) {
+  force(tag)
+  force(child)
   tagFunction(function() {
     tag <- doTagFunction(tag)
     tagAppendChild(tag, child)
@@ -371,6 +375,9 @@ tagAppendChildren.shiny.tag <- function(tag, ..., list = NULL) {
 
 #' @export
 tagAppendChildren.shiny.tag.function <- function(tag, ..., list = NULL) {
+  force(tag)
+  force(...)
+  force(list)
   tagFunction(function() {
     tag <- doTagFunction(tag)
     tagAppendChildren(tag, ..., list)
@@ -391,6 +398,9 @@ tagSetChildren.shiny.tag <- function(tag, ..., list = NULL) {
 
 #' @export
 tagSetChildren.shiny.tag.function <- function(tag, ..., list = NULL) {
+  force(tag)
+  force(...)
+  force(list)
   tagFunction(function() {
     tag <- doTagFunction(tag)
     tagSetChildren(tag, ..., list)

diff --git a/R/template.R b/R/template.R
@@ -77,7 +77,7 @@ htmlTemplate <- function(filename = NULL, ..., text_ = NULL, document_ = "auto")
 #'
 #' This function renders \code{html_document} objects, and returns a string with
 #' the final HTML content. It calls the \code{\link{renderTags}} function to
-#' convert any shiny.tag objects to HTML. It also finds any any web dependencies
+#' convert any shiny.tag objects to HTML. It also finds any web dependencies
 #' (created by \code{\link{htmlDependency}}) that are attached to the tags, and
 #' inserts those. To do the insertion, this function finds the string
 #' \code{"<!-- HEAD_CONTENT -->"} in the document, and replaces it with the web