Merge remote-tracking branch 'origin/master' into feature/bootstrap-layout

This commit is contained in:
JJ Allaire
2013-12-13 17:55:59 -05:00
2 changed files with 21 additions and 2 deletions

View File

@@ -229,9 +229,9 @@ renderTags <- function(ui, singletons = character(0)) {
uiHTML <- paste(textConnectionValue(textConn), collapse = "\n")
close(textConn)
return(list(head = paste(context$head, collapse = "\n"),
return(list(head = HTML(paste(context$head, collapse = "\n")),
singletons = context$singletons,
html = uiHTML))
html = HTML(uiHTML)))
}
# environment used to store all available tags