mirror of
https://github.com/rstudio/shiny.git
synced 2026-01-15 01:48:11 -05:00
Compare commits
3 Commits
disable-re
...
barbara/rb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e71e8db0a2 | ||
|
|
6cc2f875b0 | ||
|
|
bcbc6b8b92 |
2
NEWS.md
2
NEWS.md
@@ -5,6 +5,8 @@ shiny 0.14.1.9001
|
|||||||
|
|
||||||
### Minor new features and improvements
|
### Minor new features and improvements
|
||||||
|
|
||||||
|
* HTML markup can now be used in the choices' names for radio buttons. ([#1439](https://github.com/rstudio/shiny/pull/1439))
|
||||||
|
|
||||||
* Added a `fade` argument to `modalDialog()` -- setting it to `FALSE` will remove the usual fade-in animation for that modal window. ([#1414](https://github.com/rstudio/shiny/pull/1414))
|
* Added a `fade` argument to `modalDialog()` -- setting it to `FALSE` will remove the usual fade-in animation for that modal window. ([#1414](https://github.com/rstudio/shiny/pull/1414))
|
||||||
|
|
||||||
* Exported function to apply input handlers to input values. This can be used for testing Shiny applications. ([#1421](https://github.com/rstudio/shiny/pull/1421))
|
* Exported function to apply input handlers to input values. This can be used for testing Shiny applications. ([#1421](https://github.com/rstudio/shiny/pull/1421))
|
||||||
|
|||||||
@@ -51,10 +51,10 @@ generateOptions <- function(inputId, choices, selected, inline, type = 'checkbox
|
|||||||
# If inline, there's no wrapper div, and the label needs a class like
|
# If inline, there's no wrapper div, and the label needs a class like
|
||||||
# checkbox-inline.
|
# checkbox-inline.
|
||||||
if (inline) {
|
if (inline) {
|
||||||
tags$label(class = paste0(type, "-inline"), inputTag, tags$span(name))
|
tags$label(class = paste0(type, "-inline"), inputTag, tags$span(HTML(name)))
|
||||||
} else {
|
} else {
|
||||||
tags$div(class = type,
|
tags$div(class = type,
|
||||||
tags$label(inputTag, tags$span(name))
|
tags$label(inputTag, tags$span(HTML(name)))
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -33,15 +33,15 @@ test_that("Repeated names for selectInput and radioButtons choices", {
|
|||||||
x <- radioButtons('id','label', choices = c(a='x1', a='x2', b='x3'))
|
x <- radioButtons('id','label', choices = c(a='x1', a='x2', b='x3'))
|
||||||
choices <- x$children
|
choices <- x$children
|
||||||
|
|
||||||
expect_equal(choices[[2]]$children[[1]][[1]]$children[[1]]$children[[2]]$children[[1]], 'a')
|
expect_equal(choices[[2]]$children[[1]][[1]]$children[[1]]$children[[2]]$children[[1]], HTML('a'))
|
||||||
expect_equal(choices[[2]]$children[[1]][[1]]$children[[1]]$children[[1]]$attribs$value, 'x1')
|
expect_equal(choices[[2]]$children[[1]][[1]]$children[[1]]$children[[1]]$attribs$value, 'x1')
|
||||||
expect_equal(choices[[2]]$children[[1]][[1]]$children[[1]]$children[[1]]$attribs$checked, 'checked')
|
expect_equal(choices[[2]]$children[[1]][[1]]$children[[1]]$children[[1]]$attribs$checked, 'checked')
|
||||||
|
|
||||||
expect_equal(choices[[2]]$children[[1]][[2]]$children[[1]]$children[[2]]$children[[1]], 'a')
|
expect_equal(choices[[2]]$children[[1]][[2]]$children[[1]]$children[[2]]$children[[1]], HTML('a'))
|
||||||
expect_equal(choices[[2]]$children[[1]][[2]]$children[[1]]$children[[1]]$attribs$value, 'x2')
|
expect_equal(choices[[2]]$children[[1]][[2]]$children[[1]]$children[[1]]$attribs$value, 'x2')
|
||||||
expect_equal(choices[[2]]$children[[1]][[2]]$children[[1]]$children[[1]]$attribs$checked, NULL)
|
expect_equal(choices[[2]]$children[[1]][[2]]$children[[1]]$children[[1]]$attribs$checked, NULL)
|
||||||
|
|
||||||
expect_equal(choices[[2]]$children[[1]][[3]]$children[[1]]$children[[2]]$children[[1]], 'b')
|
expect_equal(choices[[2]]$children[[1]][[3]]$children[[1]]$children[[2]]$children[[1]], HTML('b'))
|
||||||
expect_equal(choices[[2]]$children[[1]][[3]]$children[[1]]$children[[1]]$attribs$value, 'x3')
|
expect_equal(choices[[2]]$children[[1]][[3]]$children[[1]]$children[[1]]$attribs$value, 'x3')
|
||||||
expect_equal(choices[[2]]$children[[1]][[3]]$children[[1]]$children[[1]]$attribs$checked, NULL)
|
expect_equal(choices[[2]]$children[[1]][[3]]$children[[1]]$children[[1]]$attribs$checked, NULL)
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user