Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Modify withSpinner.R to allow type=0 #18

Merged
merged 2 commits into from
Jan 31, 2020
Merged

Modify withSpinner.R to allow type=0 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e64848
Modify withSpinner.R to allow type=0
sTeamTraen Jun 10, 2018
482f308
Merge branch 'master' into master
daattali Jan 31, 2020
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
6 changes: 3 additions & 3 deletions R/withSpinner.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ withSpinner <- function(ui_element,
custom.css = FALSE,
proxy.height = if (grepl("height:\\s*\\d", ui_element)) NULL else "400px")
{
stopifnot(type %in% 1:8)
stopifnot(type %in% 0:8)

if (grepl("rgb", color, fixed = TRUE)) {
stop("Color should be given in hex format")
Expand Down Expand Up @@ -117,7 +117,7 @@ withSpinner <- function(ui_element,
shiny::tags$script(src="assets/spinner.js")
),
shiny::singleton(
shiny::tags$head(shiny::tags$link(rel="stylesheet",href=sprintf("css-loaders/css/fallback.css",type)))
shiny::tags$head(shiny::tags$link(rel="stylesheet",href="css-loaders/css/fallback.css"))
),
shiny::singleton(
shiny::tags$head(shiny::tags$link(rel="stylesheet",href=sprintf("css-loaders/css/load%s.css",type)))
Expand All @@ -128,7 +128,7 @@ withSpinner <- function(ui_element,
class="shiny-spinner-output-container",
shiny::div(
class=sprintf("load-container load%s shiny-spinner-hidden",type),
shiny::div(id=id,class="loader","Loading...")
shiny::div(id=id,class="loader", (if (type == 0) "" else "Loading..."))
),
proxy_element,
ui_element
Expand Down
17 changes: 17 additions & 0 deletions inst/css-loaders/css/load0.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
.load0 .loader,
.load0 .loader:before,
.load0 .loader:after {
}
.load0 .loader {
}
.load0 .loader:before,
.load0 .loader:after {
}
.load0 .loader:before {
}
.load0 .loader:after {
}
@-webkit-keyframes load0 {
}
@keyframes load0 {
}