From 6fcdda4d8fe2f759ee109a8b98becef695378d19 Mon Sep 17 00:00:00 2001 From: Yihui Xie Date: Fri, 5 Feb 2016 16:55:24 -0600 Subject: [PATCH] Revert "support widget lists https://github.com/ramnathv/htmlwidgets/pull/110" Just use htmltools::tagList()! This reverts commit 7ba425355676876efba6aa097bddf80b9cabf5a7. --- NAMESPACE | 1 - R/block.R | 2 +- R/output.R | 6 ------ 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 20b4a429c4..9a54794a7b 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -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) diff --git a/R/block.R b/R/block.R index c4785e3fa3..f0bf4d0229 100644 --- a/R/block.R +++ b/R/block.R @@ -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)) { diff --git a/R/output.R b/R/output.R index e08e39cc48..25326331ac 100644 --- a/R/output.R +++ b/R/output.R @@ -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)