fix merge conflict

rstudio · Mar 31, 2021 · 88cdd60 · 88cdd60
1 parent f9403c5
commit 88cdd60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/R/bootstrap.R b/R/bootstrap.R
@@ -974,9 +974,8 @@ buildTabItem <- function(index, tabsetId, foundSelected, tabs = NULL,
     return(list(liTag = textFilter(divTag), divTag = NULL))
   }
 
-  # build the child tabset
-  # TODO: add a warning if depth goes >2 ?
   if (isNavbarMenu(divTag)) {
+    # tabPanelMenu item: build the child tabset
     tabset <- buildTabset(
       !!!divTag$tabs, ulClass = "dropdown-menu",
       textFilter = navbarMenuTextFilter,

diff --git a/R/html-deps.R b/R/html-deps.R
@@ -56,7 +56,7 @@ processDeps <- function(tags, session) {
   }
 
   list(
-    html = doRenderTags(tagList(ui)), # TODO: doRenderTags() shouldn't fail on a tagFunction()
+    html = doRenderTags(ui),
     deps = dependencies
   )
 }