Skip to content

Commit

Permalink
Merge pull request #203 from rstudio/barbara/extract-title
Browse files Browse the repository at this point in the history
Inside a call to dashboardPage(), correctly extract title from dashboardHeader()
  • Loading branch information
wch committed Apr 20, 2017
2 parents 22bc8e4 + 73684a1 commit d4a64e4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
shinydashboard 0.5.3.9000
=========================

* Fixed [#89](https://github.com/rstudio/shinydashboard/issues/89): We claimed that `dashboardPage()` would try to extract the page's title from `dashboardHeader()` (if the title is not provided directly to `dashboardPage()`); however, we were selecting the wrong child of the header tag object ([#203](https://github.com/rstudio/shinydashboard/pull/203))

* Fixed [#129](https://github.com/rstudio/shinydashboard/issues/129): Trigger shown/hidden event for Shiny outputs in the sidebar. ([#194](https://github.com/rstudio/shinydashboard/pull/194))

* Fixed [#73](https://github.com/rstudio/shinydashboard/issues/73): add `collapsed` argument to `dashboardSidebar()`, which allows it to start off collapsed. ([#186](https://github.com/rstudio/shinydashboard/pull/186))
Expand Down
2 changes: 1 addition & 1 deletion R/dashboardPage.R
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dashboardPage <- function(header, sidebar, body, title = NULL,
skin <- match.arg(skin)

extractTitle <- function(header) {
x <- header$children[[1]]
x <- header$children[[2]]
if (x$name == "span" &&
!is.null(x$attribs$class) &&
x$attribs$class == "logo" &&
Expand Down

0 comments on commit d4a64e4

Please sign in to comment.