diff --git a/DESCRIPTION b/DESCRIPTION index 07300d2e..428b2cc7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,7 +20,8 @@ Imports: digest, base64enc, mime, - crayon + crayon, + brotli Suggests: testthat Collate: diff --git a/NAMESPACE b/NAMESPACE index e5c7d9ec..8ac7711a 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -12,6 +12,7 @@ import(dashHtmlComponents) importFrom(R6,R6Class) importFrom(assertthat,assert_that) importFrom(base64enc,base64encode) +importFrom(brotli,brotli_compress) importFrom(digest,sha1) importFrom(fiery,Fire) importFrom(fiery,combined_log_format) diff --git a/R/dash.R b/R/dash.R index ab62b7cb..751ce6b6 100644 --- a/R/dash.R +++ b/R/dash.R @@ -22,7 +22,7 @@ Dash <- R6::R6Class( #' @description #' Create and configure a Dash application. - #' @param server The web server used to power the application. Must be a [fiery::Fire] object. + #' @param server [fiery::Fire] object. The web server used to power the application. #' @param assets_folder Character. A path, relative to the current working directory, #' for extra files to be used in the browser. All .js and #' .css files will be loaded immediately unless excluded by `assets_ignore`, diff --git a/R/imports.R b/R/imports.R index 8e2e8b68..1ebd2d73 100644 --- a/R/imports.R +++ b/R/imports.R @@ -11,4 +11,5 @@ #' @importFrom utils getFromNamespace #' @importFrom stats setNames #' @importFrom tools file_ext +#' @importFrom brotli brotli_compress NULL diff --git a/R/utils.R b/R/utils.R index eeedcf9c..5577ebc4 100644 --- a/R/utils.R +++ b/R/utils.R @@ -329,8 +329,8 @@ insertIntoCallbackMap <- function(map, inputs, output, state, func, clientside_f clientside_function=clientside_function ) if (length(map) >= 2) { - ids <- lapply(names(map), function(x) dash:::getIdProps(x)$ids) - props <- lapply(names(map), function(x) dash:::getIdProps(x)$props) + ids <- lapply(names(map), function(x) getIdProps(x)$ids) + props <- lapply(names(map), function(x) getIdProps(x)$props) outputs_as_list <- mapply(paste, ids, props, sep=".", SIMPLIFY = FALSE) diff --git a/man/Dash.Rd b/man/Dash.Rd index cf8a573d..c756ded1 100644 --- a/man/Dash.Rd +++ b/man/Dash.Rd @@ -140,7 +140,7 @@ Create and configure a Dash application. \subsection{Arguments}{ \if{html}{\out{
}} \describe{ -\item{\code{server}}{The web server used to power the application. Must be a \link[fiery:Fire]{fiery::Fire} object.} +\item{\code{server}}{\link[fiery:Fire]{fiery::Fire} object. The web server used to power the application.} \item{\code{assets_folder}}{Character. A path, relative to the current working directory, for extra files to be used in the browser. All .js and @@ -517,8 +517,8 @@ Modify index template variables for a Dash application. } \subsection{Details}{ With the \code{interpolate_index} method, one can pass a custom index with template string -variables that are already evaluated. We can directly pass arguments to the \code{template_index} -by assigning them to variables present in the template. This is similar to the \code{index_string} method +variables that are already evaluated. Directly passing arguments to the \code{template_index} +has the effect of assigning them to variables present in the template. This is similar to the \code{index_string} method but offers the ability to change the default components of the Dash index as seen in the example below. }