Adapt to htmltools 0.2.1 API

SRGAtlantis · May 31, 2014 · eb4d4d7 · eb4d4d7
1 parent 1cb5e09
commit eb4d4d7
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -13,7 +13,7 @@ License: GPL-3
 Depends:
  R (>= 2.14.1),
  methods,
- htmltools (>= 0.2.0)
+ htmltools (>= 0.2.1)
 Imports:
  tools,
  utils,

diff --git a/R/bootstrap.R b/R/bootstrap.R
@@ -54,7 +54,7 @@ bootstrapPage <- function(..., title = NULL, responsive = TRUE, theme = NULL) {
  )
  }
 
- attachDependency(
+ attachDependencies(
  tagList(
  if (!is.null(title)) tags$head(tags$title(title)),
  if (!is.null(theme)) {
@@ -762,7 +762,7 @@ selectizeIt <- function(inputId, select, options, width = NULL, nonempty = FALSE
  tags$script(src = 'shared/selectize/js/selectize.min.js')
  ))
  )
- attachDependency(
+ attachDependencies(
  tagList(
  select,
  tags$script(
@@ -1060,7 +1060,7 @@ dateInput <- function(inputId, label, value = NULL, min = NULL, max = NULL,
  if (inherits(min, "Date")) min <- format(min, "%Y-%m-%d")
  if (inherits(max, "Date")) max <- format(max, "%Y-%m-%d")
 
- attachDependency(
+ attachDependencies(
  tags$div(id = inputId,
  class = "shiny-date-input",
 
@@ -1159,7 +1159,7 @@ dateRangeInput <- function(inputId, label, start = NULL, end = NULL,
  if (inherits(min, "Date")) min <- format(min, "%Y-%m-%d")
  if (inherits(max, "Date")) max <- format(max, "%Y-%m-%d")
 
- attachDependency(
+ attachDependencies(
  tags$div(id = inputId,
  # input-daterange class is needed for dropdown behavior
  class = "shiny-date-range-input input-daterange",
@@ -1619,7 +1619,7 @@ dataTableDependency <- list(
 #' @rdname tableOutput
 #' @export
 dataTableOutput <- function(outputId) {
- attachDependency(
+ attachDependencies(
  div(id = outputId, class="shiny-datatable-output"),
  dataTableDependency
  )

diff --git a/R/server.R b/R/server.R
@@ -463,7 +463,7 @@ identicalFunctionBodies <- function(a, b) {
 handlerManager <- HandlerManager$new()
 
 addSubApp <- function(appObj, autoRemove = TRUE) {
- path <- sprintf("/%s", createUniqueId(16))
+ path <- createUniqueId(16, "/app")
  appHandlers <- createAppHandlers(appObj$httpHandler, appObj$serverFuncSource)
 
  # remove the leading / from the path so a relative path is returned

diff --git a/R/shiny.R b/R/shiny.R
@@ -18,11 +18,16 @@ NULL
 #' @import htmltools httpuv caTools RJSONIO xtable digest methods
 NULL
 
-createUniqueId <- function(bytes) {
+createUniqueId <- function(bytes, prefix = "", suffix = "") {
  withPrivateSeed({
  paste(
- format(as.hexmode(sample(256, bytes, replace = TRUE)-1), width=2),
- collapse = "")
+ prefix,
+ paste(
+ format(as.hexmode(sample(256, bytes, replace = TRUE)-1), width=2),
+ collapse = ""),
+ suffix,
+ sep = ""
+ )
  })
 }
 

diff --git a/R/shinywrappers.R b/R/shinywrappers.R
@@ -23,7 +23,7 @@ markRenderFunction <- function(uiFunc, renderFunc) {
 
 useRenderFunction <- function(renderFunc) {
  outputFunction <- attr(renderFunc, "outputFunc")
- id <- createUniqueId(8)
+ id <- createUniqueId(8, "out")
  o <- getDefaultReactiveDomain()$output
  if (!is.null(o))
  o[[id]] <- renderFunc

diff --git a/R/showcase.R b/R/showcase.R
@@ -54,7 +54,7 @@ showcaseHead <- function() {
  else ""
  ))
 
- return(attachDependency(html, deps))
+ return(attachDependencies(html, deps))
 }
 
 # Returns tags containing the application metadata (title and author) in

diff --git a/R/slider.R b/R/slider.R
@@ -104,7 +104,7 @@ slider <- function(inputId, min, max, value, step = NULL, ...,
  stylesheet = "css/jquery.slider.min.css"
  )
  sliderFragment <- list(
- attachDependency(
+ attachDependencies(
  tags$input(
  id=inputId, type="slider",
  name=inputId, value=paste(value, collapse=';'), class="jslider",