Skip to content

Commit

Permalink
Revert "support widget lists ramnathv/htmlwidgets#110"
Browse files Browse the repository at this point in the history
Just use htmltools::tagList()!

This reverts commit 7ba4253.
  • Loading branch information
yihui committed Feb 5, 2016
1 parent 37f0531 commit 6fcdda4
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
1 change: 0 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ S3method(wrap,character)
S3method(wrap,default)
S3method(wrap,error)
S3method(wrap,knit_asis)
S3method(wrap,knit_asis_list)
S3method(wrap,knit_image_paths)
S3method(wrap,list)
S3method(wrap,message)
Expand Down
2 changes: 1 addition & 1 deletion R/block.R
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ inline_exec = function(block, envir = knit_global(), hook = knit_hooks$get('inli
for (i in 1:n) {
v = withVisible(eval(parse_only(code[i]), envir = envir))
res = if (v$visible) knit_print(v$value, inline = TRUE, options = opts_chunk$get())
if (inherits(res, c('knit_asis', 'knit_asis_list'))) res = wrap(res, inline = TRUE)
if (inherits(res, 'knit_asis')) res = wrap(res, inline = TRUE)
d = nchar(input)
# replace with evaluated results
stringr::str_sub(input, loc[i, 1], loc[i, 2]) = if (length(res)) {
Expand Down
6 changes: 0 additions & 6 deletions R/output.R
Original file line number Diff line number Diff line change
Expand Up @@ -474,12 +474,6 @@ wrap.knit_asis = function(x, options, inline = FALSE) {
knit_hooks$get('output')(x, options)
}

#' @export
wrap.knit_asis_list = function(x, options, inline = FALSE) {
res = lapply(x, wrap, options = options, inline = inline)
paste(unlist(res), collapse = '\n')
}

#' @export
wrap.source = function(x, options) {
src = sub('\n$', '', x$src)
Expand Down

0 comments on commit 6fcdda4

Please sign in to comment.