Skip to content

Commit

Permalink
Redoc & hotfix (#646)
Browse files Browse the repository at this point in the history
  • Loading branch information
ColinFay authored Apr 15, 2021
1 parent 4b8224f commit f90ae42
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 22 deletions.
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ knitr::opts_chunk$set(

<!-- badges: start -->

[![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html) [![Travis build status](https://travis-ci.org/ThinkR-open/golem.svg?branch=master)](https://travis-ci.org/ThinkR-open/golem) [![AppVeyor build status](https://ci.appveyor.com/api/projects/status/github/ThinkR-open/golem?branch=master&svg=true)](https://ci.appveyor.com/project/ThinkR-open/golem) [![Coverage status](https://codecov.io/gh/ThinkR-open/golem/branch/master/graph/badge.svg)](https://codecov.io/github/ThinkR-open/golem?branch=master) [![CRAN status](https://www.r-pkg.org/badges/version/golem)](https://cran.r-project.org/package=golem)
[![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html) [![R-CMD-check](https://github.com/ThinkR-open/golem/workflows/R-CMD-check/badge.svg)](https://github.com/ThinkR-open/golem/actions) [![Travis build status](https://travis-ci.org/ThinkR-open/golem.svg?branch=master)](https://travis-ci.org/ThinkR-open/golem) [![AppVeyor build status](https://ci.appveyor.com/api/projects/status/github/ThinkR-open/golem?branch=master&svg=true)](https://ci.appveyor.com/project/ThinkR-open/golem) [![Coverage status](https://codecov.io/gh/ThinkR-open/golem/branch/master/graph/badge.svg)](https://codecov.io/github/ThinkR-open/golem?branch=master) [![CRAN status](https://www.r-pkg.org/badges/version/golem)](https://cran.r-project.org/package=golem)

<!-- badges: end -->

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

[![Lifecycle:
stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html)
[![R-CMD-check](https://github.com/ThinkR-open/golem/workflows/R-CMD-check/badge.svg)](https://github.com/ThinkR-open/golem/actions)
[![Travis build
status](https://travis-ci.org/ThinkR-open/golem.svg?branch=master)](https://travis-ci.org/ThinkR-open/golem)
[![AppVeyor build
Expand Down
34 changes: 13 additions & 21 deletions inst/utils/golem_utils_ui.R
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,13 @@ list_to_li <- function(list, class = NULL){
#'
#' @param list an R list
#' @param class a class for the paragraph tags
#'
#' @return An HTML tag
#' @noRd
#'
#' @examples
#' list_to_p(c("This is the first paragraph", "this is the second paragraph"))
#'
#' @importFrom shiny tags tagAppendAttributes tagList
#'
list_to_p <- function(list, class = NULL){
Expand Down Expand Up @@ -208,7 +213,7 @@ with_red_star <- function(text) {
HTML(
paste0(
text,
htmltools::tags$span(
shiny::tags$span(
style = "color:red", "*"
)
)
Expand Down Expand Up @@ -348,26 +353,13 @@ make_action_button <- function(tag, inputId = NULL) {
# handle id
if (!is.null(inputId)) {
if (!is.null(tag$attribs$id)) {
if (requireNamespace("cli")){
cli::cat_bullet(
bullet = "bullet",
bullet_col = "red",
paste(
"tag already has an id. Please use input$",
tag$attribs$id,
"to access it from the server side. inputId will be ignored."
)
warning(
paste(
"tag already has an id. Please use input$",
tag$attribs$id,
"to access it from the server side. inputId will be ignored."
)
} else {
warning(
paste(
"tag already has an id. Please use input$",
tag$attribs$id,
"to access it from the server side. inputId will be ignored."
)
)
}

)
} else {
tag$attribs$id <- inputId
}
Expand Down Expand Up @@ -400,7 +392,7 @@ make_action_button <- function(tag, inputId = NULL) {
#' #'
#' #' @importFrom rmarkdown render
#' #' @importFrom markdown markdownToHTML
#' #' @importFrom htmltools HTML
#' #' @importFrom shiny HTML
#' includeRMarkdown <- function(path){
#'
#' md <- tempfile(fileext = '.md')
Expand Down

0 comments on commit f90ae42

Please sign in to comment.