Skip to content

Commit

Permalink
Merge branch 'master' into normalize_tag_attribs
Browse files Browse the repository at this point in the history
* master:
  `tagQuery()`: Rename`$root()` to `$allTags()`, `$selected()` to `$selectedTags()`; Print `$selectedTags()` like a `list()` (#230)
  tagQuery(): Rebuild less often and do not check for tag env cycles; Rename `$reset()` -> `$resetSelected()` (#235)
  Bump rlang dev version
  Revert "Return invisibly when not creating a new tagQuery() object (#228)"
  Allow tag query `$*Class()` methods to no-op on length 0 inputs (#236)
  • Loading branch information
schloerke committed May 4, 2021
2 parents bc1064e + 02d1ae7 commit f96b5c6
Show file tree
Hide file tree
Showing 6 changed files with 376 additions and 331 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: htmltools
Type: Package
Title: Tools for HTML
Version: 0.5.1.9002
Version: 0.5.1.9003
Authors@R: c(
person("Joe", "Cheng", role = "aut", email = "[email protected]"),
person("Carson", "Sievert", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0002-4958-2844")),
Expand All @@ -19,7 +19,7 @@ Imports:
digest,
grDevices,
base64enc,
rlang (>= 0.4.10.9000),
rlang (>= 0.4.11.9000),
fastmap
Suggests:
markdown,
Expand Down
18 changes: 9 additions & 9 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
# Generated by roxygen2: do not edit by hand

S3method(as.character,html)
S3method(as.character,htmltools.tag.env)
S3method(as.character,htmltools.tag.query)
S3method(as.character,shiny.tag)
S3method(as.character,shiny.tag.env)
S3method(as.character,shiny.tag.list)
S3method(as.character,shiny.tag.query)
S3method(as.tags,character)
S3method(as.tags,default)
S3method(as.tags,html)
S3method(as.tags,html_dependency)
S3method(as.tags,htmltools.tag.env)
S3method(as.tags,htmltools.tag.query)
S3method(as.tags,list)
S3method(as.tags,shiny.tag)
S3method(as.tags,shiny.tag.env)
S3method(as.tags,shiny.tag.function)
S3method(as.tags,shiny.tag.list)
S3method(as.tags,shiny.tag.query)
S3method(format,html)
S3method(format,htmltools.selector)
S3method(format,htmltools.selector.list)
S3method(format,htmltools.tag.env)
S3method(format,htmltools.tag.query)
S3method(format,shiny.tag)
S3method(format,shiny.tag.env)
S3method(format,shiny.tag.list)
S3method(format,shiny.tag.query)
S3method(print,html)
S3method(print,html_dependency)
S3method(print,htmltools.selector)
S3method(print,htmltools.selector.list)
S3method(print,htmltools.tag.env)
S3method(print,htmltools.tag.query)
S3method(print,shiny.tag)
S3method(print,shiny.tag.env)
S3method(print,shiny.tag.list)
S3method(str,htmltools.tag.env)
S3method(print,shiny.tag.query)
S3method(str,shiny.tag.env)
export("htmlDependencies<-")
export(HTML)
export(a)
Expand Down
Loading

0 comments on commit f96b5c6

Please sign in to comment.