Skip to content

Add brotli import, perform triple colectomy #204

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 4 commits into from
May 28, 2020
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
3 changes: 2 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Imports:
digest,
base64enc,
mime,
crayon
crayon,
brotli
Suggests:
testthat
Collate:
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion R/dash.R
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
Expand Down
1 change: 1 addition & 0 deletions R/imports.R
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
#' @importFrom utils getFromNamespace
#' @importFrom stats setNames
#' @importFrom tools file_ext
#' @importFrom brotli brotli_compress
NULL
4 changes: 2 additions & 2 deletions R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 3 additions & 3 deletions man/Dash.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.