Skip to content

Void elements without self close #436

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.

Sign up for GitHub

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Void elements without self close #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
569a5bf
Remove slash from void elements
wkmor1 Aug 24, 2024
dae951c
Remove slash from void element
wkmor1 Aug 24, 2024
abd720a
Remove trailing slash from meta tag
wkmor1 Aug 24, 2024
12b2338
Remove slash from meta tag
wkmor1 Aug 24, 2024
dc71678
Remove slashes from void elements
wkmor1 Aug 24, 2024
a930a38
Update NEWS.md
wkmor1 Aug 24, 2024
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
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# htmltools (development version)

* Trailing slashes have been removed from void elements. (#436)

# htmltools 0.5.8

## Improvements
Expand Down
4 changes: 2 additions & 2 deletions R/html_dependency.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ renderDependencies <- function(dependencies,
if (length(dep$meta) > 0) {
html <- c(html, paste(
"<meta name=\"", htmlEscape(names(dep$meta)), "\" content=\"",
htmlEscape(dep$meta), "\" />",
htmlEscape(dep$meta), "\" >",
sep = ""
))
}
Expand All @@ -509,7 +509,7 @@ renderDependencies <- function(dependencies,
html <- c(html, paste(
"<link href=\"",
htmlEscape(hrefFilter(file.path(srcpath, encodeFunc(dep$stylesheet)))),
"\" rel=\"stylesheet\" />",
"\" rel=\"stylesheet\" >",
sep = ""
))
}
Expand Down
2 changes: 1 addition & 1 deletion R/html_print.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ save_html.default <- function(html, file, background = "white", libdir = "lib",
html <- c("<!DOCTYPE html>",
sprintf('<html lang="%s">', lang),
"<head>",
"<meta charset=\"utf-8\"/>",
"<meta charset=\"utf-8\">",
sprintf("<style>body{background-color:%s;}</style>", htmlEscape(background)),
renderDependencies(deps, c("href", "file")),
rendered$head,
Expand Down
4 changes: 2 additions & 2 deletions R/tags.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,12 +914,12 @@ tagWrite <- function(tag, textWriter, indent=0, eol = "\n") {
}
}
else {
# only self-close void elements
# close void elements
# (see: http://dev.w3.org/html5/spec/single-page.html#void-elements)
if (tag$name %in% c("area", "base", "br", "col", "command", "embed", "hr",
"img", "input", "keygen", "link", "meta", "param",
"source", "track", "wbr")) {
textWriter$write("/>")
textWriter$write(">")
}
else {
textWriter$write(concat8("></", tag$name, ">"))
Expand Down
2 changes: 1 addition & 1 deletion R/template.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ renderDocument <- function(x, deps = NULL, processDep = identity) {

# Put content in the <head> section
head_content <- paste0(
' <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\n',
' <meta http-equiv="Content-Type" content="text/html; charset=utf-8">\n',
sprintf(' <script type="application/shiny-singletons">%s</script>\n',
paste(result$singletons, collapse = ',')
),
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-tags.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ test_that("Basic tag writing works", {
"one")
expect_equal(
as.character(tagList(tags$br(), "one")),
"<br/>\none")
"<br>\none")
})

test_that("Hanging commas don't break things", {
Expand Down