Skip to content

Commit f90ae42

Browse files
authored
Redoc & hotfix (#646)
1 parent 4b8224f commit f90ae42

File tree

3 files changed

+15
-22
lines changed

3 files changed

+15
-22
lines changed

README.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ knitr::opts_chunk$set(
1717

1818
<!-- badges: start -->
1919

20-
[![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)
20+
[![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)
2121

2222
<!-- badges: end -->
2323

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
[![Lifecycle:
66
stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html)
7+
[![R-CMD-check](https://github.com/ThinkR-open/golem/workflows/R-CMD-check/badge.svg)](https://github.com/ThinkR-open/golem/actions)
78
[![Travis build
89
status](https://travis-ci.org/ThinkR-open/golem.svg?branch=master)](https://travis-ci.org/ThinkR-open/golem)
910
[![AppVeyor build

inst/utils/golem_utils_ui.R

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,13 @@ list_to_li <- function(list, class = NULL){
4040
#'
4141
#' @param list an R list
4242
#' @param class a class for the paragraph tags
43+
#'
44+
#' @return An HTML tag
45+
#' @noRd
46+
#'
4347
#' @examples
4448
#' list_to_p(c("This is the first paragraph", "this is the second paragraph"))
49+
#'
4550
#' @importFrom shiny tags tagAppendAttributes tagList
4651
#'
4752
list_to_p <- function(list, class = NULL){
@@ -208,7 +213,7 @@ with_red_star <- function(text) {
208213
HTML(
209214
paste0(
210215
text,
211-
htmltools::tags$span(
216+
shiny::tags$span(
212217
style = "color:red", "*"
213218
)
214219
)
@@ -348,26 +353,13 @@ make_action_button <- function(tag, inputId = NULL) {
348353
# handle id
349354
if (!is.null(inputId)) {
350355
if (!is.null(tag$attribs$id)) {
351-
if (requireNamespace("cli")){
352-
cli::cat_bullet(
353-
bullet = "bullet",
354-
bullet_col = "red",
355-
paste(
356-
"tag already has an id. Please use input$",
357-
tag$attribs$id,
358-
"to access it from the server side. inputId will be ignored."
359-
)
356+
warning(
357+
paste(
358+
"tag already has an id. Please use input$",
359+
tag$attribs$id,
360+
"to access it from the server side. inputId will be ignored."
360361
)
361-
} else {
362-
warning(
363-
paste(
364-
"tag already has an id. Please use input$",
365-
tag$attribs$id,
366-
"to access it from the server side. inputId will be ignored."
367-
)
368-
)
369-
}
370-
362+
)
371363
} else {
372364
tag$attribs$id <- inputId
373365
}
@@ -400,7 +392,7 @@ make_action_button <- function(tag, inputId = NULL) {
400392
#' #'
401393
#' #' @importFrom rmarkdown render
402394
#' #' @importFrom markdown markdownToHTML
403-
#' #' @importFrom htmltools HTML
395+
#' #' @importFrom shiny HTML
404396
#' includeRMarkdown <- function(path){
405397
#'
406398
#' md <- tempfile(fileext = '.md')

0 commit comments

Comments
 (0)