T -> TRUE && if boxTools are not null, create a div for them

delete spaces, hopefully
rstudio · Mar 28, 2016 · a8d71cc · a8d71cc
1 parent c7d864b
commit a8d71cc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/R/boxes.R b/R/boxes.R
@@ -120,7 +120,7 @@ infoBox <- function(title, value = NULL, subtitle = NULL,
 #' @param collapsed If TRUE, start collapsed. This must be used with
 #'   \code{collapsible=TRUE}.
 #' @param ... Contents of the box/boxItem.
-#' @param boxMenu Adds a box menu.
+#' @param boxMenu Adds a box menu consisting of \link{boxItem}.
 #'
 #' @family boxes
 #'
@@ -291,7 +291,9 @@ box <- function(..., title = NULL, footer = NULL, status = NULL,
                                shiny::icon(collapseIcon))
   }
 
-  boxTools <- div(class = "box-tools pull-right", collapseTag, boxMenu)
+  if (!is.null(boxMenu)) {
+    boxTools <- div(class = "box-tools pull-right", collapseTag, boxMenu)
+  }
 
   headerTag <- NULL
   if (!is.null(titleTag) || !is.null(boxTools)) {

diff --git a/R/dashboardHeader.R b/R/dashboardHeader.R
@@ -198,8 +198,8 @@ dropdownMenu <- function(...,
       )
       # TODO: This would need to be added to the outer ul
       # tags$li(class = "footer", a(href="#", "View all"))
-     )
-   )
+    )
+  )
 
 }
 

diff --git a/man/box.Rd b/man/box.Rd
diff --git a/tests-manual/box.R b/tests-manual/box.R
@@ -42,13 +42,13 @@ body <- dashboardBody(
                     choices = c("0%" = 0, "20%" = 20, "40%" = 40, "60%" = 60, "80%" = 80,
                                 "100%" = 100)
         ),
-        boxMenu = boxItem(a(href="https://www.bing.com", "bing it!",
-                            style = "color: yellow", target = "_blank"),
-                          downloadButton("svgdown", "download svg")),
-        collapsible = T, collapsed = T
+        #boxMenu = boxItem(a(href="https://www.bing.com", "bing it!",
+        #                    style = "color: yellow", target = "_blank"),
+        #                  downloadButton("svgdown", "download svg")),
+        collapsible = FALSE, collapsed = FALSE
     ),
     box(title = "Histogram box title",
-        status = "info", solidHeader = TRUE, collapsible = T,
+        status = "info", solidHeader = TRUE, collapsible = FALSE,
         boxMenu = boxMenuOutput("menuWrench"),
         plotOutput("plot", height = 250)
     )