first crack at updating multiple attribute

.Rbuildignore

@@ -17,4 +17,3 @@
 ^cran-comments.md$
 ^.*\.o$
 ^appveyor\.yml$
-^revdep$

.travis.yml

@@ -1,8 +1,4 @@
 language: r
-r:
-  - oldrel
-  - release
-  - devel
 sudo: false
 cache: packages
 

CONTRIBUTING.md

@@ -1,38 +1,10 @@
+
 We welcome contributions to the **shiny** package. To submit a contribution:
 
 1. [Fork](https://github.com/rstudio/shiny/fork) the repository and make your changes.
 
-2. If the change is non-trivial, ensure that you have signed the [individual](http://www.rstudio.com/wp-content/uploads/2014/06/RStudioIndividualContributorAgreement.pdf) or [corporate](http://www.rstudio.com/wp-content/uploads/2014/06/RStudioCorporateContributorAgreement.pdf) contributor agreement as appropriate. You can send the signed copy to jj@rstudio.com. For trivial changes (like typo fixes), a contributor agreement is not needed.
+2. Ensure that you have signed the [individual](http://www.rstudio.com/wp-content/uploads/2014/06/RStudioIndividualContributorAgreement.pdf) or [corporate](http://www.rstudio.com/wp-content/uploads/2014/06/RStudioCorporateContributorAgreement.pdf) contributor agreement as appropriate. You can send the signed copy to jj@rstudio.com.
 
 3. Submit a [pull request](https://help.github.com/articles/using-pull-requests).
 
-We generally do not merge pull requests that update included web libraries (such as Bootstrap or jQuery) because it is difficult for us to verify that the update is done correctly; we prefer to update these libraries ourselves.
-
-
-## How to make changes
-
-Before you submit a pull request, please do the following:
-
-* Add an entry to NEWS.md concisely describing what you changed.
-
-* If appropriate, add unit tests in the tests/ directory.
-
-* If you made any changes to the JavaScript files in the srcjs/ directory, make sure you build the output JavaScript files. See tools/README.md file for information on using the build system.
-
-* Run Build->Check Package in the RStudio IDE, or `devtools::check()`, to make sure your change did not add any messages, warnings, or errors.
-
-Doing these things will make it easier for the Shiny development team to evaluate your pull request. Even so, we may still decide to modify your code or even not merge it at all. Factors that may prevent us from merging the pull request include:
-
-* breaking backward compatibility
-* adding a feature that we do not consider relevant for Shiny
-* is hard to understand
-* is hard to maintain in the future
-* is computationally expensive
-* is not intuitive for people to use
-
-We will try to be responsive and provide feedback in case we decide not to merge your pull request.
-
-
-## Filing issues
-
-If you find a bug in Shiny, you can also [file an issue](https://github.com/rstudio/shiny/issues/new). Please provide as much relevant information as you can, and include a minimal reproducible example if possible.
+We'll try to be as responsive as possible in reviewing and accepting pull requests. We appreciate your contributions!

DESCRIPTION

@@ -1,7 +1,8 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 0.14.2.9001
+Version: 0.13.2.9005
+Date: 2016-02-17
 Authors@R: c(
     person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com"),
     person("Joe", "Cheng", role = "aut", email = "joe@rstudio.com"),
@@ -14,7 +15,7 @@ Authors@R: c(
     person(family = "jQuery contributors", role = c("ctb", "cph"),
     comment = "jQuery library; authors listed in inst/www/shared/jquery-AUTHORS.txt"),
     person(family = "jQuery UI contributors", role = c("ctb", "cph"),
-    comment = "jQuery UI library; authors listed in inst/www/shared/jqueryui/AUTHORS.txt"),
+    comment = "jQuery UI library; authors listed in inst/www/shared/jqueryui/1.10.4/AUTHORS.txt"),
     person("Mark", "Otto", role = "ctb",
     comment = "Bootstrap library"),
     person("Jacob", "Thornton", role = "ctb",
@@ -82,6 +83,7 @@ Suggests:
     ggplot2
 URL: http://shiny.rstudio.com
 BugReports: https://github.com/rstudio/shiny/issues
+VignetteBuilder: knitr
 Collate:
     'app.R'
     'bookmark-state-local.R'
@@ -116,7 +118,6 @@ Collate:
     'input-slider.R'
     'input-submit.R'
     'input-text.R'
-    'input-textarea.R'
     'input-utils.R'
     'insert-ui.R'
     'jqueryui.R'
@@ -142,7 +143,6 @@ Collate:
     'shinywrappers.R'
     'showcase.R'
     'tar.R'
-    'test-export.R'
     'timer.R'
     'update-input.R'
 RoxygenNote: 5.0.1

NAMESPACE

@@ -69,7 +69,6 @@ export(downloadLink)
 export(em)
 export(enableBookmarking)
 export(eventReactive)
-export(exportTestValues)
 export(exprToFunction)
 export(extractStackTrace)
 export(fileInput)
@@ -84,7 +83,6 @@ export(fluidPage)
 export(fluidRow)
 export(formatStackTrace)
 export(freezeReactiveValue)
-export(getCurrentObserver)
 export(getDefaultReactiveDomain)
 export(getShinyOption)
 export(h1)
@@ -227,7 +225,6 @@ export(tagAppendChildren)
 export(tagList)
 export(tagSetChildren)
 export(tags)
-export(textAreaInput)
 export(textInput)
 export(textOutput)
 export(titlePanel)
@@ -246,7 +243,6 @@ export(updateSelectInput)
 export(updateSelectizeInput)
 export(updateSliderInput)
 export(updateTabsetPanel)
-export(updateTextAreaInput)
 export(updateTextInput)
 export(urlModal)
 export(validate)

R/app.R

@@ -20,21 +20,13 @@
 #' @param onStart A function that will be called before the app is actually run.
 #'   This is only needed for \code{shinyAppObj}, since in the \code{shinyAppDir}
 #'   case, a \code{global.R} file can be used for this purpose.
-#' @param options Named options that should be passed to the \code{runApp} call
-#'   (these can be any of the following: "port", "launch.browser", "host", "quiet",
-#'   "display.mode" and "test.mode"). You can also specify \code{width} and
-#'   \code{height} parameters which provide a hint to the embedding environment
-#'   about the ideal height/width for the app.
+#' @param options Named options that should be passed to the `runApp` call. You
+#'   can also specify \code{width} and \code{height} parameters which provide a
+#'   hint to the embedding environment about the ideal height/width for the app.
 #' @param uiPattern A regular expression that will be applied to each \code{GET}
 #'   request to determine whether the \code{ui} should be used to handle the
 #'   request. Note that the entire request path must match the regular
 #'   expression in order for the match to be considered successful.
-#' @param enableBookmarking Can be one of \code{"url"}, \code{"server"}, or
-#'   \code{"disable"}. This is equivalent to calling the
-#'   \code{\link{enableBookmarking}()} function just before calling
-#'   \code{shinyApp()}. With the default value (\code{NULL}), the app will
-#'   respect the setting from any previous calls to \code{enableBookmarking()}.
-#'   See \code{\link{enableBookmarking}} for more information.
 #' @return An object that represents the app. Printing the object or passing it
 #'   to \code{\link{runApp}} will run the app.
 #'
@@ -69,7 +61,7 @@
 #' }
 #' @export
 shinyApp <- function(ui=NULL, server=NULL, onStart=NULL, options=list(),
-                     uiPattern="/", enableBookmarking = NULL) {
+                     uiPattern="/") {
   if (is.null(server)) {
     stop("`server` missing from shinyApp")
   }
@@ -83,11 +75,6 @@ shinyApp <- function(ui=NULL, server=NULL, onStart=NULL, options=list(),
     server
   }
 
-  if (!is.null(enableBookmarking)) {
-    bookmarkStore <- match.arg(enableBookmarking, c("url", "server", "disable"))
-    enableBookmarking(bookmarkStore)
-  }
-
   # Store the appDir and bookmarking-related options, so that we can read them
   # from within the app.
   shinyOptions(appDir = getwd())
@@ -233,13 +220,13 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
 # ignored when checking extensions. If any changes are detected, all connected
 # Shiny sessions are reloaded.
 #
-# Use options(shiny.autoreload = TRUE) to enable this behavior. Since monitoring
+# Use option(shiny.autoreload = TRUE) to enable this behavior. Since monitoring
 # for changes is expensive (we are polling for mtimes here, nothing fancy) this
 # feature is intended only for development.
 #
 # You can customize the file patterns Shiny will monitor by setting the
 # shiny.autoreload.pattern option. For example, to monitor only ui.R:
-# options(shiny.autoreload.pattern = glob2rx("ui.R"))
+# option(shiny.autoreload.pattern = glob2rx("ui.R"))
 #
 # The return value is a function that halts monitoring when called.
 initAutoReloadMonitor <- function(dir) {
@@ -375,8 +362,7 @@ is.shiny.appobj <- function(x) {
 print.shiny.appobj <- function(x, ...) {
   opts <- x$options %OR% list()
   opts <- opts[names(opts) %in%
-      c("port", "launch.browser", "host", "quiet",
-        "display.mode", "test.mode")]
+      c("port", "launch.browser", "host", "quiet", "display.mode")]
 
   args <- c(list(x), opts)
 

R/bookmark-state.R

@@ -65,8 +65,7 @@ saveShinySaveState <- function(state) {
       isolate(state$onSave(state))
 
     # Serialize values, possibly saving some extra data to stateDir
-    exclude <- c(state$exclude, "._bookmark_")
-    inputValues <- serializeReactiveValues(state$input, exclude, state$dir)
+    inputValues <- serializeReactiveValues(state$input, state$exclude, state$dir)
     saveRDS(inputValues, file.path(stateDir, "input.rds"))
 
     # If values were added, save them also.
@@ -76,25 +75,7 @@ saveShinySaveState <- function(state) {
 
   # Pass the saveState function to the save interface function, which will
   # invoke saveState after preparing the directory.
-
-  # Look for a save.interface function. This will be defined by the hosting
-  # environment if it supports bookmarking.
-  saveInterface <- getShinyOption("save.interface")
-
-  if (is.null(saveInterface)) {
-    if (inShinyServer()) {
-      # We're in a version of Shiny Server/Connect that doesn't have
-      # bookmarking support.
-      saveInterface <- function(id, callback) {
-        stop("The hosting environment does not support saved-to-server bookmarking.")
-      }
-
-    } else {
-      # We're running Shiny locally.
-      saveInterface <- saveInterfaceLocal
-    }
-  }
-
+  saveInterface <- getShinyOption("save.interface", default = saveInterfaceLocal)
   saveInterface(id, saveState)
 
   paste0("_state_id_=", encodeURIComponent(id))
@@ -102,8 +83,7 @@ saveShinySaveState <- function(state) {
 
 # Encode the state to a URL. This does not save to disk.
 encodeShinySaveState <- function(state) {
-  exclude <- c(state$exclude, "._bookmark_")
-  inputVals <- serializeReactiveValues(state$input, exclude, stateDir = NULL)
+  inputVals <- serializeReactiveValues(state$input, state$exclude, stateDir = NULL)
 
   # Allow user-supplied onSave function to do things like add state$values.
   if (!is.null(state$onSave))
@@ -115,19 +95,14 @@ encodeShinySaveState <- function(state) {
     USE.NAMES = TRUE
   )
 
-  res <- ""
-
-  # If any input values are present, add them.
-  if (length(inputVals) != 0) {
-    res <- paste0(res, "_inputs_&",
-      paste0(
-        encodeURIComponent(names(inputVals)),
-        "=",
-        encodeURIComponent(inputVals),
-        collapse = "&"
-      )
+  res <- paste0("_inputs_&",
+    paste0(
+      encodeURIComponent(names(inputVals)),
+      "=",
+      encodeURIComponent(inputVals),
+      collapse = "&"
     )
-  }
+  )
 
   # If 'values' is present, add them as well.
   if (length(state$values) != 0) {
@@ -137,9 +112,7 @@ encodeShinySaveState <- function(state) {
       USE.NAMES = TRUE
     )
 
-    res <- paste0(res,
-      if (length(inputVals != 0)) "&",  # Add separator if there were inputs
-      "_values_&",
+    res <- paste0(res, "&_values_&",
       paste0(
         encodeURIComponent(names(values)),
         "=",
@@ -278,24 +251,7 @@ RestoreContext <- R6Class("RestoreContext",
         }
       }
 
-      # Look for a load.interface function. This will be defined by the hosting
-      # environment if it supports bookmarking.
-      loadInterface <- getShinyOption("load.interface")
-
-      if (is.null(loadInterface)) {
-        if (inShinyServer()) {
-          # We're in a version of Shiny Server/Connect that doesn't have
-          # bookmarking support.
-          loadInterface <- function(id, callback) {
-            stop("The hosting environment does not support saved-to-server bookmarking.")
-          }
-
-        } else {
-          # We're running Shiny locally.
-          loadInterface <- loadInterfaceLocal
-        }
-      }
-
+      loadInterface <- getShinyOption("load.interface", default = loadInterfaceLocal)
       loadInterface(id, loadFun)
 
       invisible()
@@ -362,7 +318,7 @@ RestoreContext <- R6Class("RestoreContext",
       self$input <- RestoreInputSet$new(inputs)
 
       values <- valuesFromJSON(values)
-      self$values <- list2env2(values, self$values)
+      self$values <- list2env(values, self$values)
     }
   )
 )
@@ -385,7 +341,7 @@ RestoreInputSet <- R6Class("RestoreInputSet",
 
   public = list(
     initialize = function(values) {
-      private$values <- list2env2(values, parent = emptyenv())
+      private$values <- list2env(values, parent = emptyenv())
     },
 
     exists = function(name) {
@@ -490,12 +446,10 @@ restoreInput <- function(id, default) {
 #' Update URL in browser's location bar
 #'
 #' This function updates the client browser's query string in the location bar.
-#' It typically is called from an observer. Note that this will not work in
-#' Internet Explorer 9 and below.
+#' It typically is called from an observer.
 #'
 #' @param queryString The new query string to show in the location bar.
 #' @param session A Shiny session object.
-#' @seealso \code{\link{enableBookmarking}} for examples.
 #' @export
 updateQueryString <- function(queryString, session = getDefaultReactiveDomain()) {
   session$updateQueryString(queryString)
@@ -504,63 +458,21 @@ updateQueryString <- function(queryString, session = getDefaultReactiveDomain())
 #' Create a button for bookmarking/sharing
 #'
 #' A \code{bookmarkButton} is a \code{\link{actionButton}} with a default label
-#' that consists of a link icon and the text "Bookmark...". It is meant to be
-#' used for bookmarking state.
+#' that consists of a link icon and the text "Share...". It is meant to be used
+#' for bookmarking state.
 #'
-#' @inheritParams actionButton
 #' @param title A tooltip that is shown when the mouse cursor hovers over the
 #'   button.
-#' @param id An ID for the bookmark button. The only time it is necessary to set
-#'   the ID unless you have more than one bookmark button in your application.
-#'   If you specify an input ID, it should be excluded from bookmarking with
-#'   \code{\link{setBookmarkExclude}}, and you must create an observer that
-#'   does the bookmarking when the button is pressed. See the examples below.
 #'
-#' @seealso \code{\link{enableBookmarking}} for more examples.
-#'
-#' @examples
-#' ## Only run these examples in interactive sessions
-#' if (interactive()) {
-#'
-#' # This example shows how to use multiple bookmark buttons. If you only need
-#' # a single bookmark button, see examples in ?enableBookmarking.
-#' ui <- function(request) {
-#'   fluidPage(
-#'     tabsetPanel(id = "tabs",
-#'       tabPanel("One",
-#'         checkboxInput("chk1", "Checkbox 1"),
-#'         bookmarkButton(id = "bookmark1")
-#'       ),
-#'       tabPanel("Two",
-#'         checkboxInput("chk2", "Checkbox 2"),
-#'         bookmarkButton(id = "bookmark2")
-#'       )
-#'     )
-#'   )
-#' }
-#' server <- function(input, output, session) {
-#'   # Need to exclude the buttons from themselves being bookmarked
-#'   setBookmarkExclude(c("bookmark1", "bookmark2"))
-#'
-#'   # Trigger bookmarking with either button
-#'   observeEvent(input$bookmark1, {
-#'     session$doBookmark()
-#'   })
-#'   observeEvent(input$bookmark2, {
-#'     session$doBookmark()
-#'   })
-#' }
-#' enableBookmarking(store = "url")
-#' shinyApp(ui, server)
-#' }
+#' @seealso enableBookmarking
+#' @inheritParams actionButton
 #' @export
 bookmarkButton <- function(label = "Bookmark...",
   icon = shiny::icon("link", lib = "glyphicon"),
   title = "Bookmark this application's state and get a URL for sharing.",
-  ...,
-  id = "._bookmark_")
+  ...)
 {
-  actionButton(id, label, icon, title = title, ...)
+  actionButton("._bookmark_", label, icon, title = title, ...)
 }
 
 
@@ -586,6 +498,7 @@ urlModal <- function(url, title = "Bookmarked application link", subtitle = NULL
   modalDialog(
     title = title,
     easyClose = TRUE,
+    footer = NULL,
     tags$textarea(class = "form-control", rows = "1", style = "resize: none;",
       readonly = "readonly",
       url
@@ -673,8 +586,8 @@ showBookmarkUrlModal <- function(url) {
 #' \code{function(request) \{ fluidPage(....) \}}.
 #'
 #' By default, all input values will be bookmarked, except for the values of
-#' passwordInputs. fileInputs will be saved if the state is saved on a server,
-#' but not if the state is encoded in a URL.
+#' actionButtons and passwordInputs. fileInputs will be saved if the state is
+#' saved on a server, but not if the state is encoded in a URL.
 #'
 #' When bookmarking state, arbitrary values can be stored, by passing a function
 #' as the \code{onBookmark} argument. That function will be passed a
@@ -695,22 +608,13 @@ showBookmarkUrlModal <- function(url) {
 #'     the current working directory called shiny_bookmarks.
 #' }
 #'
-#' When used with \code{\link{shinyApp}()}, this function must be called before
-#' \code{shinyApp()}, or in the \code{shinyApp()}'s \code{onStart} function. An
-#' alternative to calling the \code{enableBookmarking()} function is to use the
-#' \code{enableBookmarking} \emph{argument} for \code{shinyApp()}. See examples
-#' below.
-#'
 #' @param store Either \code{"url"}, which encodes all of the relevant values in
 #'   a URL, \code{"server"}, which saves to disk on the server, or
 #'   \code{"disable"}, which disables any previously-enabled bookmarking.
 #'
-#' @seealso \code{\link{onBookmark}}, \code{\link{onBookmarked}},
-#'   \code{\link{onRestore}}, and \code{\link{onRestored}} for registering
-#'   callback functions that are invoked when the state is bookmarked or
-#'   restored.
-#'
-#'   Also see \code{\link{updateQueryString}}.
+#' @seealso \code{\link{onBookmark}}, \code{\link{onRestore}}, and
+#'   \code{\link{onRestored}} for registering callback functions that are
+#'   invoked when the state is bookmarked or restored.
 #'
 #' @export
 #' @examples
@@ -722,7 +626,7 @@ showBookmarkUrlModal <- function(url) {
 #'   fluidPage(
 #'     textInput("txt", "Text"),
 #'     checkboxInput("chk", "Checkbox"),
-#'     bookmarkButton()
+#'     bookmarkButton("bookmark")
 #'   )
 #' }
 #' server <- function(input, output, session) { }
@@ -730,12 +634,15 @@ showBookmarkUrlModal <- function(url) {
 #' shinyApp(ui, server)
 #'
 #'
-#' # An alternative to calling enableBookmarking(): use shinyApp's
-#' # enableBookmarking argument
-#' shinyApp(ui, server, enableBookmarking = "url")
-#'
-#'
-#' # Same basic example with state saved to disk
+#' # Basic example with state saved to disk
+#' ui <- function(request) {
+#'   fluidPage(
+#'     textInput("txt", "Text"),
+#'     checkboxInput("chk", "Checkbox"),
+#'     bookmarkButton("bookmark")
+#'   )
+#' }
+#' server <- function(input, output, session) { }
 #' enableBookmarking("server")
 #' shinyApp(ui, server)
 #'
@@ -779,7 +686,7 @@ showBookmarkUrlModal <- function(url) {
 #'   fluidPage(
 #'     sliderInput("slider", "Slider", 1, 100, 50),
 #'     uiOutput("ui"),
-#'     bookmarkButton()
+#'     bookmarkButton("bookmark")
 #'   )
 #' }
 #' server <- function(input, output, session) {
@@ -798,7 +705,7 @@ showBookmarkUrlModal <- function(url) {
 #'     passwordInput("pw", "Password"), # Passwords are never saved
 #'     sliderInput("slider", "Slider", 1, 100, 50), # Manually excluded below
 #'     checkboxInput("chk", "Checkbox"),
-#'     bookmarkButton()
+#'     bookmarkButton("bookmark")
 #'   )
 #' }
 #' server <- function(input, output, session) {
@@ -808,29 +715,6 @@ showBookmarkUrlModal <- function(url) {
 #' shinyApp(ui, server)
 #'
 #'
-#' # Update the browser's location bar every time an input changes. This should
-#' # not be used with enableBookmarking("server"), because that would create a
-#' # new saved state on disk every time the user changes an input.
-#' ui <- function(req) {
-#'   fluidPage(
-#'     textInput("txt", "Text"),
-#'     checkboxInput("chk", "Checkbox")
-#'   )
-#' }
-#' server <- function(input, output, session) {
-#'   observe({
-#'     # Trigger this observer every time an input changes
-#'     reactiveValuesToList(input)
-#'     session$doBookmark()
-#'   })
-#'   onBookmarked(function(url) {
-#'     updateQueryString(url)
-#'   })
-#' }
-#' enableBookmarking("url")
-#' shinyApp(ui, server)
-#'
-#'
 #' # Save/restore uploaded files
 #' ui <- function(request) {
 #'   fluidPage(
@@ -845,7 +729,7 @@ showBookmarkUrlModal <- function(url) {
 #'         ),
 #'         tags$hr(),
 #'         checkboxInput("header", "Header", TRUE),
-#'         bookmarkButton()
+#'         bookmarkButton("bookmark")
 #'       ),
 #'       mainPanel(
 #'         tableOutput("contents")
@@ -906,8 +790,6 @@ setBookmarkExclude <- function(names = character(0), session = getDefaultReactiv
 #' \itemize{
 #'   \item \code{onBookmark} registers a function that will be called just
 #'     before Shiny bookmarks state.
-#'   \item \code{onBookmarked} registers a function that will be called just
-#'     after Shiny bookmarks state.
 #'   \item \code{onRestore} registers a function that will be called when a
 #'     session is restored, after the server function executes, but before all
 #'     other reactives, observers and render functions are run.

R/bootstrap.R

@@ -335,25 +335,14 @@ navbarPage <- function(title,
   if (inverse)
     navbarClass <- paste(navbarClass, "navbar-inverse")
 
-  if (!is.null(id))
-    selected <- restoreInput(id = id, default = selected)
-
   # build the tabset
   tabs <- list(...)
   tabset <- buildTabset(tabs, "nav navbar-nav", NULL, id, selected)
 
-  # function to return plain or fluid class name
-  className <- function(name) {
-    if (fluid)
-      paste(name, "-fluid", sep="")
-    else
-      name
-  }
-
   # built the container div dynamically to support optional collapsibility
   if (collapsible) {
     navId <- paste("navbar-collapse-", p_randomInt(1000, 10000), sep="")
-    containerDiv <- div(class=className("container"),
+    containerDiv <- div(class="container",
       div(class="navbar-header",
         tags$button(type="button", class="navbar-toggle collapsed",
           `data-toggle`="collapse", `data-target`=paste0("#", navId),
@@ -367,7 +356,7 @@ navbarPage <- function(title,
       div(class="navbar-collapse collapse", id=navId, tabset$navList)
     )
   } else {
-    containerDiv <- div(class=className("container"),
+    containerDiv <- div(class="container",
       div(class="navbar-header",
         span(class="navbar-brand", pageTitle)
       ),
@@ -375,6 +364,14 @@ navbarPage <- function(title,
     )
   }
 
+  # function to return plain or fluid class name
+  className <- function(name) {
+    if (fluid)
+      paste(name, "-fluid", sep="")
+    else
+      name
+  }
+
   # build the main tab content div
   contentDiv <- div(class=className("container"))
   if (!is.null(header))
@@ -633,13 +630,9 @@ tabsetPanel <- function(...,
                     version = "0.10.2.2")
   }
 
-  if (!is.null(id))
-    selected <- restoreInput(id = id, default = selected)
-
   # build the tabset
   tabs <- list(...)
   type <- match.arg(type)
-
   tabset <- buildTabset(tabs, paste0("nav nav-", type), NULL, id, selected)
 
   # create the content
@@ -702,9 +695,6 @@ navlistPanel <- function(...,
       tags$li(class="navbar-brand", text)
   }
 
-  if (!is.null(id))
-    selected <- restoreInput(id = id, default = selected)
-
   # build the tabset
   tabs <- list(...)
   tabset <- buildTabset(tabs,
@@ -935,34 +925,21 @@ textOutput <- function(outputId, container = if (inline) span else div, inline =
 #' Render a reactive output variable as verbatim text within an
 #' application page. The text will be included within an HTML \code{pre} tag.
 #' @param outputId output variable to read the value from
-#' @param placeholder if the output is empty or \code{NULL}, should an empty
-#'   rectangle be displayed to serve as a placeholder? (does not affect
-#'   behavior when the the output in nonempty)
 #' @return A verbatim text output element that can be included in a panel
 #' @details Text is HTML-escaped prior to rendering. This element is often used
-#'   with the \link{renderPrint} function to preserve fixed-width formatting
-#'   of printed objects.
+#' with the \link{renderPrint} function to preserve fixed-width formatting
+#' of printed objects.
 #' @examples
-#' ## Only run this example in interactive R sessions
-#' if (interactive()) {
-#'   shinyApp(
-#'     ui = basicPage(
-#'       textInput("txt", "Enter the text to display below:"),
-#'       verbatimTextOutput("default"),
-#'       verbatimTextOutput("placeholder", placeholder = TRUE)
-#'     ),
-#'     server = function(input, output) {
-#'       output$default <- renderText({ input$txt })
-#'       output$placeholder <- renderText({ input$txt })
-#'     }
-#'   )
-#' }
+#' mainPanel(
+#'   h4("Summary"),
+#'   verbatimTextOutput("summary"),
+#'
+#'   h4("Observations"),
+#'   tableOutput("view")
+#' )
 #' @export
-verbatimTextOutput <- function(outputId, placeholder = FALSE) {
-  pre(id = outputId,
-      class = paste(c("shiny-text-output", if (!placeholder) "noplaceholder"),
-                    collapse = " ")
-      )
+verbatimTextOutput <- function(outputId) {
+  textOutput(outputId, container = pre)
 }
 
 
@@ -1136,7 +1113,7 @@ imageOutput <- function(outputId, width = "100%", height="400px",
 #'   same \code{id} to disappear.
 #' @inheritParams textOutput
 #' @note The arguments \code{clickId} and \code{hoverId} only work for R base
-#'   graphics (see the \pkg{\link[graphics:graphics-package]{graphics}} package). They do not work for
+#'   graphics (see the \pkg{\link{graphics}} package). They do not work for
 #'   \pkg{\link[grid:grid-package]{grid}}-based graphics, such as \pkg{ggplot2},
 #'   \pkg{lattice}, and so on.
 #'
@@ -1434,7 +1411,6 @@ uiOutput <- htmlOutput
 #'   is assigned to.
 #' @param label The label that should appear on the button.
 #' @param class Additional CSS classes to apply to the tag, if any.
-#' @param ... Other arguments to pass to the container tag function.
 #'
 #' @examples
 #' \dontrun{
@@ -1457,25 +1433,23 @@ uiOutput <- htmlOutput
 #' @export
 downloadButton <- function(outputId,
                            label="Download",
-                           class=NULL, ...) {
+                           class=NULL) {
   aTag <- tags$a(id=outputId,
                  class=paste('btn btn-default shiny-download-link', class),
                  href='',
                  target='_blank',
-                 download=NA,
                  icon("download"),
-                 label, ...)
+                 label)
 }
 
 #' @rdname downloadButton
 #' @export
-downloadLink <- function(outputId, label="Download", class=NULL, ...) {
+downloadLink <- function(outputId, label="Download", class=NULL) {
   tags$a(id=outputId,
          class=paste(c('shiny-download-link', class), collapse=" "),
          href='',
          target='_blank',
-         download=NA,
-         label, ...)
+         label)
 }
 
 

R/conditions.R

@@ -76,7 +76,7 @@ getCallNames <- function(calls) {
 }
 
 getLocs <- function(calls) {
-  vapply(calls, function(call) {
+  sapply(calls, function(call) {
     srcref <- attr(call, "srcref", exact = TRUE)
     if (!is.null(srcref)) {
       srcfile <- attr(srcref, "srcfile", exact = TRUE)
@@ -86,7 +86,7 @@ getLocs <- function(calls) {
       }
     }
     return("")
-  }, character(1))
+  })
 }
 
 #' @details \code{captureStackTraces} runs the given \code{expr} and if any

R/fileupload.R

@@ -94,7 +94,7 @@ FileUploadContext <- R6Class(
     },
     createUploadOperation = function(fileInfos) {
       while (TRUE) {
-        id <- createUniqueId(12)
+        id <- paste(as.raw(p_runif(12, min=0, max=0xFF)), collapse='')
         private$ids <- c(private$ids, id)
         dir <- file.path(private$basedir, id)
         if (!dir.create(dir))

R/html-deps.R

@@ -6,7 +6,7 @@
 #' URL.
 #'
 #' @param dependency A single HTML dependency object, created using
-#'   \code{\link[htmltools]{htmlDependency}}. If the \code{src} value is named, then
+#'   \code{\link{htmlDependency}}. If the \code{src} value is named, then
 #'   \code{href} and/or \code{file} names must be present.
 #'
 #' @return A single HTML dependency object that has an \code{href}-named element

R/imageutils.R

@@ -21,7 +21,7 @@
 #' @param width Width in pixels.
 #' @param height Height in pixels.
 #' @param res Resolution in pixels per inch. This value is passed to
-#'   \code{\link[grDevices]{png}}. Note that this affects the resolution of PNG rendering in
+#'   \code{\link{png}}. Note that this affects the resolution of PNG rendering in
 #'   R; it won't change the actual ppi of the browser.
 #' @param ... Arguments to be passed through to \code{\link[grDevices]{png}}.
 #'   These can be used to set the width, height, background color, etc.

R/input-action.R

@@ -39,14 +39,10 @@
 #' @seealso \code{\link{observeEvent}} and \code{\link{eventReactive}}
 #' @export
 actionButton <- function(inputId, label, icon = NULL, width = NULL, ...) {
-
-  value <- restoreInput(id = inputId, default = NULL)
-
   tags$button(id=inputId,
     style = if (!is.null(width)) paste0("width: ", validateCssUnit(width), ";"),
     type="button",
     class="btn btn-default action-button",
-    `data-val` = value,
     list(validateIcon(icon), label),
     ...
   )
@@ -55,12 +51,9 @@ actionButton <- function(inputId, label, icon = NULL, width = NULL, ...) {
 #' @rdname actionButton
 #' @export
 actionLink <- function(inputId, label, icon = NULL, ...) {
-  value <- restoreInput(id = inputId, default = NULL)
-
   tags$a(id=inputId,
     href="#",
     class="action-button",
-    `data-val` = value,
     list(validateIcon(icon), label),
     ...
   )

R/input-date.R

@@ -10,7 +10,7 @@
 #'   \item \code{yy} Year without century (12)
 #'   \item \code{yyyy} Year with century (2012)
 #'   \item \code{mm} Month number, with leading zero (01-12)
-#'   \item \code{m} Month number, without leading zero (1-12)
+#'   \item \code{m} Month number, without leading zero (01-12)
 #'   \item \code{M} Abbreviated month name
 #'   \item \code{MM} Full month name
 #'   \item \code{dd} Day of month with leading zero
@@ -21,26 +21,23 @@
 #'
 #' @inheritParams textInput
 #' @param value The starting date. Either a Date object, or a string in
-#'   \code{yyyy-mm-dd} format. If NULL (the default), will use the current date
-#'   in the client's time zone.
+#'   \code{yyyy-mm-dd} format. If NULL (the default), will use the current
+#'   date in the client's time zone.
 #' @param min The minimum allowed date. Either a Date object, or a string in
 #'   \code{yyyy-mm-dd} format.
 #' @param max The maximum allowed date. Either a Date object, or a string in
 #'   \code{yyyy-mm-dd} format.
 #' @param format The format of the date to display in the browser. Defaults to
 #'   \code{"yyyy-mm-dd"}.
-#' @param startview The date range shown when the input object is first clicked.
-#'   Can be "month" (the default), "year", or "decade".
+#' @param startview The date range shown when the input object is first
+#'   clicked. Can be "month" (the default), "year", or "decade".
 #' @param weekstart Which day is the start of the week. Should be an integer
 #'   from 0 (Sunday) to 6 (Saturday).
 #' @param language The language used for month and day names. Default is "en".
-#'   Other valid values include "ar", "az", "bg", "bs", "ca", "cs", "cy", "da",
-#'   "de", "el", "en-AU", "en-GB", "eo", "es", "et", "eu", "fa", "fi", "fo",
-#'   "fr-CH", "fr", "gl", "he", "hr", "hu", "hy", "id", "is", "it-CH", "it",
-#'   "ja", "ka", "kh", "kk", "ko", "kr", "lt", "lv", "me", "mk", "mn", "ms",
-#'   "nb", "nl-BE", "nl", "no", "pl", "pt-BR", "pt", "ro", "rs-latin", "rs",
-#'   "ru", "sk", "sl", "sq", "sr-latin", "sr", "sv", "sw", "th", "tr", "uk",
-#'   "vi", "zh-CN", and "zh-TW".
+#'   Other valid values include "bg", "ca", "cs", "da", "de", "el", "es", "fi",
+#'   "fr", "he", "hr", "hu", "id", "is", "it", "ja", "kr", "lt", "lv", "ms",
+#'   "nb", "nl", "pl", "pt", "pt-BR", "ro", "rs", "rs-latin", "ru", "sk", "sl",
+#'   "sv", "sw", "th", "tr", "uk", "zh-CN", and "zh-TW".
 #'
 #' @family input elements
 #' @seealso \code{\link{dateRangeInput}}, \code{\link{updateDateInput}}
@@ -63,7 +60,7 @@
 #'
 #'   # Use different language and different first day of week
 #'   dateInput("date5", "Date:",
-#'           language = "ru",
+#'           language = "de",
 #'           weekstart = 1),
 #'
 #'   # Start with decade view instead of default month view
@@ -86,34 +83,29 @@ dateInput <- function(inputId, label, value = NULL, min = NULL, max = NULL,
 
   value <- restoreInput(id = inputId, default = value)
 
-  tags$div(id = inputId,
-    class = "shiny-date-input form-group shiny-input-container",
-    style = if (!is.null(width)) paste0("width: ", validateCssUnit(width), ";"),
+  attachDependencies(
+    tags$div(id = inputId,
+      class = "shiny-date-input form-group shiny-input-container",
+      style = if (!is.null(width)) paste0("width: ", validateCssUnit(width), ";"),
 
-    controlLabel(inputId, label),
-    tags$input(type = "text",
-               class = "form-control",
-               `data-date-language` = language,
-               `data-date-week-start` = weekstart,
-               `data-date-format` = format,
-               `data-date-start-view` = startview,
-               `data-min-date` = min,
-               `data-max-date` = max,
-               `data-initial-date` = value
+      controlLabel(inputId, label),
+      tags$input(type = "text",
+                 # datepicker class necessary for dropdown to display correctly
+                 class = "form-control datepicker",
+                 `data-date-language` = language,
+                 `data-date-weekstart` = weekstart,
+                 `data-date-format` = format,
+                 `data-date-start-view` = startview,
+                 `data-min-date` = min,
+                 `data-max-date` = max,
+                 `data-initial-date` = value
+      )
     ),
     datePickerDependency
   )
 }
 
 datePickerDependency <- htmlDependency(
-  "bootstrap-datepicker", "1.6.4", c(href = "shared/datepicker"),
+  "bootstrap-datepicker", "1.0.2", c(href = "shared/datepicker"),
   script = "js/bootstrap-datepicker.min.js",
-  stylesheet = "css/bootstrap-datepicker3.min.css",
-  # Need to enable noConflict mode. See #1346.
-  head = "<script>
-(function() {
-  var datepicker = $.fn.datepicker.noConflict();
-  $.fn.bsDatepicker = datepicker;
-})();
-</script>"
-)
+  stylesheet = "css/datepicker.css")

R/input-daterange.R

@@ -10,7 +10,7 @@
 #'   \item \code{yy} Year without century (12)
 #'   \item \code{yyyy} Year with century (2012)
 #'   \item \code{mm} Month number, with leading zero (01-12)
-#'   \item \code{m} Month number, without leading zero (1-12)
+#'   \item \code{m} Month number, without leading zero (01-12)
 #'   \item \code{M} Abbreviated month name
 #'   \item \code{MM} Full month name
 #'   \item \code{dd} Day of month with leading zero

R/input-select.R

@@ -15,12 +15,7 @@
 #'
 #' @inheritParams textInput
 #' @param choices List of values to select from. If elements of the list are
-#'   named, then that name rather than the value is displayed to the user.
-#'   This can also be a named list whose elements are (either named or
-#'   unnamed) lists or vectors. If this is the case, the outermost names
-#'   will be used as the "optgroup" label for the elements in the respective
-#'   sublist. This allows you to group and label similar choices. See the
-#'   example section for a small demo of this feature.
+#'   named then that name rather than the value is displayed to the user.
 #' @param selected The initially selected value (or multiple values if
 #'   \code{multiple = TRUE}). If not specified then defaults to the first value
 #'   for single-select lists and no values for multiple select lists.
@@ -39,38 +34,21 @@
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
 #'
-#' # basic example
-#' shinyApp(
-#'   ui = fluidPage(
-#'     selectInput("variable", "Variable:",
-#'                 c("Cylinders" = "cyl",
-#'                   "Transmission" = "am",
-#'                   "Gears" = "gear")),
-#'     tableOutput("data")
-#'   ),
-#'   server = function(input, output) {
-#'     output$data <- renderTable({
-#'       mtcars[, c("mpg", input$variable), drop = FALSE]
-#'     }, rownames = TRUE)
-#'   }
+#' ui <- fluidPage(
+#'   selectInput("variable", "Variable:",
+#'               c("Cylinders" = "cyl",
+#'                 "Transmission" = "am",
+#'                 "Gears" = "gear")),
+#'   tableOutput("data")
 #' )
 #'
-#' # demoing optgroup support in the `choices` arg
-#' shinyApp(
-#'   ui = fluidPage(
-#'     selectInput("state", "Choose a state:",
-#'       list(`East Coast` = c("NY", "NJ", "CT"),
-#'            `West Coast` = c("WA", "OR", "CA"),
-#'            `Midwest` = c("MN", "WI", "IA"))
-#'     ),
-#'     textOutput("result")
-#'   ),
-#'   server = function(input, output) {
-#'     output$result <- renderText({
-#'       paste("You chose", input$state)
-#'     })
-#'   }
-#' )
+#' server <- function(input, output) {
+#'   output$data <- renderTable({
+#'     mtcars[, c("mpg", input$variable), drop = FALSE]
+#'   }, rownames = TRUE)
+#' }
+#'
+#' shinyApp(ui, server)
 #' }
 #' @export
 selectInput <- function(inputId, label, choices, selected = NULL,
@@ -155,7 +133,7 @@ needOptgroup <- function(choices) {
 #' @rdname selectInput
 #' @param ... Arguments passed to \code{selectInput()}.
 #' @param options A list of options. See the documentation of \pkg{selectize.js}
-#'   for possible options (character option values inside \code{\link[base]{I}()} will
+#'   for possible options (character option values inside \code{\link{I}()} will
 #'   be treated as literal JavaScript code; see \code{\link{renderDataTable}()}
 #'   for details).
 #' @param width The width of the input, e.g. \code{'400px'}, or \code{'100\%'};
@@ -194,7 +172,7 @@ selectizeIt <- function(inputId, select, options, nonempty = FALSE) {
 
   if ('drag_drop' %in% options$plugins) {
     selectizeDep <- list(selectizeDep, htmlDependency(
-      'jqueryui', '1.12.1', c(href = 'shared/jqueryui'),
+      'jqueryui', '1.11.4', c(href = 'shared/jqueryui'),
       script = 'jquery-ui.min.js'
     ))
   }

R/input-slider.R

@@ -36,7 +36,7 @@
 #'   format string, to be passed to the Javascript strftime library. See
 #'   \url{https://github.com/samsonjs/strftime} for more details. The allowed
 #'   format specifications are very similar, but not identical, to those for R's
-#'   \code{\link[base]{strftime}} function. For Dates, the default is \code{"\%F"}
+#'   \code{\link{strftime}} function. For Dates, the default is \code{"\%F"}
 #'   (like \code{"2015-07-01"}), and for POSIXt, the default is \code{"\%F \%T"}
 #'   (like \code{"2015-07-01 15:32:10"}).
 #' @param timezone Only used if the values are POSIXt objects. A string
@@ -163,6 +163,7 @@ sliderInput <- function(inputId, label, min, max, value, step = NULL,
     `data-grid` = ticks,
     `data-grid-num` = n_ticks,
     `data-grid-snap` = FALSE,
+    `data-prettify-separator` = sep,
     `data-prefix` = pre,
     `data-postfix` = post,
     `data-keyboard` = TRUE,
@@ -174,12 +175,6 @@ sliderInput <- function(inputId, label, min, max, value, step = NULL,
     `data-timezone` = timezone
   ))
 
-  if (sep == "") {
-    sliderProps$`data-prettify-enabled` <- "0"
-  } else {
-    sliderProps$`data-prettify-separator` <- sep
-  }
-
   # Replace any TRUE and FALSE with "true" and "false"
   sliderProps <- lapply(sliderProps, function(x) {
     if (identical(x, TRUE)) "true"

R/input-submit.R

@@ -1,27 +1,8 @@
 #' Create a submit button
 #'
-#' Create a submit button for an app. Apps that include a submit
+#' Create a submit button for an input form. Forms that include a submit
 #' button do not automatically update their outputs when inputs change,
 #' rather they wait until the user explicitly clicks the submit button.
-#' The use of \code{submitButton} is generally discouraged in favor of
-#' the more versatile \code{\link{actionButton}} (see details below).
-#'
-#' Submit buttons are unusual Shiny inputs, and we recommend using
-#' \code{\link{actionButton}} instead of \code{submitButton} when you
-#' want to delay a reaction.
-#' See \href{http://shiny.rstudio.com/articles/action-buttons.html}{this
-#' article} for more information (including a demo of how to "translate"
-#' code using a \code{submitButton} to code using an \code{actionButton}).
-#'
-#' In essence, the presence of a submit button stops all inputs from
-#' sending their values automatically to the server. This means, for
-#' instance, that if there are \emph{two} submit buttons in the same app,
-#' clicking either one will cause all inputs in the app to send their
-#' values to the server. This is probably not what you'd want, which is
-#' why submit button are unwieldy for all but the simplest apps. There
-#' are other problems with submit buttons: for example, dynamically
-#' created submit buttons (for example, with \code{\link{renderUI}}
-#' or \code{\link{insertUI}}) will not work.
 #'
 #' @param text Button caption
 #' @param icon Optional \code{\link{icon}} to appear on the button
@@ -32,26 +13,8 @@
 #' @family input elements
 #'
 #' @examples
-#' if (interactive()) {
-#'
-#' shinyApp(
-#'   ui = basicPage(
-#'     numericInput("num", label = "Make changes", value = 1),
-#'     submitButton("Update View", icon("refresh")),
-#'     helpText("When you click the button above, you should see",
-#'              "the output below update to reflect the value you",
-#'              "entered at the top:"),
-#'     verbatimTextOutput("value")
-#'   ),
-#'   server = function(input, output) {
-#'
-#'     # submit buttons do not have a value of their own,
-#'     # they control when the app accesses values of other widgets.
-#'     # input$num is the value of the number widget.
-#'     output$value <- renderPrint({ input$num })
-#'   }
-#' )
-#' }
+#' submitButton("Update View")
+#' submitButton("Update View", icon("refresh"))
 #' @export
 submitButton <- function(text = "Apply Changes", icon = NULL, width = NULL) {
   div(

R/input-textarea.R

@@ -1,69 +0,0 @@
-#' Create a textarea input control
-#'
-#' Create a textarea input control for entry of unstructured text values.
-#'
-#' @inheritParams textInput
-#' @param height The height of the input, e.g. \code{'400px'}, or
-#'   \code{'100\%'}; see \code{\link{validateCssUnit}}.
-#' @param cols Value of the visible character columns of the input, e.g.
-#'   \code{80}. If used with \code{width}, \code{width} will take precedence in
-#'   the browser's rendering.
-#' @param rows The value of the visible character rows of the input, e.g.
-#'   \code{6}. If used with \code{height}, \code{height} will take precedence in
-#'   the browser's rendering.
-#' @param resize Which directions the textarea box can be resized. Can be one of
-#'   \code{"both"}, \code{"none"}, \code{"vertical"}, and \code{"horizontal"}.
-#'   The default, \code{NULL}, will use the client browser's default setting for
-#'   resizing textareas.
-#' @return A textarea input control that can be added to a UI definition.
-#'
-#' @family input elements
-#' @seealso \code{\link{updateTextAreaInput}}
-#'
-#' @examples
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#'
-#' ui <- fluidPage(
-#'   textAreaInput("caption", "Caption", "Data Summary", width = "1000px"),
-#'   verbatimTextOutput("value")
-#' )
-#' server <- function(input, output) {
-#'   output$value <- renderText({ input$caption })
-#' }
-#' shinyApp(ui, server)
-#'
-#' }
-#' @export
-textAreaInput <- function(inputId, label, value = "", width = NULL, height = NULL,
-  cols = NULL, rows = NULL, placeholder = NULL, resize = NULL) {
-
-  value <- restoreInput(id = inputId, default = value)
-
-  if (!is.null(resize)) {
-    resize <- match.arg(resize, c("both", "none", "vertical", "horizontal"))
-  }
-
-  style <- paste(
-    if (!is.null(width))  paste0("width: ",  validateCssUnit(width),  ";"),
-    if (!is.null(height)) paste0("height: ", validateCssUnit(height), ";"),
-    if (!is.null(resize)) paste0("resize: ", resize, ";")
-  )
-
-  # Workaround for tag attribute=character(0) bug:
-  #   https://github.com/rstudio/htmltools/issues/65
-  if (length(style) == 0) style <- NULL
-
-  div(class = "form-group shiny-input-container",
-    label %AND% tags$label(label, `for` = inputId),
-    tags$textarea(
-      id = inputId,
-      class = "form-control",
-      placeholder = placeholder,
-      style = style,
-      rows = rows,
-      cols = cols,
-      value
-    )
-  )
-}

R/input-utils.R

@@ -4,13 +4,10 @@ controlLabel <- function(controlName, label) {
 
 
 # Before shiny 0.9, `selected` refers to names/labels of `choices`; now it
-# refers to values. Below is a function for backward compatibility. It also
-# coerces the value to `character`.
+# refers to values. Below is a function for backward compatibility.
 validateSelected <- function(selected, choices, inputId) {
-  # this line accomplishes two tings:
-  #   - coerces selected to character
-  #   - drops name, otherwise toJSON() keeps it too
-  selected <- as.character(selected)
+  # drop names, otherwise toJSON() keeps them too
+  selected <- unname(selected)
   # if you are using optgroups, you're using shiny > 0.10.0, and you should
   # already know that `selected` must be a value instead of a label
   if (needOptgroup(choices)) return(selected)
@@ -66,7 +63,7 @@ generateOptions <- function(inputId, choices, selected, inline, type = 'checkbox
 
 
 # Takes a vector or list, and adds names (same as the value) to any entries
-# without names. Coerces all leaf nodes to `character`.
+# without names.
 choicesWithNames <- function(choices) {
   # Take a vector or list, and convert to list. Also, if any children are
   # vectors with length > 1, convert those to list. If the list is unnamed,
@@ -82,7 +79,7 @@ choicesWithNames <- function(choices) {
       if (is.list(val))
         listify(val)
       else if (length(val) == 1 && is.null(names(val)))
-        as.character(val)
+        val
       else
         makeNamed(as.list(val))
     })

R/jqueryui.R

@@ -79,6 +79,8 @@ absolutePanel <- function(...,
   if (isTRUE(draggable)) {
     divTag <- tagAppendAttributes(divTag, class='draggable')
     return(tagList(
+      # IMPORTANT NOTE: If you update jqueryui, make sure you DON'T include the datepicker,
+      # as it collides with our bootstrap datepicker!
       singleton(tags$head(tags$script(src='shared/jqueryui/jquery-ui.min.js'))),
       divTag,
       tags$script('$(".draggable").draggable();')

R/modal.R

@@ -36,15 +36,11 @@ removeModal <- function(session = getDefaultReactiveDomain()) {
 #' @param ... UI elements for the body of the modal dialog box.
 #' @param title An optional title for the dialog.
 #' @param footer UI for footer. Use \code{NULL} for no footer.
-#' @param size One of \code{"s"} for small, \code{"m"} (the default) for medium,
-#'   or \code{"l"} for large.
 #' @param easyClose If \code{TRUE}, the modal dialog can be dismissed by
 #'   clicking outside the dialog box, or be pressing the Escape key. If
 #'   \code{FALSE} (the default), the modal dialog can't be dismissed in those
 #'   ways; instead it must be dismissed by clicking on the dismiss button, or
 #'   from a call to \code{\link{removeModal}} on the server.
-#' @param fade If \code{FALSE}, the modal dialog will have no fade-in animation
-#'   (it will simply appear rather than fade in to view).
 #'
 #' @examples
 #' if (interactive()) {
@@ -84,7 +80,7 @@ removeModal <- function(session = getDefaultReactiveDomain()) {
 #' )
 #'
 #'
-#' # Display a modal that requires valid input before continuing.
+# Display a modal that requires valid input before continuing.
 #' shinyApp(
 #'   ui = basicPage(
 #'     actionButton("show", "Show modal dialog"),
@@ -124,8 +120,7 @@ removeModal <- function(session = getDefaultReactiveDomain()) {
 #'     # message.
 #'     observeEvent(input$ok, {
 #'       # Check that data object exists and is data frame.
-#'       if (!is.null(input$dataset) && nzchar(input$dataset) &&
-#'           exists(input$dataset) && is.data.frame(get(input$dataset))) {
+#'       if (exists(input$dataset) && is.data.frame(get(input$dataset))) {
 #'         vals$data <- get(input$dataset)
 #'         removeModal()
 #'       } else {
@@ -145,18 +140,13 @@ removeModal <- function(session = getDefaultReactiveDomain()) {
 #' }
 #' @export
 modalDialog <- function(..., title = NULL, footer = modalButton("Dismiss"),
-  size = c("m", "s", "l"), easyClose = FALSE, fade = TRUE) {
+                        easyClose = FALSE) {
 
-  size <- match.arg(size)
-
-  cls <- if (fade) "modal fade" else "modal"
-  div(id = "shiny-modal", class = cls, tabindex = "-1",
+  div(id = "shiny-modal", class = "modal fade", tabindex = "-1",
     `data-backdrop` = if (!easyClose) "static",
     `data-keyboard` = if (!easyClose) "false",
 
-    div(
-      class = "modal-dialog",
-      class = switch(size, s = "modal-sm", m = NULL, l = "modal-lg"),
+    div(class = "modal-dialog",
       div(class = "modal-content",
         if (!is.null(title)) div(class = "modal-header",
           tags$h4(class = "modal-title", title)

R/progress.R

@@ -12,14 +12,6 @@
 #' method is called. Calling \code{close} will cause the progress panel
 #' to be removed.
 #'
-#' As of version 0.14, the progress indicators use Shiny's new notification API.
-#' If you want to use the old styling (for example, you may have used customized
-#' CSS), you can use \code{style="old"} each time you call
-#' \code{Progress$new()}. If you don't want to set the style each time
-#' \code{Progress$new} is called, you can instead call
-#' \code{\link{shinyOptions}(progress.style="old")} just once, inside the server
-#' function.
-#'
 #' \strong{Methods}
 #'   \describe{
 #'     \item{\code{initialize(session, min = 0, max = 1)}}{
@@ -56,10 +48,6 @@
 #' @param value A numeric value at which to set
 #'   the progress bar, relative to \code{min} and \code{max}.
 #'   \code{NULL} hides the progress bar, if it is currently visible.
-#' @param style Progress display style. If \code{"notification"} (the default),
-#'   the progress indicator will show using Shiny's notification API. If
-#'   \code{"old"}, use the same HTML and CSS used in Shiny 0.13.2 and below
-#'   (this is for backward-compatibility).
 #' @param amount Single-element numeric vector; the value at which to set
 #'   the progress bar, relative to \code{min} and \code{max}.
 #'   \code{NULL} hides the progress bar, if it is currently visible.
@@ -101,10 +89,7 @@ Progress <- R6Class(
   portable = TRUE,
   public = list(
 
-    initialize = function(session = getDefaultReactiveDomain(),
-      min = 0, max = 1,
-      style = getShinyOption("progress.style", default = "notification"))
-    {
+    initialize = function(session = getDefaultReactiveDomain(), min = 0, max = 1) {
       if (is.null(session$progressStack))
         stop("'session' is not a ShinySession object.")
 
@@ -112,11 +97,10 @@ Progress <- R6Class(
       private$id <- createUniqueId(8)
       private$min <- min
       private$max <- max
-      private$style <- match.arg(style, choices = c("notification", "old"))
       private$value <- NULL
       private$closed <- FALSE
 
-      session$sendProgress('open', list(id = private$id, style = private$style))
+      session$sendProgress('open', list(id = private$id))
     },
 
     set = function(value = NULL, message = NULL, detail = NULL) {
@@ -138,8 +122,7 @@ Progress <- R6Class(
         id = private$id,
         message = message,
         detail = detail,
-        value = value,
-        style = private$style
+        value = value
       ))
 
        private$session$sendProgress('update', data)
@@ -165,9 +148,7 @@ Progress <- R6Class(
         return()
       }
 
-      private$session$sendProgress('close',
-        list(id = private$id, style = private$style)
-      )
+      private$session$sendProgress('close', list(id = private$id))
       private$closed <- TRUE
     }
   ),
@@ -177,7 +158,6 @@ Progress <- R6Class(
     id = character(0),
     min = numeric(0),
     max = numeric(0),
-    style = character(0),
     value = NULL,
     closed = logical(0)
   )
@@ -206,14 +186,6 @@ Progress <- R6Class(
 #' is not common) or otherwise cannot be encapsulated by a single scope. In that
 #' case, you can use the \code{Progress} reference class.
 #'
-#' As of version 0.14, the progress indicators use Shiny's new notification API.
-#' If you want to use the old styling (for example, you may have used customized
-#' CSS), you can use \code{style="old"} each time you call
-#' \code{withProgress()}. If you don't want to set the style each time
-#' \code{withProgress} is called, you can instead call
-#' \code{\link{shinyOptions}(progress.style="old")} just once, inside the server
-#' function.
-#'
 #' @param session The Shiny session object, as provided by \code{shinyServer} to
 #'   the server function. The default is to automatically find the session by
 #'   using the current reactive domain.
@@ -234,10 +206,6 @@ Progress <- R6Class(
 #'   displayed to the user, or \code{NULL} to hide the current detail message
 #'   (if any). The detail message will be shown with a de-emphasized appearance
 #'   relative to \code{message}.
-#' @param style Progress display style. If \code{"notification"} (the default),
-#'   the progress indicator will show using Shiny's notification API. If
-#'   \code{"old"}, use the same HTML and CSS used in Shiny 0.13.2 and below
-#'   (this is for backward-compatibility).
 #' @param value Single-element numeric vector; the value at which to set the
 #'   progress bar, relative to \code{min} and \code{max}. \code{NULL} hides the
 #'   progress bar, if it is currently visible.
@@ -269,12 +237,10 @@ Progress <- R6Class(
 #' @rdname withProgress
 #' @export
 withProgress <- function(expr, min = 0, max = 1,
-  value = min + (max - min) * 0.1,
-  message = NULL, detail = NULL,
-  style = getShinyOption("progress.style", default = "notification"),
-  session = getDefaultReactiveDomain(),
-  env = parent.frame(), quoted = FALSE)
-{
+                         value = min + (max - min) * 0.1,
+                         message = NULL, detail = NULL,
+                         session = getDefaultReactiveDomain(),
+                         env = parent.frame(), quoted = FALSE) {
 
   if (!quoted)
     expr <- substitute(expr)
@@ -282,9 +248,7 @@ withProgress <- function(expr, min = 0, max = 1,
   if (is.null(session$progressStack))
     stop("'session' is not a ShinySession object.")
 
-  style <- match.arg(style, c("notification", "old"))
-
-  p <- Progress$new(session, min = min, max = max, style = style)
+  p <- Progress$new(session, min = min, max = max)
 
   session$progressStack$push(p)
   on.exit({

R/reactives.R

@@ -82,7 +82,7 @@ ReactiveValues <- R6Class(
       }
 
       if (isFrozen(key))
-        reactiveStop()
+        stopWithCondition(c("validation", "shiny.silent.error"), "")
 
       if (!exists(key, envir=.values, inherits=FALSE))
         NULL
@@ -344,7 +344,7 @@ as.list.reactivevalues <- function(x, all.names=FALSE, ...) {
 
 #' Convert a reactivevalues object to a list
 #'
-#' This function does something similar to what you might \code{\link[base]{as.list}}
+#' This function does something similar to what you might \code{\link{as.list}}
 #' to do. The difference is that the calling context will take dependencies on
 #' every object in the reactivevalues object. To avoid taking dependencies on
 #' all the objects, you can wrap the call with \code{\link{isolate}()}.
@@ -526,7 +526,6 @@ Observable <- R6Class(
       .mostRecentCtxId <<- ctx$id
       ctx$onInvalidate(function() {
         .invalidated <<- TRUE
-        .value <<- NULL # Value can be GC'd, it won't be read once invalidated
         .dependents$invalidate()
       })
       .execCount <<- .execCount + 1L
@@ -703,10 +702,6 @@ execCount <- function(x) {
 
 # Observer ------------------------------------------------------------------
 
-# The initial value of "current observer" is NULL (and will always be NULL,
-# except when within the scope of the observe or observeEvent)
-.globals$currentObserver <- NULL
-
 Observer <- R6Class(
   'Observer',
   portable = FALSE,
@@ -818,8 +813,6 @@ registerDebugHook("observerFunc", environment(), label)
     run = function() {
       ctx <- .createContext()
       .execCount <<- .execCount + 1L
-      .globals$currentObserver <- self
-      on.exit(.globals$currentObserver <- NULL) # On exit, set it back to NULL
       ctx$run(.func)
     },
     onInvalidate = function(callback) {
@@ -910,125 +903,6 @@ registerDebugHook("observerFunc", environment(), label)
   )
 )
 
-#' Return the current observer
-#'
-#' This function is useful when you want to access an observer's methods or
-#' variables directly. For example, you may have logic that destroys or
-#' suspends the observer (from within its own scope) on some condition.
-#'
-#' This function works by returning the observer that is currently being run
-#' when \code{getCurrentObserver()} is called. If there is no observer being
-#' run (for example, if you called it from outside of a reactive context),
-#' it will always return \code{NULL}. There are a few subtleties, however.
-#' Consider the following five situations:
-#'
-#' \enumerate{
-#'   \item \code{getCurrentObserver()   #outside of a reactive context}
-#'   \item \code{observe({              getCurrentObserver()      }) }
-#'   \item \code{observe({ (function(){ getCurrentObserver() })() )} }
-#'   \item \code{observe({ isolate({    getCurrentObserver() })   }) }
-#'   \item \code{observe({ reactive({   getCurrentObserver() })   }) }
-#' }
-#'
-#' In (1), since you're outside of a reactive context, we've already
-#' established that \code{getCurrentObserver()} will return \code{NULL}.
-#' In (2), we have the "vanilla" case, in which \code{getCurrentObserver()}
-#' is called directly from within the body of the \code{observe} call.
-#' This returns that observer. So far, so good. The problem comes with
-#' the last three cases -- should we be able to "retrieve" the outer
-#' observer if we're inside an inner function's scope, or inside of an
-#' \code{isolate} or a \code{reactive} block?
-#'
-#' Before we can even asnwer that, there is an important distinction to
-#' be made here: are function calls, \code{reactive} calls and
-#' \code{isolate} blocks the same \emph{type} of thing? As far as Shiny
-#' is concerned, the answer is no. Shiny-specific things (like observers,
-#' reactives and code inside of an \code{isolate} chunk) exist in what we
-#' call reactive contexts. Each run of an observer or a reactive is
-#' associated with a particular reactive context. But regular functions
-#' have no relation to reactive contexts. So, while calling a regular
-#' function inside of an observer does not change the reactive context,
-#' calling a \code{reactive} or \code{isolate} certainly does.
-#'
-#' With this distinction in mind, we can refine our definition of
-#' \code{getCurrentObserver()} as follows: it returns the observer (if any)
-#' that is currently running, as long as it is called from within the
-#' same reactive context that was created when the observer started
-#' running. If the reactive context changed (most likely because of a
-#' call to \code{reactive} or \code{isolate}), \code{getCurrentObserver}
-#' will return \code{NULL}. (There is another common way that the reactive
-#' context can change inside an observer, which is if there is a second,
-#' nested observer. In this case, \code{getCurrentObserver()} will return
-#' the second, nested observer, since that is the one that is actually
-#' running at that time.)
-#'
-#' So to recap, here's the return value for each of the five situations:
-#' \enumerate{
-#'   \item \code{NULL}
-#'   \item the observer
-#'   \item the observer
-#'   \item \code{NULL}
-#'   \item \code{NULL}
-#' }
-#'
-#' Now, you may be wondering why \code{getCurrentObserver()} should't be able
-#' to get the running observer even if the reactive context changes. This isn't
-#' technically impossible. In fact, if you want this behavior for some reason,
-#' you can set the argument \code{dig} to be \code{TRUE}, so that the function
-#' will "dig" through the reactive contexts until it retrieves the one for the
-#' observer and returns the observer.
-#'
-#' So, with \code{dig = TRUE}, here's the return value for each of the five
-#' situations:
-#' \enumerate{
-#'   \item \code{NULL}
-#'   \item the observer
-#'   \item the observer
-#'   \item the observer
-#'   \item the observer
-#' }
-#'
-#' The reason that this is not the default (or even encouraged) is because
-#' things can get messy quickly when you cross reactive contexts at will.
-#' For example, the return value of a \code{reactive} call is cached and that
-#' reactive is not re-run unless its reactive dependencies change. If that
-#' reactive has a call to \code{getCurrentObserver()}, this can produce
-#' undesirable and unintuitive results.
-#'
-#' @param dig If \code{FALSE} (default), \code{getCurrentObserver} will only
-#'   return the observer if it's invoked directly from within the observer's
-#'   body or from a regular function. If \code{TRUE}, it will always return
-#'   the observer (if it exists on the stack), even if it's invoked from
-#'   within a \code{reactive} or an \code{isolate} scope. See below for more
-#'   information.
-#'
-#' @return The observer (created with a call to either \code{observe} or to
-#' \code{observeEvent}) that is currently running.
-#'
-#' @seealso \code{\link{observe}}
-#'
-#' @examples
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#' shinyApp(
-#'   ui = basicPage( actionButton("go", "Go")),
-#'   server = function(input, output, session) {
-#'     observeEvent(input$go, {
-#'       print(paste("This will only be printed once; all",
-#'             "subsequent button clicks won't do anything"))
-#'       getCurrentObserver()$destroy()
-#'     })
-#'   }
-#' )
-#' }
-#' @export
-getCurrentObserver <- function(dig = FALSE) {
-  o <- .globals$currentObserver
-  ctx <- getCurrentContext()
-  if (!dig && !is.null(o) && ctx$id != o$.ctx$id) o <- NULL
-  o
-}
-
 #' Create a reactive observer
 #'
 #' Creates an observer from the given expression.
@@ -1048,8 +922,8 @@ getCurrentObserver <- function(dig = FALSE) {
 #' soon as their dependencies change, they schedule themselves to re-execute.
 #'
 #' Starting with Shiny 0.10.0, observers are automatically destroyed by default
-#' when the \link[=domains]{domain} that owns them ends (e.g. when a Shiny
-#' session ends).
+#' when the \link[=domains]{domain} that owns them ends (e.g. when a Shiny session
+#' ends).
 #'
 #' @param x An expression (quoted or unquoted). Any return value will be
 #'   ignored.
@@ -1060,13 +934,12 @@ getCurrentObserver <- function(dig = FALSE) {
 #'   This is useful when you want to use an expression that is stored in a
 #'   variable; to do so, it must be quoted with \code{quote()}.
 #' @param label A label for the observer, useful for debugging.
-#' @param suspended If \code{TRUE}, start the observer in a suspended state. If
-#'   \code{FALSE} (the default), start in a non-suspended state.
+#' @param suspended If \code{TRUE}, start the observer in a suspended state.
+#'   If \code{FALSE} (the default), start in a non-suspended state.
 #' @param priority An integer or numeric that controls the priority with which
-#'   this observer should be executed. A higher value means higher priority: an
-#'   observer with a higher priority value will execute before all observers
-#'   with lower priority values. Positive, negative, and zero values are
-#'   allowed.
+#'   this observer should be executed. An observer with a given priority level
+#'   will always execute sooner than all observers with a lower priority level.
+#'   Positive, negative, and zero values are allowed.
 #' @param domain See \link{domains}.
 #' @param autoDestroy If \code{TRUE} (the default), the observer will be
 #'   automatically destroyed when its domain (if any) ends.
@@ -1235,7 +1108,7 @@ setAutoflush <- local({
 #' @return A no-parameter function that can be called from a reactive context,
 #'   in order to cause that context to be invalidated the next time the timer
 #'   interval elapses. Calling the returned function also happens to yield the
-#'   current time (as in \code{\link[base]{Sys.time}}).
+#'   current time (as in \code{\link{Sys.time}}).
 #' @seealso \code{\link{invalidateLater}}
 #'
 #' @examples
@@ -1543,7 +1416,7 @@ reactiveFileReader <- function(intervalMillis, session, filePath, readFunc, ...)
 #' The expression given to \code{isolate()} is evaluated in the calling
 #' environment. This means that if you assign a variable inside the
 #' \code{isolate()}, its value will be visible outside of the \code{isolate()}.
-#' If you want to avoid this, you can use \code{\link[base]{local}()} inside the
+#' If you want to avoid this, you can use \code{\link{local}()} inside the
 #' \code{isolate()}.
 #'
 #' This function can also be useful for calling reactive expression at the

R/render-plot.R

@@ -28,7 +28,7 @@
 #'   inline plot, you must provide numeric values (in pixels) to both
 #'   \code{width} and \code{height}.
 #' @param res Resolution of resulting plot, in pixels per inch. This value is
-#'   passed to \code{\link[grDevices]{png}}. Note that this affects the resolution of PNG
+#'   passed to \code{\link{png}}. Note that this affects the resolution of PNG
 #'   rendering in R; it won't change the actual ppi of the browser.
 #' @param ... Arguments to be passed through to \code{\link[grDevices]{png}}.
 #'   These can be used to set the width, height, background color, etc.
@@ -165,9 +165,9 @@ renderPlot <- function(expr, width='auto', height='auto', res=72, ...,
 
   plotObj <- reactive(label = "plotObj", {
     if (execOnResize) {
-      dims <- getDims()
-    } else {
       isolate({ dims <- getDims() })
+    } else {
+      dims <- getDims()
     }
 
     if (is.null(dims$width) || is.null(dims$height) ||
@@ -185,9 +185,6 @@ renderPlot <- function(expr, width='auto', height='auto', res=72, ...,
       success <-FALSE
       tryCatch(
         {
-          # This is necessary to enable displaylist recording
-          grDevices::dev.control(displaylist = "enable")
-
           # Actually perform the plotting
           result <- withVisible(func())
           success <- TRUE
@@ -418,39 +415,23 @@ getPrevPlotCoordmap <- function(width, height) {
 
 # Given a ggplot_build_gtable object, return a coordmap for it.
 getGgplotCoordmap <- function(p, pixelratio, res) {
-  # Structure of ggplot objects changed after 2.1.0
-  new_ggplot <- (utils::packageVersion("ggplot2") > "2.1.0")
-
   if (!inherits(p, "ggplot_build_gtable"))
     return(NULL)
 
   # Given a built ggplot object, return x and y domains (data space coords) for
   # each panel.
   find_panel_info <- function(b) {
-    if (new_ggplot) {
-      layout <- b$layout$panel_layout
-    } else {
-      layout <- b$panel$layout
-    }
+    layout <- b$panel$layout
     # Convert factor to numbers
     layout$PANEL <- as.integer(as.character(layout$PANEL))
 
     # Names of facets
+    facet <- b$plot$facet
     facet_vars <- NULL
-    if (new_ggplot) {
-      facet <- b$layout$facet
-      if (inherits(facet, "FacetGrid")) {
-        facet_vars <- vapply(c(facet$params$cols, facet$params$rows), as.character, character(1))
-      } else if (inherits(facet, "FacetWrap")) {
-        facet_vars <- vapply(facet$params$facets, as.character, character(1))
-      }
-    } else {
-      facet <- b$plot$facet
-      if (inherits(facet, "grid")) {
-        facet_vars <- vapply(c(facet$cols, facet$rows), as.character, character(1))
-      } else if (inherits(facet, "wrap")) {
-        facet_vars <- vapply(facet$facets, as.character, character(1))
-      }
+    if (inherits(facet, "grid")) {
+      facet_vars <- vapply(c(facet$cols, facet$rows), as.character, character(1))
+    } else if (inherits(facet, "wrap")) {
+      facet_vars <- vapply(facet$facets, as.character, character(1))
     }
 
     # Iterate over each row in the layout data frame
@@ -492,11 +473,7 @@ getGgplotCoordmap <- function(p, pixelratio, res) {
   # Given a single range object (representing the data domain) from a built
   # ggplot object, return the domain.
   find_panel_domain <- function(b, panel_num, scalex_num = 1, scaley_num = 1) {
-    if (new_ggplot) {
-      range <- b$layout$panel_ranges[[panel_num]]
-    } else {
-      range <- b$panel$ranges[[panel_num]]
-    }
+    range <- b$panel$ranges[[panel_num]]
     domain <- list(
       left   = range$x.range[1],
       right  = range$x.range[2],
@@ -505,13 +482,9 @@ getGgplotCoordmap <- function(p, pixelratio, res) {
     )
 
     # Check for reversed scales
-    if (new_ggplot) {
-      xscale <- b$layout$panel_scales$x[[scalex_num]]
-      yscale <- b$layout$panel_scales$y[[scaley_num]]
-    } else {
-      xscale <- b$panel$x_scales[[scalex_num]]
-      yscale <- b$panel$y_scales[[scaley_num]]
-    }
+    xscale <- b$panel$x_scales[[scalex_num]]
+    yscale <- b$panel$y_scales[[scaley_num]]
+
     if (!is.null(xscale$trans) && xscale$trans$name == "reverse") {
       domain$left  <- -domain$left
       domain$right <- -domain$right
@@ -546,18 +519,10 @@ getGgplotCoordmap <- function(p, pixelratio, res) {
     y_names <- character(0)
 
     # Continuous scales have a trans; discrete ones don't
-    if (new_ggplot) {
-      if (!is.null(b$layout$panel_scales$x[[scalex_num]]$trans))
-        x_names <- b$layout$panel_scales$x[[scalex_num]]$trans$name
-      if (!is.null(b$layout$panel_scales$y[[scaley_num]]$trans))
-        y_names <- b$layout$panel_scales$y[[scaley_num]]$trans$name
-
-    } else {
-      if (!is.null(b$panel$x_scales[[scalex_num]]$trans))
-        x_names <- b$panel$x_scales[[scalex_num]]$trans$name
-      if (!is.null(b$panel$y_scales[[scaley_num]]$trans))
-        y_names <- b$panel$y_scales[[scaley_num]]$trans$name
-    }
+    if (!is.null(b$panel$x_scales[[scalex_num]]$trans))
+      x_names <- b$panel$x_scales[[scalex_num]]$trans$name
+    if (!is.null(b$panel$y_scales[[scaley_num]]$trans))
+      y_names <- b$panel$y_scales[[scaley_num]]$trans$name
 
     coords <- b$plot$coordinates
     if (!is.null(coords$trans)) {
@@ -611,11 +576,6 @@ getGgplotCoordmap <- function(p, pixelratio, res) {
       )
     }
 
-    # Look for CoordFlip
-    if (inherits(b$plot$coordinates, "CoordFlip")) {
-      mappings[c("x", "y")] <- mappings[c("y", "x")]
-    }
-
     mappings_cache <<- mappings
     mappings
   }

R/server-input-handlers.R

@@ -71,63 +71,6 @@ removeInputHandler <- function(type){
   inputHandlers$remove(type)
 }
 
-
-# Apply input handler to a single input value
-applyInputHandler <- function(name, val, shinysession) {
-  splitName <- strsplit(name, ':')[[1]]
-  if (length(splitName) > 1) {
-    if (!inputHandlers$containsKey(splitName[[2]])) {
-      # No input handler registered for this type
-      stop("No handler registered for type ", name)
-    }
-
-    inputName <- splitName[[1]]
-
-    # Get the function for processing this type of input
-    inputHandler <- inputHandlers$get(splitName[[2]])
-
-    return(inputHandler(val, shinysession, inputName))
-
-  } else if (is.list(val) && is.null(names(val))) {
-    return(unlist(val, recursive = TRUE))
-  } else {
-    return(val)
-  }
-}
-
-#' Apply input handlers to raw input values
-#'
-#' The purpose of this function is to make it possible for external packages to
-#' test Shiny inputs. It takes a named list of raw input values, applies input
-#' handlers to those values, and then returns a named list of the processed
-#' values.
-#'
-#' The raw input values should be in a named list. Some values may have names
-#' like \code{"x:shiny.date"}. This function would apply the \code{"shiny.date"}
-#' input handler to the value, and then rename the result to \code{"x"}, in the
-#' output.
-#'
-#' @param inputs A named list of input values.
-#' @param shinysession A Shiny session object.
-#'
-#' @seealso registerInputHandler
-#' @keywords internal
-applyInputHandlers <- function(inputs, shinysession = getDefaultReactiveDomain()) {
-  inputs <- mapply(applyInputHandler, names(inputs), inputs,
-                   MoreArgs = list(shinysession = shinysession),
-                   SIMPLIFY = FALSE)
-
-  # Convert names like "button1:shiny.action" to "button1"
-  names(inputs) <- vapply(
-    names(inputs),
-    function(name) { strsplit(name, ":")[[1]][1] },
-    FUN.VALUE = character(1)
-  )
-
-  inputs
-}
-
-
 # Takes a list-of-lists and returns a matrix. The lists
 # must all be the same length. NULL is replaced by NA.
 registerInputHandler("shiny.matrix", function(data, ...) {
@@ -155,20 +98,7 @@ registerInputHandler("shiny.password", function(val, shinysession, name) {
 registerInputHandler("shiny.date", function(val, ...){
   # First replace NULLs with NA, then convert to Date vector
   datelist <- ifelse(lapply(val, is.null), NA, val)
-
-  res <- NULL
-  tryCatch({
-      res <- as.Date(unlist(datelist))
-    },
-    error = function(e) {
-      # It's possible for client to send a string like "99999-01-01", which
-      # as.Date can't handle.
-      warning(e$message)
-      res <<- as.Date(rep(NA, length(datelist)))
-    }
-  )
-
-  res
+  as.Date(unlist(datelist))
 })
 
 registerInputHandler("shiny.datetime", function(val, ...){
@@ -181,6 +111,9 @@ registerInputHandler("shiny.datetime", function(val, ...){
 })
 
 registerInputHandler("shiny.action", function(val, shinysession, name) {
+  # Mark as not serializable
+  .subset2(shinysession$input, "impl")$setMeta(name, "shiny.serializer", serializerUnserializable)
+
   # mark up the action button value with a special class so we can recognize it later
   class(val) <- c(class(val), "shinyActionButtonValue")
   val
@@ -196,25 +129,14 @@ registerInputHandler("shiny.file", function(val, shinysession, name) {
   # The data will be a named list of lists; convert to a data frame.
   val <- as.data.frame(lapply(val, unlist), stringsAsFactors = FALSE)
 
-  # `val$datapath` should be a filename without a path, for security reasons.
-  if (basename(val$datapath) != val$datapath) {
-    stop("Invalid '/' found in file input path.")
+  # Make sure that the paths don't go up the directory tree, for security
+  # reasons.
+  if (any(grepl("..", val$datapath, fixed = TRUE))) {
+    stop("Invalid '..' found in file input path.")
   }
 
   # Prepend the persistent dir
-  oldfile <- file.path(getCurrentRestoreContext()$dir, val$datapath)
-
-  # Copy the original file to a new temp dir, so that a restored session can't
-  # modify the original.
-  newdir <- file.path(tempdir(), createUniqueId(12))
-  dir.create(newdir)
-  val$datapath <- file.path(newdir, val$datapath)
-  file.copy(oldfile, val$datapath)
-
-  # Need to mark this input value with the correct serializer. When a file is
-  # uploaded the usual way (instead of being restored), this occurs in
-  # session$`@uploadEnd`.
-  .subset2(shinysession$input, "impl")$setMeta(name, "shiny.serializer", serializerFileInput)
+  val$datapath <- file.path(getCurrentRestoreContext()$dir, val$datapath)
 
   val
 })

R/server.R

@@ -218,8 +218,7 @@ createAppHandlers <- function(httpHandlers, serverFuncSource) {
           if (is.character(msg))
             msg <- charToRaw(msg)
 
-          traceOption <- getOption('shiny.trace', FALSE)
-          if (isTRUE(traceOption) || traceOption == "recv") {
+          if (isTRUE(getOption('shiny.trace'))) {
             if (binary)
               message("RECV ", '$$binary data$$')
             else
@@ -248,7 +247,38 @@ createAppHandlers <- function(httpHandlers, serverFuncSource) {
 
           withRestoreContext(shinysession$restoreContext, {
 
-            msg$data <- applyInputHandlers(msg$data)
+            unpackInput <- function(name, val) {
+              splitName <- strsplit(name, ':')[[1]]
+              if (length(splitName) > 1) {
+                if (!inputHandlers$containsKey(splitName[[2]])) {
+                  # No input handler registered for this type
+                  stop("No handler registered for type ", name)
+                }
+
+                inputName <- splitName[[1]]
+
+                # Get the function for processing this type of input
+                inputHandler <- inputHandlers$get(splitName[[2]])
+
+                return(inputHandler(val, shinysession, inputName))
+
+              } else if (is.list(val) && is.null(names(val))) {
+                return(unlist(val, recursive = TRUE))
+              } else {
+                return(val)
+              }
+            }
+
+            msg$data <- mapply(unpackInput, names(msg$data), msg$data,
+                               SIMPLIFY = FALSE)
+
+            # Convert names like "button1:shiny.action" to "button1"
+            names(msg$data) <- vapply(
+              names(msg$data),
+              function(name) { strsplit(name, ":")[[1]][1] },
+              FUN.VALUE = character(1)
+            )
+
 
             switch(
               msg$method,
@@ -503,9 +533,6 @@ serviceApp <- function() {
 #'   application. If set to \code{"normal"}, displays the application normally.
 #'   Defaults to \code{"auto"}, which displays the application in the mode given
 #'   in its \code{DESCRIPTION} file, if any.
-#' @param test.mode Should the application be launched in test mode? This is
-#'   only used for recording or running automated tests. Defaults to the
-#'   \code{shiny.testmode} option, or FALSE if the option is not set.
 #'
 #' @examples
 #' \dontrun{
@@ -549,8 +576,7 @@ runApp <- function(appDir=getwd(),
                                             interactive()),
                    host=getOption('shiny.host', '127.0.0.1'),
                    workerId="", quiet=FALSE,
-                   display.mode=c("auto", "normal", "showcase"),
-                   test.mode=getOption('shiny.testmode', FALSE)) {
+                   display.mode=c("auto", "normal", "showcase")) {
   on.exit({
     handlerManager$clear()
   }, add = TRUE)
@@ -561,55 +587,17 @@ runApp <- function(appDir=getwd(),
     .globals$options <- oldOptionSet
   },add = TRUE)
 
+  if (is.null(host) || is.na(host))
+    host <- '0.0.0.0'
+
   # Make warnings print immediately
   # Set pool.scheduler to support pool package
   ops <- options(warn = 1, pool.scheduler = scheduleTask)
   on.exit(options(ops), add = TRUE)
 
-  appParts <- as.shiny.appobj(appDir)
-
-  # The lines below set some of the app's running options, which
-  # can be:
-  #   - left unspeficied (in which case the arguments' default
-  #     values from `runApp` kick in);
-  #   - passed through `shinyApp`
-  #   - passed through `runApp` (this function)
-  #   - passed through both `shinyApp` and `runApp` (the latter
-  #     takes precedence)
-  #
-  # Matrix of possibilities:
-  # | IN shinyApp | IN runApp | result       | check                                                                                                                                  |
-  # |-------------|-----------|--------------|----------------------------------------------------------------------------------------------------------------------------------------|
-  # | no          | no        | use defaults | exhaust all possibilities: if it's missing (runApp does not specify); THEN if it's not in shinyApp appParts$options; THEN use defaults |
-  # | yes         | no        | use shinyApp | if it's missing (runApp does not specify); THEN if it's in shinyApp appParts$options; THEN use shinyApp                                |
-  # | no          | yes       | use runApp   | if it's not missing (runApp specifies), use those                                                                                      |
-  # | yes         | yes       | use runApp   | if it's not missing (runApp specifies), use those                                                                                      |
-  #
-  # I tried to make this as compact and intuitive as possible,
-  # given that there are four distinct possibilities to check
-  appOps <- appParts$options
-  findVal <- function(arg, default) {
-    if (arg %in% names(appOps)) appOps[[arg]] else default
-  }
-
-  if (missing(port))
-    port <- findVal("port", port)
-  if (missing(launch.browser))
-    launch.browser <- findVal("launch.browser", launch.browser)
-  if (missing(host))
-    host <- findVal("host", host)
-  if (missing(quiet))
-    quiet <- findVal("quiet", quiet)
-  if (missing(display.mode))
-    display.mode <- findVal("display.mode", display.mode)
-  if (missing(test.mode))
-    test.mode <- findVal("test.mode", test.mode)
-
-  if (is.null(host) || is.na(host)) host <- '0.0.0.0'
-
   workerId(workerId)
 
-  if (inShinyServer()) {
+  if (nzchar(Sys.getenv('SHINY_PORT'))) {
     # If SHINY_PORT is set, we're running under Shiny Server. Check the version
     # to make sure it is compatible. Older versions of Shiny Server don't set
     # SHINY_SERVER_VERSION, those will return "" which is considered less than
@@ -626,11 +614,6 @@ runApp <- function(appDir=getwd(),
   # the display.mode parameter. The latter takes precedence.
   setShowcaseDefault(0)
 
-  .globals$testMode <- test.mode
-  if (test.mode) {
-    message("Running application in test mode.")
-  }
-
   # If appDir specifies a path, and display mode is specified in the
   # DESCRIPTION file at that path, apply it here.
   if (is.character(appDir)) {
@@ -718,6 +701,8 @@ runApp <- function(appDir=getwd(),
     }
   }
 
+  appParts <- as.shiny.appobj(appDir)
+
   # Extract appOptions (which is a list) and store them as shinyOptions, for
   # this app. (This is the only place we have to store settings that are
   # accessible both the UI and server portion of the app.)
@@ -761,16 +746,12 @@ runApp <- function(appDir=getwd(),
   # Top-level ..stacktraceoff..; matches with ..stacktraceon in observe(),
   # reactive(), Callbacks$invoke(), and others
   ..stacktraceoff..(
-    captureStackTraces({
-      # If any observers were created before runApp was called, this will make
-      # sure they run once the app starts. (Issue #1013)
-      scheduleFlush()
-
+    captureStackTraces(
       while (!.globals$stopped) {
         serviceApp()
         Sys.sleep(0.001)
       }
-    })
+    )
   )
 
   if (isTRUE(.globals$reterror)) {
@@ -1002,9 +983,3 @@ browserViewer <- function(browser = getOption("browser")) {
     utils::browseURL(url, browser = browser)
   }
 }
-
-# Returns TRUE if we're running in Shiny Server or other hosting environment,
-# otherwise returns FALSE.
-inShinyServer <- function() {
-  nzchar(Sys.getenv('SHINY_PORT'))
-}

R/shiny.R

@@ -39,12 +39,9 @@ NULL
 #'     when an app is run. See \code{\link{runApp}} for more information.}
 #'   \item{shiny.port}{A port number that Shiny will listen on. See
 #'     \code{\link{runApp}} for more information.}
-#'   \item{shiny.trace}{Print messages sent between the R server and the web
-#'     browser client to the R console. This is useful for debugging. Possible
-#'     values are \code{"send"} (only print messages sent to the client),
-#'     \code{"recv"} (only print messages received by the server), \code{TRUE}
-#'     (print all messages), or \code{FALSE} (default; don't print any of these
-#'     messages).}
+#'   \item{shiny.trace}{If \code{TRUE}, all of the messages sent between the R
+#'     server and the web browser client will be printed on the console. This
+#'     is useful for debugging.}
 #'   \item{shiny.autoreload}{If \code{TRUE} when a Shiny app is launched, the
 #'     app directory will be continually monitored for changes to files that
 #'     have the extensions: r, htm, html, js, css, png, jpg, jpeg, gif. If any
@@ -56,10 +53,10 @@ NULL
 #'
 #'     You can customize the file patterns Shiny will monitor by setting the
 #'     shiny.autoreload.pattern option. For example, to monitor only ui.R:
-#'     \code{options(shiny.autoreload.pattern = glob2rx("ui.R"))}
+#'     \code{option(shiny.autoreload.pattern = glob2rx("ui.R"))}
 #'
 #'     The default polling interval is 500 milliseconds. You can change this
-#'     by setting e.g. \code{options(shiny.autoreload.interval = 2000)} (every
+#'     by setting e.g. \code{option(shiny.autoreload.interval = 2000)} (every
 #'     two seconds).}
 #'   \item{shiny.reactlog}{If \code{TRUE}, enable logging of reactive events,
 #'     which can be viewed later with the \code{\link{showReactLog}} function.
@@ -107,9 +104,6 @@ NULL
 #'     particular error \code{e} to get displayed to the user, then set this option
 #'     to \code{TRUE} and use \code{stop(safeError(e))} for errors you want the
 #'     user to see.}
-#'   \item{shiny.testmode}{If \code{TRUE}, then enable features for testing Shiny
-#'     applications. If \code{FALSE} (the default), do not enable those features.
-#'   }
 #' }
 #' @name shiny-options
 NULL
@@ -276,10 +270,6 @@ workerId <- local({
 #'   This is the request that was used to initiate the websocket connection
 #'   (as opposed to the request that downloaded the web page for the app).
 #' }
-#' \item{userData}{
-#'   An environment for app authors and module/package authors to store whatever
-#'   session-specific data they want.
-#' }
 #' \item{resetBrush(brushId)}{
 #'   Resets/clears the brush with the given \code{brushId}, if it exists on
 #'   any \code{imageOutput} or \code{plotOutput} in the app.
@@ -296,12 +286,6 @@ workerId <- local({
 #'   \code{addCustomMessageHandler} will be invoked each time
 #'   \code{sendCustomMessage} is called on the server.
 #' }
-#' \item{sendBinaryMessage(type, message)}{
-#'   Similar to \code{sendCustomMessage}, but the message must be a raw vector
-#'   and the registration method on the client is
-#'   \code{Shiny.addBinaryMessageHandler(type, function(message){...})}. The
-#'   message argument on the client will be a \href{https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DataView}{DataView}.
-#' }
 #' \item{sendInputMessage(inputId, message)}{
 #'   Sends a message to an input on the session's client web page; if the input
 #'   is present and bound on the page at the time the message is received, then
@@ -310,42 +294,6 @@ workerId <- local({
 #'   from Shiny apps, but through friendlier wrapper functions like
 #'   \code{\link{updateTextInput}}.
 #' }
-#' \item{setBookmarkExclude(names)}{
-#'   Set input names to be excluded from bookmarking.
-#' }
-#' \item{getBookmarkExclude()}{
-#'   Returns the set of input names to be excluded from bookmarking.
-#' }
-#' \item{onBookmark(fun)}{
-#'   Registers a function that will be called just before bookmarking state.
-#' }
-#' \item{onBookmarked(fun)}{
-#'   Registers a function that will be called just after bookmarking state.
-#' }
-#' \item{onRestore(fun)}{
-#'   Registers a function that will be called when a session is restored, before
-#'   all other reactives, observers, and render functions are run.
-#' }
-#' \item{onRestored(fun)}{
-#'   Registers a function that will be called when a session is restored, after
-#'   all other reactives, observers, and render functions are run.
-#' }
-#' \item{doBookmark()}{
-#'   Do bookmarking and invoke the onBookmark and onBookmarked callback functions.
-#' }
-#' \item{exportTestValues()}{
-#'   Registers expressions for export in test mode, available at the test
-#'   snapshot URL.
-#' }
-#' \item{getTestSnapshotUrl(input=TRUE, output=TRUE, export=TRUE,
-#'   format="json")}{
-#'   Returns a URL for the test snapshots. Only has an effect when the
-#'   \code{shiny.testmode} option is set to TRUE. For the input, output, and
-#'   export arguments, TRUE means to return all of these values. It is also
-#'   possible to specify by name which values to return by providing a
-#'   character vector, as in \code{input=c("x", "y")}. The format can be
-#'   "rds" or "json".
-#' }
 #'
 #' @name session
 NULL
@@ -416,11 +364,6 @@ ShinySession <- R6Class(
     restoredCallbacks = 'Callbacks',
     bookmarkExclude = character(0),  # Names of inputs to exclude from bookmarking
 
-    testMode = FALSE,                # Are we running in test mode?
-    testExportExprs = list(),
-    outputValues = list(),           # Saved output values (for testing mode)
-    testSnapshotUrl = character(0),
-
     sendResponse = function(requestMsg, value) {
       if (is.null(requestMsg$tag)) {
         warning("Tried to send response for untagged message; method: ",
@@ -442,8 +385,7 @@ ShinySession <- R6Class(
       if (self$closed){
         return()
       }
-      traceOption <- getOption('shiny.trace', FALSE)
-      if (isTRUE(traceOption) || traceOption == "send")
+      if (isTRUE(getOption('shiny.trace')))
         message('SEND ',
            gsub('(?m)base64,[a-zA-Z0-9+/=]+','[base64 data]',json,perl=TRUE))
       private$websocket$send(json)
@@ -499,23 +441,58 @@ ShinySession <- R6Class(
       if (store == "disable")
         return()
 
-      # Warn if trying to enable save-to-server bookmarking on a version of SS,
-      # SSP, or Connect that doesn't support it.
-      if (store == "server" && inShinyServer() &&
-          is.null(getShinyOption("save.interface")))
-      {
-        showNotification(
-          "This app tried to enable saved-to-server bookmarking, but it is not supported by the hosting environment.",
-          duration = NULL, type = "warning", session = self
-        )
-        return()
-      }
-
       withReactiveDomain(self, {
+        # To make code a little clearer
+        session <- self
+
         # This observer fires when the bookmark button is clicked.
-        observeEvent(self$input[["._bookmark_"]], {
-          self$doBookmark()
-        })
+        observeEvent(
+          label = "bookmark",
+          session$input[["._bookmark_"]],
+          {
+            tryCatch(
+              withLogErrors({
+                saveState <- ShinySaveState$new(
+                  input = session$input,
+                  exclude = session$getBookmarkExclude(),
+                  onSave = function(state) {
+                    private$bookmarkCallbacks$invoke(state)
+                  }
+                )
+
+                if (store == "server") {
+                  url <- saveShinySaveState(saveState)
+                } else if (store == "url") {
+                  url <- encodeShinySaveState(saveState)
+                } else {
+                  stop("Unknown store type: ", store)
+                }
+
+                clientData <- session$clientData
+                url <- paste0(
+                  clientData$url_protocol, "//",
+                  clientData$url_hostname,
+                  if (nzchar(clientData$url_port)) paste0(":", clientData$url_port),
+                  clientData$url_pathname,
+                  "?", url
+                )
+
+
+                # If onBookmarked callback was provided, invoke it; if not call
+                # the default.
+                if (private$bookmarkedCallbacks$count() > 0) {
+                  private$bookmarkedCallbacks$invoke(url)
+                } else {
+                  showBookmarkUrlModal(url)
+                }
+              }),
+              error = function(e) {
+                msg <- paste0("Error bookmarking state: ", e$message)
+                showNotification(msg, duration = NULL, type = "error")
+              }
+            )
+          }
+        )
 
         # If there was an error initializing the current restore context, show
         # notification in the client.
@@ -551,11 +528,11 @@ ShinySession <- R6Class(
               }
             )
           }
-        }, priority = 1000000)
+        }, priority = -1000000)
 
         # Run the onRestored function after the flush cycle completes and information
         # is sent to the client.
-        self$onFlushed(function() {
+        session$onFlushed(function() {
           if (private$restoredCallbacks$count() > 0) {
 
             tryCatch(
@@ -577,111 +554,6 @@ ShinySession <- R6Class(
         })
 
       }) # withReactiveDomain
-    },
-
-    # Save output values and errors. This is only used for testing mode.
-    storeOutputValues = function(values = NULL) {
-      private$outputValues <- mergeVectors(private$outputValues, values)
-    },
-
-    enableTestSnapshot = function() {
-      private$testSnapshotUrl <- self$registerDataObj("shinytest", NULL,
-        function(data, req) {
-          if (!isTRUE(private$testMode)) {
-            return()
-          }
-
-          params <- parseQueryString(req$QUERY_STRING)
-          # The format of the response that will be sent back. Defaults to
-          # "json" unless requested otherwise. The only other valid value is
-          # "rds".
-          format <- params$format %OR% "json"
-
-          values <- list()
-
-          if (!is.null(params$input)) {
-
-            allInputs <- isolate(
-              reactiveValuesToList(self$input, all.names = TRUE)
-            )
-
-            # If params$input is "1", return all; otherwise return just the
-            # inputs that are named in params$input, like "x,y,z".
-            if (params$input == "1") {
-              values$input <- allInputs
-            } else {
-              items <- strsplit(params$input, ",")[[1]]
-              items <- intersect(items, names(allInputs))
-              values$input <- allInputs[items]
-            }
-
-            values$input <- sortByName(values$input)
-          }
-
-          if (!is.null(params$output)) {
-
-            if (params$output == "1") {
-              values$output <- private$outputValues
-            } else {
-              items <- strsplit(params$output, ",")[[1]]
-              items <- intersect(items, names(private$outputValues))
-              values$output <- private$outputValues[items]
-            }
-
-            values$output <- sortByName(values$output)
-          }
-
-          if (!is.null(params$export)) {
-
-            if (params$export == "1") {
-              values$export <- isolate(
-                lapply(private$testExportExprs, function(item) {
-                  eval(item$expr, envir = item$env)
-                })
-              )
-            } else {
-              items <- strsplit(params$export, ",")[[1]]
-              items <- intersect(items, names(private$testExportExprs))
-              values$export <- isolate(
-                lapply(private$testExportExprs[items], function(item) {
-                  eval(item$expr, envir = item$env)
-                })
-              )
-            }
-
-            values$export <- sortByName(values$export)
-          }
-
-          # Make sure input, output, and export are all named lists (at this
-          # point, they could be unnamed if they are empty lists). This is so
-          # that the resulting object is represented as an object in JSON
-          # instead of an array, and so that the RDS data structure is of a
-          # consistent type.
-          values <- lapply(values, asNamedVector)
-
-          if (length(values) == 0) {
-            return(httpResponse(400, "text/plain",
-              "None of export, input, or output requested."
-            ))
-          }
-
-          if (identical(format, "json")) {
-            content <- toJSON(values, pretty = TRUE)
-            httpResponse(200, "application/json", content)
-
-          } else if (identical(format, "rds")) {
-            tmpfile <- tempfile("shinytest", fileext = ".rds")
-            saveRDS(values, tmpfile)
-            on.exit(unlink(tmpfile))
-
-            content <- readBin(tmpfile, "raw", n = file.info(tmpfile)$size)
-            httpResponse(200, "application/octet-stream", content)
-
-          } else {
-            httpResponse(400, "text/plain", paste("Invalid format requested:", format))
-          }
-        }
-      )
     }
   ),
   public = list(
@@ -696,7 +568,6 @@ ShinySession <- R6Class(
     closed = logical(0),
     request = 'ANY',      # Websocket request object
     singletons = character(0),  # Tracks singleton HTML fragments sent to the page
-    userData = 'environment',
     user = NULL,
     groups = NULL,
 
@@ -717,7 +588,6 @@ ShinySession <- R6Class(
       self$progressStack <- Stack$new()
       self$files <- Map$new()
       self$downloads <- Map$new()
-      self$userData <- new.env(parent = emptyenv())
 
       self$input <- .createReactiveValues(private$.input, readonly=TRUE)
       .setLabel(self$input, 'input')
@@ -736,9 +606,6 @@ ShinySession <- R6Class(
       private$restoredCallbacks <- Callbacks$new()
       private$createBookmarkObservers()
 
-      private$testMode <- .globals$testMode
-      private$enableTestSnapshot()
-
       private$registerSessionEndCallbacks()
 
       if (!is.null(websocket$request$HTTP_SHINY_SERVER_CREDENTIALS)) {
@@ -761,9 +628,6 @@ ShinySession <- R6Class(
         )
       )
     },
-    rootScope = function() {
-      self
-    },
     makeScope = function(namespace) {
       ns <- NS(namespace)
 
@@ -814,24 +678,6 @@ ShinySession <- R6Class(
             stop("`fun` must be a function that takes one argument")
           }
           restoredCallbacks$register(fun)
-        },
-        exportTestValues = function(..., quoted_ = FALSE, env_ = parent.frame()) {
-          if (quoted_) {
-            dots <- list(...)
-          } else {
-            dots <- eval(substitute(alist(...)))
-          }
-
-          if (anyUnnamed(dots))
-            stop("exportTestValues: all arguments must be named.")
-
-          names(dots) <- vapply(names(dots), ns, character(1))
-
-          do.call(
-            .subset2(self, "exportTestValues"),
-            c(dots, quoted_ = TRUE, env_ = env_),
-            quote = TRUE
-          )
         }
       )
 
@@ -1149,20 +995,16 @@ ShinySession <- R6Class(
       }
 
       private$progressKeys <- character(0)
-      values <- as.list(private$invalidatedOutputValues)
+      values <- private$invalidatedOutputValues
       private$invalidatedOutputValues <- Map$new()
-      errors <- as.list(private$invalidatedOutputErrors)
+      errors <- private$invalidatedOutputErrors
       private$invalidatedOutputErrors <- Map$new()
       inputMessages <- private$inputMessageQueue
       private$inputMessageQueue <- list()
 
-      if (isTRUE(private$testMode)) {
-        private$storeOutputValues(mergeVectors(values, errors))
-      }
-
       private$sendMessage(
-        errors = errors,
-        values = values,
+        errors = as.list(errors),
+        values = as.list(values),
         inputMessages = inputMessages
       )
     },
@@ -1215,13 +1057,6 @@ ShinySession <- R6Class(
         private$sendResponse(msg, value)
       }
     },
-    sendBinaryMessage = function(type, message) {
-      typeBytes <- charToRaw(type)
-      if (length(typeBytes) > 255) {
-        stop("'type' argument is too long")
-      }
-      private$write(c(as.raw(length(typeBytes)), typeBytes, message))
-    },
     sendCustomMessage = function(type, message) {
       data <- list()
       data[[type]] <- message
@@ -1286,100 +1121,10 @@ ShinySession <- R6Class(
       }
       private$restoredCallbacks$register(fun)
     },
-    doBookmark = function() {
-      # Get bookmarking store config
-      store <- getShinyOption("bookmarkStore", default = "disable")
-      if (store == "disable")
-        return()
-
-      tryCatch(
-        withLogErrors({
-          saveState <- ShinySaveState$new(
-            input = self$input,
-            exclude = self$getBookmarkExclude(),
-            onSave = function(state) {
-              private$bookmarkCallbacks$invoke(state)
-            }
-          )
-
-          if (store == "server") {
-            url <- saveShinySaveState(saveState)
-          } else if (store == "url") {
-            url <- encodeShinySaveState(saveState)
-          } else {
-            stop("Unknown store type: ", store)
-          }
-
-          clientData <- self$clientData
-          url <- paste0(
-            clientData$url_protocol, "//",
-            clientData$url_hostname,
-            if (nzchar(clientData$url_port)) paste0(":", clientData$url_port),
-            clientData$url_pathname,
-            "?", url
-          )
-
-
-          # If onBookmarked callback was provided, invoke it; if not call
-          # the default.
-          if (private$bookmarkedCallbacks$count() > 0) {
-            private$bookmarkedCallbacks$invoke(url)
-          } else {
-            showBookmarkUrlModal(url)
-          }
-        }),
-        error = function(e) {
-          msg <- paste0("Error bookmarking state: ", e$message)
-          showNotification(msg, duration = NULL, type = "error")
-        }
-      )
-    },
-
-    exportTestValues = function(..., quoted_ = FALSE, env_ = parent.frame()) {
-      # Get a named list of unevaluated expressions.
-      if (quoted_) {
-        dots <- list(...)
-      } else {
-        dots <- eval(substitute(alist(...)))
-      }
-
-      if (anyUnnamed(dots))
-        stop("exportTestValues: all arguments must be named.")
-
-      # Create a named list where each item is a list with an expression and
-      # environment in which to eval the expression.
-      items <- lapply(dots, function(expr) {
-        list(expr = expr, env = env_)
-      })
-
-      private$testExportExprs <- mergeVectors(private$testExportExprs, items)
-    },
-
-    getTestSnapshotUrl = function(input = TRUE, output = TRUE, export = TRUE,
-                                  format = "json") {
-      reqString <- function(group, value) {
-        if (isTRUE(value))
-          paste0(group, "=1")
-        else if (is.character(value))
-          paste0(group, "=", paste(value, collapse = ","))
-        else
-          ""
-      }
-      paste(
-        private$testSnapshotUrl,
-        reqString("input", input),
-        reqString("output", output),
-        reqString("export", export),
-        paste0("format=", format),
-        sep = "&"
-      )
-    },
 
     reactlog = function(logEntry) {
-      # Use sendCustomMessage instead of sendMessage, because the handler in
-      # shiny-showcase.js only has access to public API of the Shiny object.
       if (private$showcase)
-        self$sendCustomMessage("reactlog", logEntry)
+        private$sendMessage(reactlog = logEntry)
     },
     reload = function() {
       private$sendMessage(reload = TRUE)
@@ -1552,10 +1297,6 @@ ShinySession <- R6Class(
           unlink(tmpdata)
           stop(attr(result, "condition", exact = TRUE))
         }
-        if (!file.exists(tmpdata)) {
-          # If no file was created, return a 404
-          return(httpResponse(404, content = "404 Not found"))
-        }
         return(httpResponse(
           200,
           download$contentType %OR% getContentType(filename),

R/shinyui.R

@@ -24,7 +24,7 @@ withMathJax <- function(...) {
   )
 }
 
-renderPage <- function(ui, connection, showcase=0, testMode=FALSE) {
+renderPage <- function(ui, connection, showcase=0) {
   # If the ui is a NOT complete document (created by htmlTemplate()), then do some
   # preprocessing and make sure it's a complete document.
   if (!inherits(ui, "html_document")) {
@@ -50,14 +50,6 @@ renderPage <- function(ui, connection, showcase=0, testMode=FALSE) {
       script = if (getOption("shiny.minified", TRUE)) "shiny.min.js" else "shiny.js",
       stylesheet = "shiny.css")
   )
-
-  if (testMode) {
-    # Add code injection listener if in test mode
-    shiny_deps[[length(shiny_deps) + 1]] <-
-      htmlDependency("shiny-testmode", utils::packageVersion("shiny"),
-        c(href="shared"), script = "shiny-testmode.js")
-  }
-
   html <- renderDocument(ui, shiny_deps, processDep = createWebDependency)
   writeUTF8(html, con = connection)
 }
@@ -99,8 +91,6 @@ uiHttpHandler <- function(ui, uiPattern = "^/$") {
         showcaseMode <- mode
     }
 
-    testMode <- .globals$testMode %OR% FALSE
-
     # Create a restore context using query string
     bookmarkStore <- getShinyOption("bookmarkStore", default = "disable")
     if (bookmarkStore == "disable") {
@@ -131,7 +121,7 @@ uiHttpHandler <- function(ui, uiPattern = "^/$") {
     if (is.null(uiValue))
       return(NULL)
 
-    renderPage(uiValue, textConn, showcaseMode, testMode)
+    renderPage(uiValue, textConn, showcaseMode)
     html <- paste(readLines(textConn, encoding = 'UTF-8'), collapse='\n')
     return(httpResponse(200, content=enc2utf8(html)))
   }

R/shinywrappers.R

@@ -220,7 +220,7 @@ renderImage <- function(expr, env=parent.frame(), quoted=FALSE,
 #'
 #' Makes a reactive version of the given function that captures any printed
 #' output, and also captures its printable result (unless
-#' \code{\link[base]{invisible}}), into a string. The resulting function is suitable
+#' \code{\link{invisible}}), into a string. The resulting function is suitable
 #' for assigning to an  \code{output} slot.
 #'
 #' The corresponding HTML output tag can be anything (though \code{pre} is
@@ -232,14 +232,14 @@ renderImage <- function(expr, env=parent.frame(), quoted=FALSE,
 #'
 #' Note that unlike most other Shiny output functions, if the given function
 #' returns \code{NULL} then \code{NULL} will actually be visible in the output.
-#' To display nothing, make your function return \code{\link[base]{invisible}()}.
+#' To display nothing, make your function return \code{\link{invisible}()}.
 #'
 #' @param expr An expression that may print output and/or return a printable R
 #'   object.
 #' @param env The environment in which to evaluate \code{expr}.
 #' @param quoted Is \code{expr} a quoted expression (with \code{quote()})? This
 #'   is useful if you want to save an expression in a variable.
-#' @param width The value for \code{\link[base]{options}('width')}.
+#' @param width The value for \code{\link{options}('width')}.
 #' @param outputArgs A list of arguments to be passed through to the implicit
 #'   call to \code{\link{verbatimTextOutput}} when \code{renderPrint} is used
 #'   in an interactive R Markdown document.
@@ -420,7 +420,7 @@ downloadHandler <- function(filename, content, contentType=NA, outputArgs=list()
 #' the server infrastructure.
 #'
 #' For the \code{options} argument, the character elements that have the class
-#' \code{"AsIs"} (usually returned from \code{\link[base]{I}()}) will be evaluated in
+#' \code{"AsIs"} (usually returned from \code{\link{I}()}) will be evaluated in
 #' JavaScript. This is useful when the type of the option value is not supported
 #' in JSON, e.g., a JavaScript function, which can be obtained by evaluating a
 #' character string. Note this only applies to the root-level elements of the

R/showcase.R

@@ -31,7 +31,7 @@ licenseLink <- function(licenseName) {
 showcaseHead <- function() {
 
   deps  <- list(
-    htmlDependency("jqueryui", "1.12.1", c(href="shared/jqueryui"),
+    htmlDependency("jqueryui", "1.11.4", c(href="shared/jqueryui"),
       script = "jquery-ui.min.js"),
     htmlDependency("showdown", "0.3.1", c(href="shared/showdown/compressed"),
       script = "showdown.js"),

R/test-export.R

@@ -1,61 +0,0 @@
-#' Register expressions for export in test mode
-#'
-#' This function registers expressions that will be evaluated when a test export
-#' event occurs. These events are triggered by accessing a snapshot URL.
-#'
-#' This function only has an effect if the app is launched in test mode. This is
-#' done by calling \code{runApp()} with \code{test.mode=TRUE}, or by setting the
-#' global option \code{shiny.testmode} to \code{TRUE}.
-#'
-#' @param quoted_ Are the expression quoted? Default is \code{FALSE}.
-#' @param env_ The environment in which the expression should be evaluated.
-#' @param session_ A Shiny session object.
-#' @param ... Named arguments that are quoted or unquoted expressions that will
-#'   be captured and evaluated when snapshot URL is visited.
-#' @examples
-#' ## Only run this example in interactive R sessions
-#' if (interactive()) {
-#'
-#' options(shiny.testmode = TRUE)
-#'
-#' # This application shows the test snapshot URL; clicking on it will
-#' # fetch the input, output, and exported values in JSON format.
-#' shinyApp(
-#'   ui = basicPage(
-#'     h4("Snapshot URL: "),
-#'     uiOutput("url"),
-#'     h4("Current values:"),
-#'     verbatimTextOutput("values"),
-#'     actionButton("inc", "Increment x")
-#'   ),
-#'
-#'   server = function(input, output, session) {
-#'     vals <- reactiveValues(x = 1)
-#'     y <- reactive({ vals$x + 1 })
-#'
-#'     observeEvent(input$inc, {
-#'       vals$x <<- vals$x + 1
-#'     })
-#'
-#'     exportTestValues(
-#'       x = vals$x,
-#'       y = y()
-#'     )
-#'
-#'     output$url <- renderUI({
-#'       url <- session$getTestSnapshotUrl(format="json")
-#'       a(href = url, url)
-#'     })
-#'
-#'     output$values <- renderText({
-#'       paste0("vals$x: ", vals$x, "\ny: ", y())
-#'     })
-#'   }
-#' )
-#' }
-#' @export
-exportTestValues <- function(..., quoted_ = FALSE, env_ = parent.frame(),
-  session_ = getDefaultReactiveDomain())
-{
-  session_$exportTestValues(..., quoted_ = quoted_, env_ = env_)
-}

R/timer.R

@@ -22,11 +22,6 @@ TimerCallbacks <- R6Class(
       .times <<- data.frame()
     },
     schedule = function(millis, func) {
-      # If args could fail to evaluate, let's make them do that before
-      # we change any state
-      force(millis)
-      force(func)
-
       id <- .nextId
       .nextId <<- .nextId + 1L
 
@@ -61,7 +56,7 @@ TimerCallbacks <- R6Class(
     },
     executeElapsed = function() {
       elapsed <- takeElapsed()
-      if (nrow(elapsed) == 0)
+      if (length(elapsed) == 0)
         return(FALSE)
 
       for (id in elapsed$id) {

R/update-input.R

@@ -39,44 +39,6 @@ updateTextInput <- function(session, inputId, label = NULL, value = NULL) {
   session$sendInputMessage(inputId, message)
 }
 
-#' Change the value of a textarea input on the client
-#'
-#' @template update-input
-#' @param value The value to set for the input object.
-#'
-#' @seealso \code{\link{textAreaInput}}
-#'
-#' @examples
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#'
-#' ui <- fluidPage(
-#'   sliderInput("controller", "Controller", 0, 20, 10),
-#'   textAreaInput("inText", "Input textarea"),
-#'   textAreaInput("inText2", "Input textarea 2")
-#' )
-#'
-#' server <- function(input, output, session) {
-#'   observe({
-#'     # We'll use the input$controller variable multiple times, so save it as x
-#'     # for convenience.
-#'     x <- input$controller
-#'
-#'     # This will change the value of input$inText, based on x
-#'     updateTextAreaInput(session, "inText", value = paste("New text", x))
-#'
-#'     # Can also set the label, this time for input$inText2
-#'     updateTextAreaInput(session, "inText2",
-#'       label = paste("New label", x),
-#'       value = paste("New text", x))
-#'   })
-#' }
-#'
-#' shinyApp(ui, server)
-#' }
-#' @export
-updateTextAreaInput <- updateTextInput
-
 
 #' Change the value of a checkbox input on the client
 #'
@@ -166,7 +128,7 @@ updateActionButton <- function(session, inputId, label = NULL, icon = NULL) {
 #'
 #' @template update-input
 #' @param value The desired date value. Either a Date object, or a string in
-#'   \code{yyyy-mm-dd} format. Supply \code{NA} to clear the date.
+#'   \code{yyyy-mm-dd} format.
 #' @param min The minimum allowed date. Either a Date object, or a string in
 #'   \code{yyyy-mm-dd} format.
 #' @param max The maximum allowed date. Either a Date object, or a string in
@@ -179,18 +141,21 @@ updateActionButton <- function(session, inputId, label = NULL, icon = NULL) {
 #' if (interactive()) {
 #'
 #' ui <- fluidPage(
-#'   sliderInput("n", "Day of month", 1, 30, 10),
+#'   sliderInput("controller", "Controller", 1, 30, 10),
 #'   dateInput("inDate", "Input date")
 #' )
 #'
 #' server <- function(input, output, session) {
 #'   observe({
-#'     date <- as.Date(paste0("2013-04-", input$n))
+#'     # We'll use the input$controller variable multiple times, so save it as x
+#'     # for convenience.
+#'     x <- input$controller
+#'
 #'     updateDateInput(session, "inDate",
-#'       label = paste("Date label", input$n),
-#'       value = date,
-#'       min   = date - 3,
-#'       max   = date + 3
+#'       label = paste("Date label", x),
+#'       value = paste("2013-04-", x, sep=""),
+#'       min   = paste("2013-04-", x-1, sep=""),
+#'       max   = paste("2013-04-", x+1, sep="")
 #'     )
 #'   })
 #' }
@@ -201,18 +166,11 @@ updateActionButton <- function(session, inputId, label = NULL, icon = NULL) {
 updateDateInput <- function(session, inputId, label = NULL, value = NULL,
                             min = NULL, max = NULL) {
 
-  # Make sure values are NULL or Date objects. This is so we can ensure that
-  # they will be formatted correctly. For example, the string "2016-08-9" is not
-  # correctly formatted, but the conversion to Date and back to string will fix
-  # it.
-  formatDate <- function(x) {
-    if (is.null(x))
-      return(NULL)
-    format(as.Date(x), "%Y-%m-%d")
-  }
-  value <- formatDate(value)
-  min   <- formatDate(min)
-  max   <- formatDate(max)
+  # If value is a date object, convert it to a string with yyyy-mm-dd format
+  # Same for min and max
+  if (inherits(value, "Date"))  value <- format(value, "%Y-%m-%d")
+  if (inherits(min, "Date"))    min   <- format(min,   "%Y-%m-%d")
+  if (inherits(max, "Date"))    max   <- format(max,   "%Y-%m-%d")
 
   message <- dropNulls(list(label=label, value=value, min=min, max=max))
   session$sendInputMessage(inputId, message)
@@ -223,9 +181,9 @@ updateDateInput <- function(session, inputId, label = NULL, value = NULL,
 #'
 #' @template update-input
 #' @param start The start date. Either a Date object, or a string in
-#'   \code{yyyy-mm-dd} format. Supplying \code{NA} clears the start date.
+#'   \code{yyyy-mm-dd} format.
 #' @param end The end date. Either a Date object, or a string in
-#'   \code{yyyy-mm-dd} format. Supplying \code{NA} clears the end date.
+#'   \code{yyyy-mm-dd} format.
 #' @param min The minimum allowed date. Either a Date object, or a string in
 #'   \code{yyyy-mm-dd} format.
 #' @param max The maximum allowed date. Either a Date object, or a string in
@@ -238,20 +196,20 @@ updateDateInput <- function(session, inputId, label = NULL, value = NULL,
 #' if (interactive()) {
 #'
 #' ui <- fluidPage(
-#'   sliderInput("n", "Day of month", 1, 30, 10),
+#'   sliderInput("controller", "Controller", 1, 30, 10),
 #'   dateRangeInput("inDateRange", "Input date range")
 #' )
 #'
 #' server <- function(input, output, session) {
 #'   observe({
-#'     date <- as.Date(paste0("2013-04-", input$n))
+#'     # We'll use the input$controller variable multiple times, so save it as x
+#'     # for convenience.
+#'     x <- input$controller
 #'
 #'     updateDateRangeInput(session, "inDateRange",
-#'       label = paste("Date range label", input$n),
-#'       start = date - 1,
-#'       end = date + 1,
-#'       min = date - 5,
-#'       max = date + 5
+#'       label = paste("Date range label", x),
+#'       start = paste("2013-01-", x, sep=""),
+#'       end = paste("2013-12-", x, sep="")
 #'     )
 #'   })
 #' }
@@ -271,7 +229,7 @@ updateDateRangeInput <- function(session, inputId, label = NULL,
 
   message <- dropNulls(list(
     label = label,
-    value = dropNulls(list(start = start, end = end)),
+    value = c(start, end),
     min = min,
     max = max
   ))
@@ -599,12 +557,13 @@ updateRadioButtons <- function(session, inputId, label = NULL, choices = NULL,
 #' }
 #' @export
 updateSelectInput <- function(session, inputId, label = NULL, choices = NULL,
-                              selected = NULL) {
+                              selected = NULL, multiple = NULL) {
   choices <- if (!is.null(choices)) choicesWithNames(choices)
   if (!is.null(selected))
     selected <- validateSelected(selected, choices, inputId)
   options <- if (!is.null(choices)) selectOptions(choices, selected)
-  message <- dropNulls(list(label = label, options = options, value = selected))
+  message <- dropNulls(list(label = label, options = options,
+                            value = selected, multiple = multiple))
   session$sendInputMessage(inputId, message)
 }
 
@@ -616,20 +575,20 @@ updateSelectInput <- function(session, inputId, label = NULL, choices = NULL,
 #'   version of \pkg{selectize.js})
 #' @export
 updateSelectizeInput <- function(session, inputId, label = NULL, choices = NULL,
-                                 selected = NULL, options = list(),
-                                 server = FALSE) {
+                                 selected = NULL, multiple = NULL,
+                                 options = list(), server = FALSE) {
   if (length(options)) {
     res <- checkAsIs(options)
     cfg <- tags$script(
       type = 'application/json',
-      `data-for` = session$ns(inputId),
+      `data-for` = inputId,
       `data-eval` = if (length(res$eval)) HTML(toJSON(res$eval)),
       HTML(toJSON(res$options))
     )
     session$sendInputMessage(inputId, list(config = as.character(cfg)))
   }
   if (!server) {
-    return(updateSelectInput(session, inputId, label, choices, selected))
+    return(updateSelectInput(session, inputId, label, choices, selected, multiple))
   }
   value <- unname(selected)
   attr(choices, 'selected_value') <- value

R/utils.R

@@ -182,16 +182,6 @@ anyUnnamed <- function(x) {
   any(!nzchar(nms))
 }
 
-
-# Given a vector/list, returns a named vector (the labels will be blank).
-asNamedVector <- function(x) {
-  if (!is.null(names(x)))
-    return(x)
-
-  names(x) <- rep.int("", length(x))
-  x
-}
-
 # Given two named vectors, join them together, and keep only the last element
 # with a given name in the resulting vector. If b has any elements with the same
 # name as elements in a, the element in a is dropped. Also, if there are any
@@ -206,30 +196,6 @@ mergeVectors <- function(a, b) {
   x[!drop_idx]
 }
 
-# Sort a vector by the names of items. If there are multiple items with the
-# same name, preserve the original order of those items. For empty
-# vectors/lists/NULL, return the original value.
-sortByName <- function(x) {
-  if (anyUnnamed(x))
-    stop("All items must be named")
-
-  # Special case for empty vectors/lists, and NULL
-  if (length(x) == 0)
-    return(x)
-
-  x[order(names(x))]
-}
-
-# Wrapper around list2env with a NULL check. In R <3.2.0, if an empty unnamed
-# list is passed to list2env(), it errors. But an empty named list is OK. For
-# R >=3.2.0, this wrapper is not necessary.
-list2env2 <- function(x, ...) {
-  # Ensure that zero-length lists have a name attribute
-   if (length(x) == 0)
-    attr(x, "names") <- character(0)
-
-  list2env(x, ...)
-}
 
 # Combine dir and (file)name into a file path. If a file already exists with a
 # name differing only by case, then use it instead.
@@ -1126,16 +1092,15 @@ reactiveStop <- function(message = "", class = NULL) {
 #'   \code{shiny-output-error-} prepended to this value.
 #' @export
 #' @examples
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#'
-#' ui <- fluidPage(
+#' # in ui.R
+#' fluidPage(
 #'   checkboxGroupInput('in1', 'Check some letters', choices = head(LETTERS)),
 #'   selectizeInput('in2', 'Select a state', choices = state.name),
 #'   plotOutput('plot')
 #' )
 #'
-#' server <- function(input, output) {
+#' # in server.R
+#' function(input, output) {
 #'   output$plot <- renderPlot({
 #'     validate(
 #'       need(input$in1, 'Check at least one letter!'),
@@ -1144,10 +1109,6 @@ reactiveStop <- function(message = "", class = NULL) {
 #'     plot(1:10, main = paste(c(input$in1, input$in2), collapse = ', '))
 #'   })
 #' }
-#'
-#' shinyApp(ui, server)
-#'
-#' }
 validate <- function(..., errorClass = character(0)) {
   results <- sapply(list(...), function(x) {
     # Detect NULL or NA
@@ -1168,7 +1129,7 @@ validate <- function(..., errorClass = character(0)) {
   # There may be empty strings remaining; these are message-less failures that
   # started as FALSE
   results <- results[nzchar(results)]
-  reactiveStop(paste(results, collapse="\n"), c(errorClass, "validation"))
+  reactiveStop(paste(results, collapse="\n"), errorClass)
 }
 
 #' @param expr An expression to test. The condition will pass if the expression
@@ -1230,7 +1191,7 @@ need <- function(expr, message = paste(label, "must be provided"), label) {
 #' \strong{Truthy and falsy values}
 #'
 #' The terms "truthy" and "falsy" generally indicate whether a value, when
-#' coerced to a \code{\link[base]{logical}}, is \code{TRUE} or \code{FALSE}. We use
+#' coerced to a \code{\link{logical}}, is \code{TRUE} or \code{FALSE}. We use
 #' the term a little loosely here; our usage tries to match the intuitive
 #' notions of "Is this value missing or available?", or "Has the user provided
 #' an answer?", or in the case of action buttons, "Has the button been

README.md

@@ -59,10 +59,6 @@ devtools::install_version("shiny", version = "0.10.2.2")
 
 The Javascript code in Shiny is minified using tools that run on Node.js. See the tools/ directory for more information.
 
-## Guidelines for contributing
-
-We welcome contributions to the **shiny** package. Please see our [CONTRIBUTING.md](CONTRIBUTING.md) file for detailed guidelines of how to contribute.
-
 ## License
 
 The shiny package is licensed under the GPLv3. See these files in the inst directory for additional details:

appveyor.yml

@@ -10,9 +10,6 @@ init:
 install:
   ps: Bootstrap
 
-cache:
-  - C:\RLibrary
-
 # Adapt as necessary starting from here
 
 build_script:

inst/examples/01_hello/rsconnect/localhost/admin/01_hello.dcf

@@ -0,0 +1,6 @@
+name: 01_hello
+account: admin
+server: localhost
+bundleId: 1
+url: http://localhost:3939/admin/01_hello/
+when: 1436550957.65385

inst/examples/07_widgets/Readme.md

@@ -1 +1 @@
-This example demonstrates some additional widgets included in Shiny, such as `helpText` and `actionButton`. The latter is used to delay rendering output until the user explicitly requests it (a construct which also introduces two important server functions, `eventReactive` and `isolate`).
+This example demonstrates some additional widgets included in Shiny, such as `helpText` and `submitButton`. The latter is used to delay rendering output until the user explicitly requests it.

inst/examples/07_widgets/server.R

@@ -1,32 +1,26 @@
 library(shiny)
 library(datasets)
 
-# Define server logic required to summarize and view the
+# Define server logic required to summarize and view the 
 # selected dataset
 function(input, output) {
-
-  # Return the requested dataset. Note that we use `eventReactive()`
-  # here, which takes a dependency on input$update (the action
-  # button), so that the output is only updated when the user
-  # clicks the button.
-  datasetInput <- eventReactive(input$update, {
+  
+  # Return the requested dataset
+  datasetInput <- reactive({
     switch(input$dataset,
            "rock" = rock,
            "pressure" = pressure,
            "cars" = cars)
-  }, ignoreNULL = FALSE)
-
+  })
+  
   # Generate a summary of the dataset
   output$summary <- renderPrint({
     dataset <- datasetInput()
     summary(dataset)
   })
-
-  # Show the first "n" observations. The use of `isolate()` here
-  # is necessary because we don't want the table to update
-  # whenever input$obs changes (only when the user clicks the
-  # action button).
+  
+  # Show the first "n" observations
   output$view <- renderTable({
-    head(datasetInput(), n = isolate(input$obs))
+    head(datasetInput(), n = input$obs)
   })
 }

inst/examples/07_widgets/ui.R

@@ -2,32 +2,32 @@ library(shiny)
 
 # Define UI for dataset viewer application
 fluidPage(
-
+  
   # Application title.
   titlePanel("More Widgets"),
-
+  
   # Sidebar with controls to select a dataset and specify the
   # number of observations to view. The helpText function is
   # also used to include clarifying text. Most notably, the
-  # inclusion of an actionButton defers the rendering of output
+  # inclusion of a submitButton defers the rendering of output
   # until the user explicitly clicks the button (rather than
   # doing it immediately when inputs change). This is useful if
   # the computations required to render output are inordinately
   # time-consuming.
   sidebarLayout(
     sidebarPanel(
-      selectInput("dataset", "Choose a dataset:",
+      selectInput("dataset", "Choose a dataset:", 
                   choices = c("rock", "pressure", "cars")),
-
+      
       numericInput("obs", "Number of observations to view:", 10),
-
+      
       helpText("Note: while the data view will show only the specified",
                "number of observations, the summary will still be based",
                "on the full dataset."),
-
-      actionButton("update", "Update View")
+      
+      submitButton("Update View")
     ),
-
+    
     # Show a summary of the dataset and an HTML table with the
     # requested number of observations. Note the use of the h4
     # function to provide an additional header above each output
@@ -35,7 +35,7 @@ fluidPage(
     mainPanel(
       h4("Summary"),
       verbatimTextOutput("summary"),
-
+      
       h4("Observations"),
       tableOutput("view")
     )

inst/staticdocs/index.r

@@ -44,9 +44,7 @@ sd_section("UI Inputs",
     "sliderInput",
     "submitButton",
     "textInput",
-    "textAreaInput",
     "passwordInput",
-    "modalButton",
     "updateActionButton",
     "updateCheckboxGroupInput",
     "updateCheckboxInput",
@@ -57,9 +55,7 @@ sd_section("UI Inputs",
     "updateSelectInput",
     "updateSliderInput",
     "updateTabsetPanel",
-    "updateTextInput",
-    "updateTextAreaInput",
-    "updateQueryString"
+    "updateTextInput"
   )
 )
 sd_section("UI Outputs",
@@ -73,11 +69,7 @@ sd_section("UI Outputs",
     "verbatimTextOutput",
     "downloadButton",
     "Progress",
-    "withProgress",
-    "modalDialog",
-    "urlModal",
-    "showModal",
-    "showNotification"
+    "withProgress"
   )
 )
 sd_section("Interface builder functions",
@@ -92,9 +84,7 @@ sd_section("Interface builder functions",
     "withTags",
     "htmlTemplate",
     "bootstrapLib",
-    "suppressDependencies",
-    "insertUI",
-    "removeUI"
+    "suppressDependencies"
   )
 )
 sd_section("Rendering functions",
@@ -124,14 +114,12 @@ sd_section("Reactive constructs",
     "makeReactiveBinding",
     "observe",
     "observeEvent",
-    "getCurrentObserver",
     "reactive",
     "reactiveFileReader",
     "reactivePoll",
     "reactiveTimer",
     "reactiveValues",
     "reactiveValuesToList",
-    "freezeReactiveValue",
     "domains",
     "showReactLog"
   )
@@ -155,16 +143,6 @@ sd_section("Running",
     "viewer"
   )
 )
-sd_section("Bookmarking state",
-  "Functions that are used for bookmarking and restoring state.",
-  c(
-    "bookmarkButton",
-    "enableBookmarking",
-    "setBookmarkExclude",
-    "showBookmarkUrlModal",
-    "onBookmark"
-  )
-)
 sd_section("Extending Shiny",
   "Functions that are intended to be called by third-party packages that extend Shiny.",
   c(
@@ -179,18 +157,13 @@ sd_section("Utility functions",
   "Miscellaneous utilities that may be useful to advanced users or when extending Shiny.",
   c(
     "req",
+    "cancelOutput",
     "validate",
     "session",
-    "shinyOptions",
-    "safeError",
-    "onFlush",
-    "restoreInput",
-    "applyInputHandlers",
     "exprToFunction",
     "installExprFunction",
     "parseQueryString",
     "plotPNG",
-    "exportTestValues",
     "repeatable",
     "shinyDeprecated",
     "serverInfo",

inst/www/shared/datepicker/css/bootstrap-datepicker3.css

@@ -1,678 +0,0 @@
-/*!
- * Datepicker for Bootstrap v1.6.4 (https://github.com/eternicode/bootstrap-datepicker)
- *
- * Copyright 2012 Stefan Petre
- * Improvements by Andrew Rowls
- * Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
-.datepicker {
-  border-radius: 4px;
-  direction: ltr;
-}
-.datepicker-inline {
-  width: 220px;
-}
-.datepicker.datepicker-rtl {
-  direction: rtl;
-}
-.datepicker.datepicker-rtl table tr td span {
-  float: right;
-}
-.datepicker-dropdown {
-  top: 0;
-  left: 0;
-  padding: 4px;
-}
-.datepicker-dropdown:before {
-  content: '';
-  display: inline-block;
-  border-left: 7px solid transparent;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid rgba(0, 0, 0, 0.15);
-  border-top: 0;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  position: absolute;
-}
-.datepicker-dropdown:after {
-  content: '';
-  display: inline-block;
-  border-left: 6px solid transparent;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #fff;
-  border-top: 0;
-  position: absolute;
-}
-.datepicker-dropdown.datepicker-orient-left:before {
-  left: 6px;
-}
-.datepicker-dropdown.datepicker-orient-left:after {
-  left: 7px;
-}
-.datepicker-dropdown.datepicker-orient-right:before {
-  right: 6px;
-}
-.datepicker-dropdown.datepicker-orient-right:after {
-  right: 7px;
-}
-.datepicker-dropdown.datepicker-orient-bottom:before {
-  top: -7px;
-}
-.datepicker-dropdown.datepicker-orient-bottom:after {
-  top: -6px;
-}
-.datepicker-dropdown.datepicker-orient-top:before {
-  bottom: -7px;
-  border-bottom: 0;
-  border-top: 7px solid rgba(0, 0, 0, 0.15);
-}
-.datepicker-dropdown.datepicker-orient-top:after {
-  bottom: -6px;
-  border-bottom: 0;
-  border-top: 6px solid #fff;
-}
-.datepicker table {
-  margin: 0;
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.datepicker table tr td,
-.datepicker table tr th {
-  text-align: center;
-  width: 30px;
-  height: 30px;
-  border-radius: 4px;
-  border: none;
-}
-.table-striped .datepicker table tr td,
-.table-striped .datepicker table tr th {
-  background-color: transparent;
-}
-.datepicker table tr td.old,
-.datepicker table tr td.new {
-  color: #777777;
-}
-.datepicker table tr td.day:hover,
-.datepicker table tr td.focused {
-  background: #eeeeee;
-  cursor: pointer;
-}
-.datepicker table tr td.disabled,
-.datepicker table tr td.disabled:hover {
-  background: none;
-  color: #777777;
-  cursor: default;
-}
-.datepicker table tr td.highlighted {
-  color: #000;
-  background-color: #d9edf7;
-  border-color: #85c5e5;
-  border-radius: 0;
-}
-.datepicker table tr td.highlighted:focus,
-.datepicker table tr td.highlighted.focus {
-  color: #000;
-  background-color: #afd9ee;
-  border-color: #298fc2;
-}
-.datepicker table tr td.highlighted:hover {
-  color: #000;
-  background-color: #afd9ee;
-  border-color: #52addb;
-}
-.datepicker table tr td.highlighted:active,
-.datepicker table tr td.highlighted.active {
-  color: #000;
-  background-color: #afd9ee;
-  border-color: #52addb;
-}
-.datepicker table tr td.highlighted:active:hover,
-.datepicker table tr td.highlighted.active:hover,
-.datepicker table tr td.highlighted:active:focus,
-.datepicker table tr td.highlighted.active:focus,
-.datepicker table tr td.highlighted:active.focus,
-.datepicker table tr td.highlighted.active.focus {
-  color: #000;
-  background-color: #91cbe8;
-  border-color: #298fc2;
-}
-.datepicker table tr td.highlighted.disabled:hover,
-.datepicker table tr td.highlighted[disabled]:hover,
-fieldset[disabled] .datepicker table tr td.highlighted:hover,
-.datepicker table tr td.highlighted.disabled:focus,
-.datepicker table tr td.highlighted[disabled]:focus,
-fieldset[disabled] .datepicker table tr td.highlighted:focus,
-.datepicker table tr td.highlighted.disabled.focus,
-.datepicker table tr td.highlighted[disabled].focus,
-fieldset[disabled] .datepicker table tr td.highlighted.focus {
-  background-color: #d9edf7;
-  border-color: #85c5e5;
-}
-.datepicker table tr td.highlighted.focused {
-  background: #afd9ee;
-}
-.datepicker table tr td.highlighted.disabled,
-.datepicker table tr td.highlighted.disabled:active {
-  background: #d9edf7;
-  color: #777777;
-}
-.datepicker table tr td.today {
-  color: #000;
-  background-color: #ffdb99;
-  border-color: #ffb733;
-}
-.datepicker table tr td.today:focus,
-.datepicker table tr td.today.focus {
-  color: #000;
-  background-color: #ffc966;
-  border-color: #b37400;
-}
-.datepicker table tr td.today:hover {
-  color: #000;
-  background-color: #ffc966;
-  border-color: #f59e00;
-}
-.datepicker table tr td.today:active,
-.datepicker table tr td.today.active {
-  color: #000;
-  background-color: #ffc966;
-  border-color: #f59e00;
-}
-.datepicker table tr td.today:active:hover,
-.datepicker table tr td.today.active:hover,
-.datepicker table tr td.today:active:focus,
-.datepicker table tr td.today.active:focus,
-.datepicker table tr td.today:active.focus,
-.datepicker table tr td.today.active.focus {
-  color: #000;
-  background-color: #ffbc42;
-  border-color: #b37400;
-}
-.datepicker table tr td.today.disabled:hover,
-.datepicker table tr td.today[disabled]:hover,
-fieldset[disabled] .datepicker table tr td.today:hover,
-.datepicker table tr td.today.disabled:focus,
-.datepicker table tr td.today[disabled]:focus,
-fieldset[disabled] .datepicker table tr td.today:focus,
-.datepicker table tr td.today.disabled.focus,
-.datepicker table tr td.today[disabled].focus,
-fieldset[disabled] .datepicker table tr td.today.focus {
-  background-color: #ffdb99;
-  border-color: #ffb733;
-}
-.datepicker table tr td.today.focused {
-  background: #ffc966;
-}
-.datepicker table tr td.today.disabled,
-.datepicker table tr td.today.disabled:active {
-  background: #ffdb99;
-  color: #777777;
-}
-.datepicker table tr td.range {
-  color: #000;
-  background-color: #eeeeee;
-  border-color: #bbbbbb;
-  border-radius: 0;
-}
-.datepicker table tr td.range:focus,
-.datepicker table tr td.range.focus {
-  color: #000;
-  background-color: #d5d5d5;
-  border-color: #7c7c7c;
-}
-.datepicker table tr td.range:hover {
-  color: #000;
-  background-color: #d5d5d5;
-  border-color: #9d9d9d;
-}
-.datepicker table tr td.range:active,
-.datepicker table tr td.range.active {
-  color: #000;
-  background-color: #d5d5d5;
-  border-color: #9d9d9d;
-}
-.datepicker table tr td.range:active:hover,
-.datepicker table tr td.range.active:hover,
-.datepicker table tr td.range:active:focus,
-.datepicker table tr td.range.active:focus,
-.datepicker table tr td.range:active.focus,
-.datepicker table tr td.range.active.focus {
-  color: #000;
-  background-color: #c3c3c3;
-  border-color: #7c7c7c;
-}
-.datepicker table tr td.range.disabled:hover,
-.datepicker table tr td.range[disabled]:hover,
-fieldset[disabled] .datepicker table tr td.range:hover,
-.datepicker table tr td.range.disabled:focus,
-.datepicker table tr td.range[disabled]:focus,
-fieldset[disabled] .datepicker table tr td.range:focus,
-.datepicker table tr td.range.disabled.focus,
-.datepicker table tr td.range[disabled].focus,
-fieldset[disabled] .datepicker table tr td.range.focus {
-  background-color: #eeeeee;
-  border-color: #bbbbbb;
-}
-.datepicker table tr td.range.focused {
-  background: #d5d5d5;
-}
-.datepicker table tr td.range.disabled,
-.datepicker table tr td.range.disabled:active {
-  background: #eeeeee;
-  color: #777777;
-}
-.datepicker table tr td.range.highlighted {
-  color: #000;
-  background-color: #e4eef3;
-  border-color: #9dc1d3;
-}
-.datepicker table tr td.range.highlighted:focus,
-.datepicker table tr td.range.highlighted.focus {
-  color: #000;
-  background-color: #c1d7e3;
-  border-color: #4b88a6;
-}
-.datepicker table tr td.range.highlighted:hover {
-  color: #000;
-  background-color: #c1d7e3;
-  border-color: #73a6c0;
-}
-.datepicker table tr td.range.highlighted:active,
-.datepicker table tr td.range.highlighted.active {
-  color: #000;
-  background-color: #c1d7e3;
-  border-color: #73a6c0;
-}
-.datepicker table tr td.range.highlighted:active:hover,
-.datepicker table tr td.range.highlighted.active:hover,
-.datepicker table tr td.range.highlighted:active:focus,
-.datepicker table tr td.range.highlighted.active:focus,
-.datepicker table tr td.range.highlighted:active.focus,
-.datepicker table tr td.range.highlighted.active.focus {
-  color: #000;
-  background-color: #a8c8d8;
-  border-color: #4b88a6;
-}
-.datepicker table tr td.range.highlighted.disabled:hover,
-.datepicker table tr td.range.highlighted[disabled]:hover,
-fieldset[disabled] .datepicker table tr td.range.highlighted:hover,
-.datepicker table tr td.range.highlighted.disabled:focus,
-.datepicker table tr td.range.highlighted[disabled]:focus,
-fieldset[disabled] .datepicker table tr td.range.highlighted:focus,
-.datepicker table tr td.range.highlighted.disabled.focus,
-.datepicker table tr td.range.highlighted[disabled].focus,
-fieldset[disabled] .datepicker table tr td.range.highlighted.focus {
-  background-color: #e4eef3;
-  border-color: #9dc1d3;
-}
-.datepicker table tr td.range.highlighted.focused {
-  background: #c1d7e3;
-}
-.datepicker table tr td.range.highlighted.disabled,
-.datepicker table tr td.range.highlighted.disabled:active {
-  background: #e4eef3;
-  color: #777777;
-}
-.datepicker table tr td.range.today {
-  color: #000;
-  background-color: #f7ca77;
-  border-color: #f1a417;
-}
-.datepicker table tr td.range.today:focus,
-.datepicker table tr td.range.today.focus {
-  color: #000;
-  background-color: #f4b747;
-  border-color: #815608;
-}
-.datepicker table tr td.range.today:hover {
-  color: #000;
-  background-color: #f4b747;
-  border-color: #bf800c;
-}
-.datepicker table tr td.range.today:active,
-.datepicker table tr td.range.today.active {
-  color: #000;
-  background-color: #f4b747;
-  border-color: #bf800c;
-}
-.datepicker table tr td.range.today:active:hover,
-.datepicker table tr td.range.today.active:hover,
-.datepicker table tr td.range.today:active:focus,
-.datepicker table tr td.range.today.active:focus,
-.datepicker table tr td.range.today:active.focus,
-.datepicker table tr td.range.today.active.focus {
-  color: #000;
-  background-color: #f2aa25;
-  border-color: #815608;
-}
-.datepicker table tr td.range.today.disabled:hover,
-.datepicker table tr td.range.today[disabled]:hover,
-fieldset[disabled] .datepicker table tr td.range.today:hover,
-.datepicker table tr td.range.today.disabled:focus,
-.datepicker table tr td.range.today[disabled]:focus,
-fieldset[disabled] .datepicker table tr td.range.today:focus,
-.datepicker table tr td.range.today.disabled.focus,
-.datepicker table tr td.range.today[disabled].focus,
-fieldset[disabled] .datepicker table tr td.range.today.focus {
-  background-color: #f7ca77;
-  border-color: #f1a417;
-}
-.datepicker table tr td.range.today.disabled,
-.datepicker table tr td.range.today.disabled:active {
-  background: #f7ca77;
-  color: #777777;
-}
-.datepicker table tr td.selected,
-.datepicker table tr td.selected.highlighted {
-  color: #fff;
-  background-color: #777777;
-  border-color: #555555;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.datepicker table tr td.selected:focus,
-.datepicker table tr td.selected.highlighted:focus,
-.datepicker table tr td.selected.focus,
-.datepicker table tr td.selected.highlighted.focus {
-  color: #fff;
-  background-color: #5e5e5e;
-  border-color: #161616;
-}
-.datepicker table tr td.selected:hover,
-.datepicker table tr td.selected.highlighted:hover {
-  color: #fff;
-  background-color: #5e5e5e;
-  border-color: #373737;
-}
-.datepicker table tr td.selected:active,
-.datepicker table tr td.selected.highlighted:active,
-.datepicker table tr td.selected.active,
-.datepicker table tr td.selected.highlighted.active {
-  color: #fff;
-  background-color: #5e5e5e;
-  border-color: #373737;
-}
-.datepicker table tr td.selected:active:hover,
-.datepicker table tr td.selected.highlighted:active:hover,
-.datepicker table tr td.selected.active:hover,
-.datepicker table tr td.selected.highlighted.active:hover,
-.datepicker table tr td.selected:active:focus,
-.datepicker table tr td.selected.highlighted:active:focus,
-.datepicker table tr td.selected.active:focus,
-.datepicker table tr td.selected.highlighted.active:focus,
-.datepicker table tr td.selected:active.focus,
-.datepicker table tr td.selected.highlighted:active.focus,
-.datepicker table tr td.selected.active.focus,
-.datepicker table tr td.selected.highlighted.active.focus {
-  color: #fff;
-  background-color: #4c4c4c;
-  border-color: #161616;
-}
-.datepicker table tr td.selected.disabled:hover,
-.datepicker table tr td.selected.highlighted.disabled:hover,
-.datepicker table tr td.selected[disabled]:hover,
-.datepicker table tr td.selected.highlighted[disabled]:hover,
-fieldset[disabled] .datepicker table tr td.selected:hover,
-fieldset[disabled] .datepicker table tr td.selected.highlighted:hover,
-.datepicker table tr td.selected.disabled:focus,
-.datepicker table tr td.selected.highlighted.disabled:focus,
-.datepicker table tr td.selected[disabled]:focus,
-.datepicker table tr td.selected.highlighted[disabled]:focus,
-fieldset[disabled] .datepicker table tr td.selected:focus,
-fieldset[disabled] .datepicker table tr td.selected.highlighted:focus,
-.datepicker table tr td.selected.disabled.focus,
-.datepicker table tr td.selected.highlighted.disabled.focus,
-.datepicker table tr td.selected[disabled].focus,
-.datepicker table tr td.selected.highlighted[disabled].focus,
-fieldset[disabled] .datepicker table tr td.selected.focus,
-fieldset[disabled] .datepicker table tr td.selected.highlighted.focus {
-  background-color: #777777;
-  border-color: #555555;
-}
-.datepicker table tr td.active,
-.datepicker table tr td.active.highlighted {
-  color: #fff;
-  background-color: #337ab7;
-  border-color: #2e6da4;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.datepicker table tr td.active:focus,
-.datepicker table tr td.active.highlighted:focus,
-.datepicker table tr td.active.focus,
-.datepicker table tr td.active.highlighted.focus {
-  color: #fff;
-  background-color: #286090;
-  border-color: #122b40;
-}
-.datepicker table tr td.active:hover,
-.datepicker table tr td.active.highlighted:hover {
-  color: #fff;
-  background-color: #286090;
-  border-color: #204d74;
-}
-.datepicker table tr td.active:active,
-.datepicker table tr td.active.highlighted:active,
-.datepicker table tr td.active.active,
-.datepicker table tr td.active.highlighted.active {
-  color: #fff;
-  background-color: #286090;
-  border-color: #204d74;
-}
-.datepicker table tr td.active:active:hover,
-.datepicker table tr td.active.highlighted:active:hover,
-.datepicker table tr td.active.active:hover,
-.datepicker table tr td.active.highlighted.active:hover,
-.datepicker table tr td.active:active:focus,
-.datepicker table tr td.active.highlighted:active:focus,
-.datepicker table tr td.active.active:focus,
-.datepicker table tr td.active.highlighted.active:focus,
-.datepicker table tr td.active:active.focus,
-.datepicker table tr td.active.highlighted:active.focus,
-.datepicker table tr td.active.active.focus,
-.datepicker table tr td.active.highlighted.active.focus {
-  color: #fff;
-  background-color: #204d74;
-  border-color: #122b40;
-}
-.datepicker table tr td.active.disabled:hover,
-.datepicker table tr td.active.highlighted.disabled:hover,
-.datepicker table tr td.active[disabled]:hover,
-.datepicker table tr td.active.highlighted[disabled]:hover,
-fieldset[disabled] .datepicker table tr td.active:hover,
-fieldset[disabled] .datepicker table tr td.active.highlighted:hover,
-.datepicker table tr td.active.disabled:focus,
-.datepicker table tr td.active.highlighted.disabled:focus,
-.datepicker table tr td.active[disabled]:focus,
-.datepicker table tr td.active.highlighted[disabled]:focus,
-fieldset[disabled] .datepicker table tr td.active:focus,
-fieldset[disabled] .datepicker table tr td.active.highlighted:focus,
-.datepicker table tr td.active.disabled.focus,
-.datepicker table tr td.active.highlighted.disabled.focus,
-.datepicker table tr td.active[disabled].focus,
-.datepicker table tr td.active.highlighted[disabled].focus,
-fieldset[disabled] .datepicker table tr td.active.focus,
-fieldset[disabled] .datepicker table tr td.active.highlighted.focus {
-  background-color: #337ab7;
-  border-color: #2e6da4;
-}
-.datepicker table tr td span {
-  display: block;
-  width: 23%;
-  height: 54px;
-  line-height: 54px;
-  float: left;
-  margin: 1%;
-  cursor: pointer;
-  border-radius: 4px;
-}
-.datepicker table tr td span:hover,
-.datepicker table tr td span.focused {
-  background: #eeeeee;
-}
-.datepicker table tr td span.disabled,
-.datepicker table tr td span.disabled:hover {
-  background: none;
-  color: #777777;
-  cursor: default;
-}
-.datepicker table tr td span.active,
-.datepicker table tr td span.active:hover,
-.datepicker table tr td span.active.disabled,
-.datepicker table tr td span.active.disabled:hover {
-  color: #fff;
-  background-color: #337ab7;
-  border-color: #2e6da4;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.datepicker table tr td span.active:focus,
-.datepicker table tr td span.active:hover:focus,
-.datepicker table tr td span.active.disabled:focus,
-.datepicker table tr td span.active.disabled:hover:focus,
-.datepicker table tr td span.active.focus,
-.datepicker table tr td span.active:hover.focus,
-.datepicker table tr td span.active.disabled.focus,
-.datepicker table tr td span.active.disabled:hover.focus {
-  color: #fff;
-  background-color: #286090;
-  border-color: #122b40;
-}
-.datepicker table tr td span.active:hover,
-.datepicker table tr td span.active:hover:hover,
-.datepicker table tr td span.active.disabled:hover,
-.datepicker table tr td span.active.disabled:hover:hover {
-  color: #fff;
-  background-color: #286090;
-  border-color: #204d74;
-}
-.datepicker table tr td span.active:active,
-.datepicker table tr td span.active:hover:active,
-.datepicker table tr td span.active.disabled:active,
-.datepicker table tr td span.active.disabled:hover:active,
-.datepicker table tr td span.active.active,
-.datepicker table tr td span.active:hover.active,
-.datepicker table tr td span.active.disabled.active,
-.datepicker table tr td span.active.disabled:hover.active {
-  color: #fff;
-  background-color: #286090;
-  border-color: #204d74;
-}
-.datepicker table tr td span.active:active:hover,
-.datepicker table tr td span.active:hover:active:hover,
-.datepicker table tr td span.active.disabled:active:hover,
-.datepicker table tr td span.active.disabled:hover:active:hover,
-.datepicker table tr td span.active.active:hover,
-.datepicker table tr td span.active:hover.active:hover,
-.datepicker table tr td span.active.disabled.active:hover,
-.datepicker table tr td span.active.disabled:hover.active:hover,
-.datepicker table tr td span.active:active:focus,
-.datepicker table tr td span.active:hover:active:focus,
-.datepicker table tr td span.active.disabled:active:focus,
-.datepicker table tr td span.active.disabled:hover:active:focus,
-.datepicker table tr td span.active.active:focus,
-.datepicker table tr td span.active:hover.active:focus,
-.datepicker table tr td span.active.disabled.active:focus,
-.datepicker table tr td span.active.disabled:hover.active:focus,
-.datepicker table tr td span.active:active.focus,
-.datepicker table tr td span.active:hover:active.focus,
-.datepicker table tr td span.active.disabled:active.focus,
-.datepicker table tr td span.active.disabled:hover:active.focus,
-.datepicker table tr td span.active.active.focus,
-.datepicker table tr td span.active:hover.active.focus,
-.datepicker table tr td span.active.disabled.active.focus,
-.datepicker table tr td span.active.disabled:hover.active.focus {
-  color: #fff;
-  background-color: #204d74;
-  border-color: #122b40;
-}
-.datepicker table tr td span.active.disabled:hover,
-.datepicker table tr td span.active:hover.disabled:hover,
-.datepicker table tr td span.active.disabled.disabled:hover,
-.datepicker table tr td span.active.disabled:hover.disabled:hover,
-.datepicker table tr td span.active[disabled]:hover,
-.datepicker table tr td span.active:hover[disabled]:hover,
-.datepicker table tr td span.active.disabled[disabled]:hover,
-.datepicker table tr td span.active.disabled:hover[disabled]:hover,
-fieldset[disabled] .datepicker table tr td span.active:hover,
-fieldset[disabled] .datepicker table tr td span.active:hover:hover,
-fieldset[disabled] .datepicker table tr td span.active.disabled:hover,
-fieldset[disabled] .datepicker table tr td span.active.disabled:hover:hover,
-.datepicker table tr td span.active.disabled:focus,
-.datepicker table tr td span.active:hover.disabled:focus,
-.datepicker table tr td span.active.disabled.disabled:focus,
-.datepicker table tr td span.active.disabled:hover.disabled:focus,
-.datepicker table tr td span.active[disabled]:focus,
-.datepicker table tr td span.active:hover[disabled]:focus,
-.datepicker table tr td span.active.disabled[disabled]:focus,
-.datepicker table tr td span.active.disabled:hover[disabled]:focus,
-fieldset[disabled] .datepicker table tr td span.active:focus,
-fieldset[disabled] .datepicker table tr td span.active:hover:focus,
-fieldset[disabled] .datepicker table tr td span.active.disabled:focus,
-fieldset[disabled] .datepicker table tr td span.active.disabled:hover:focus,
-.datepicker table tr td span.active.disabled.focus,
-.datepicker table tr td span.active:hover.disabled.focus,
-.datepicker table tr td span.active.disabled.disabled.focus,
-.datepicker table tr td span.active.disabled:hover.disabled.focus,
-.datepicker table tr td span.active[disabled].focus,
-.datepicker table tr td span.active:hover[disabled].focus,
-.datepicker table tr td span.active.disabled[disabled].focus,
-.datepicker table tr td span.active.disabled:hover[disabled].focus,
-fieldset[disabled] .datepicker table tr td span.active.focus,
-fieldset[disabled] .datepicker table tr td span.active:hover.focus,
-fieldset[disabled] .datepicker table tr td span.active.disabled.focus,
-fieldset[disabled] .datepicker table tr td span.active.disabled:hover.focus {
-  background-color: #337ab7;
-  border-color: #2e6da4;
-}
-.datepicker table tr td span.old,
-.datepicker table tr td span.new {
-  color: #777777;
-}
-.datepicker .datepicker-switch {
-  width: 145px;
-}
-.datepicker .datepicker-switch,
-.datepicker .prev,
-.datepicker .next,
-.datepicker tfoot tr th {
-  cursor: pointer;
-}
-.datepicker .datepicker-switch:hover,
-.datepicker .prev:hover,
-.datepicker .next:hover,
-.datepicker tfoot tr th:hover {
-  background: #eeeeee;
-}
-.datepicker .cw {
-  font-size: 10px;
-  width: 12px;
-  padding: 0 2px 0 5px;
-  vertical-align: middle;
-}
-.input-group.date .input-group-addon {
-  cursor: pointer;
-}
-.input-daterange {
-  width: 100%;
-}
-.input-daterange input {
-  text-align: center;
-}
-.input-daterange input:first-child {
-  border-radius: 3px 0 0 3px;
-}
-.input-daterange input:last-child {
-  border-radius: 0 3px 3px 0;
-}
-.input-daterange .input-group-addon {
-  width: auto;
-  min-width: 16px;
-  padding: 4px 5px;
-  line-height: 1.42857143;
-  text-shadow: 0 1px 0 #fff;
-  border-width: 1px 0;
-  margin-left: -5px;
-  margin-right: -5px;
-}
-/*# sourceMappingURL=bootstrap-datepicker3.css.map */

inst/www/shared/datepicker/css/datepicker.css

@@ -0,0 +1,442 @@
+/*!
+ * Datepicker for Bootstrap
+ *
+ * Copyright 2012 Stefan Petre
+ * Improvements by Andrew Rowls
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ */
+.datepicker {
+  padding: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  direction: ltr;
+  /*.dow {
+		border-top: 1px solid #ddd !important;
+	}*/
+
+}
+.datepicker-inline {
+  width: 220px;
+}
+.datepicker.datepicker-rtl {
+  direction: rtl;
+}
+.datepicker.datepicker-rtl table tr td span {
+  float: right;
+}
+.datepicker-dropdown {
+  top: 0;
+  left: 0;
+}
+.datepicker-dropdown:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  top: -7px;
+  left: 6px;
+}
+.datepicker-dropdown:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  position: absolute;
+  top: -6px;
+  left: 7px;
+}
+.datepicker > div {
+  display: none;
+}
+.datepicker.days div.datepicker-days {
+  display: block;
+}
+.datepicker.months div.datepicker-months {
+  display: block;
+}
+.datepicker.years div.datepicker-years {
+  display: block;
+}
+.datepicker table {
+  margin: 0;
+}
+.datepicker td,
+.datepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  border: none;
+}
+.table-striped .datepicker table tr td,
+.table-striped .datepicker table tr th {
+  background-color: transparent;
+}
+.datepicker table tr td.day:hover {
+  background: #eeeeee;
+  cursor: pointer;
+}
+.datepicker table tr td.old,
+.datepicker table tr td.new {
+  color: #999999;
+}
+.datepicker table tr td.disabled,
+.datepicker table tr td.disabled:hover {
+  background: none;
+  color: #999999;
+  cursor: default;
+}
+.datepicker table tr td.today,
+.datepicker table tr td.today:hover,
+.datepicker table tr td.today.disabled,
+.datepicker table tr td.today.disabled:hover {
+  background-color: #fde19a;
+  background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a);
+  background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a));
+  background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a);
+  background-image: -o-linear-gradient(top, #fdd49a, #fdf59a);
+  background-image: linear-gradient(top, #fdd49a, #fdf59a);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);
+  border-color: #fdf59a #fdf59a #fbed50;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #000 !important;
+}
+.datepicker table tr td.today:hover,
+.datepicker table tr td.today:hover:hover,
+.datepicker table tr td.today.disabled:hover,
+.datepicker table tr td.today.disabled:hover:hover,
+.datepicker table tr td.today:active,
+.datepicker table tr td.today:hover:active,
+.datepicker table tr td.today.disabled:active,
+.datepicker table tr td.today.disabled:hover:active,
+.datepicker table tr td.today.active,
+.datepicker table tr td.today:hover.active,
+.datepicker table tr td.today.disabled.active,
+.datepicker table tr td.today.disabled:hover.active,
+.datepicker table tr td.today.disabled,
+.datepicker table tr td.today:hover.disabled,
+.datepicker table tr td.today.disabled.disabled,
+.datepicker table tr td.today.disabled:hover.disabled,
+.datepicker table tr td.today[disabled],
+.datepicker table tr td.today:hover[disabled],
+.datepicker table tr td.today.disabled[disabled],
+.datepicker table tr td.today.disabled:hover[disabled] {
+  background-color: #fdf59a;
+}
+.datepicker table tr td.today:active,
+.datepicker table tr td.today:hover:active,
+.datepicker table tr td.today.disabled:active,
+.datepicker table tr td.today.disabled:hover:active,
+.datepicker table tr td.today.active,
+.datepicker table tr td.today:hover.active,
+.datepicker table tr td.today.disabled.active,
+.datepicker table tr td.today.disabled:hover.active {
+  background-color: #fbf069 \9;
+}
+.datepicker table tr td.range,
+.datepicker table tr td.range:hover,
+.datepicker table tr td.range.disabled,
+.datepicker table tr td.range.disabled:hover {
+  background: #eeeeee;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.datepicker table tr td.range.today,
+.datepicker table tr td.range.today:hover,
+.datepicker table tr td.range.today.disabled,
+.datepicker table tr td.range.today.disabled:hover {
+  background-color: #f3d17a;
+  background-image: -moz-linear-gradient(top, #f3c17a, #f3e97a);
+  background-image: -ms-linear-gradient(top, #f3c17a, #f3e97a);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3c17a), to(#f3e97a));
+  background-image: -webkit-linear-gradient(top, #f3c17a, #f3e97a);
+  background-image: -o-linear-gradient(top, #f3c17a, #f3e97a);
+  background-image: linear-gradient(top, #f3c17a, #f3e97a);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3c17a', endColorstr='#f3e97a', GradientType=0);
+  border-color: #f3e97a #f3e97a #edde34;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.datepicker table tr td.range.today:hover,
+.datepicker table tr td.range.today:hover:hover,
+.datepicker table tr td.range.today.disabled:hover,
+.datepicker table tr td.range.today.disabled:hover:hover,
+.datepicker table tr td.range.today:active,
+.datepicker table tr td.range.today:hover:active,
+.datepicker table tr td.range.today.disabled:active,
+.datepicker table tr td.range.today.disabled:hover:active,
+.datepicker table tr td.range.today.active,
+.datepicker table tr td.range.today:hover.active,
+.datepicker table tr td.range.today.disabled.active,
+.datepicker table tr td.range.today.disabled:hover.active,
+.datepicker table tr td.range.today.disabled,
+.datepicker table tr td.range.today:hover.disabled,
+.datepicker table tr td.range.today.disabled.disabled,
+.datepicker table tr td.range.today.disabled:hover.disabled,
+.datepicker table tr td.range.today[disabled],
+.datepicker table tr td.range.today:hover[disabled],
+.datepicker table tr td.range.today.disabled[disabled],
+.datepicker table tr td.range.today.disabled:hover[disabled] {
+  background-color: #f3e97a;
+}
+.datepicker table tr td.range.today:active,
+.datepicker table tr td.range.today:hover:active,
+.datepicker table tr td.range.today.disabled:active,
+.datepicker table tr td.range.today.disabled:hover:active,
+.datepicker table tr td.range.today.active,
+.datepicker table tr td.range.today:hover.active,
+.datepicker table tr td.range.today.disabled.active,
+.datepicker table tr td.range.today.disabled:hover.active {
+  background-color: #efe24b \9;
+}
+.datepicker table tr td.selected,
+.datepicker table tr td.selected:hover,
+.datepicker table tr td.selected.disabled,
+.datepicker table tr td.selected.disabled:hover {
+  background-color: #9e9e9e;
+  background-image: -moz-linear-gradient(top, #b3b3b3, #808080);
+  background-image: -ms-linear-gradient(top, #b3b3b3, #808080);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3b3b3), to(#808080));
+  background-image: -webkit-linear-gradient(top, #b3b3b3, #808080);
+  background-image: -o-linear-gradient(top, #b3b3b3, #808080);
+  background-image: linear-gradient(top, #b3b3b3, #808080);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3', endColorstr='#808080', GradientType=0);
+  border-color: #808080 #808080 #595959;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td.selected:hover,
+.datepicker table tr td.selected:hover:hover,
+.datepicker table tr td.selected.disabled:hover,
+.datepicker table tr td.selected.disabled:hover:hover,
+.datepicker table tr td.selected:active,
+.datepicker table tr td.selected:hover:active,
+.datepicker table tr td.selected.disabled:active,
+.datepicker table tr td.selected.disabled:hover:active,
+.datepicker table tr td.selected.active,
+.datepicker table tr td.selected:hover.active,
+.datepicker table tr td.selected.disabled.active,
+.datepicker table tr td.selected.disabled:hover.active,
+.datepicker table tr td.selected.disabled,
+.datepicker table tr td.selected:hover.disabled,
+.datepicker table tr td.selected.disabled.disabled,
+.datepicker table tr td.selected.disabled:hover.disabled,
+.datepicker table tr td.selected[disabled],
+.datepicker table tr td.selected:hover[disabled],
+.datepicker table tr td.selected.disabled[disabled],
+.datepicker table tr td.selected.disabled:hover[disabled] {
+  background-color: #808080;
+}
+.datepicker table tr td.selected:active,
+.datepicker table tr td.selected:hover:active,
+.datepicker table tr td.selected.disabled:active,
+.datepicker table tr td.selected.disabled:hover:active,
+.datepicker table tr td.selected.active,
+.datepicker table tr td.selected:hover.active,
+.datepicker table tr td.selected.disabled.active,
+.datepicker table tr td.selected.disabled:hover.active {
+  background-color: #666666 \9;
+}
+.datepicker table tr td.active,
+.datepicker table tr td.active:hover,
+.datepicker table tr td.active.disabled,
+.datepicker table tr td.active.disabled:hover {
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(top, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td.active:hover,
+.datepicker table tr td.active:hover:hover,
+.datepicker table tr td.active.disabled:hover,
+.datepicker table tr td.active.disabled:hover:hover,
+.datepicker table tr td.active:active,
+.datepicker table tr td.active:hover:active,
+.datepicker table tr td.active.disabled:active,
+.datepicker table tr td.active.disabled:hover:active,
+.datepicker table tr td.active.active,
+.datepicker table tr td.active:hover.active,
+.datepicker table tr td.active.disabled.active,
+.datepicker table tr td.active.disabled:hover.active,
+.datepicker table tr td.active.disabled,
+.datepicker table tr td.active:hover.disabled,
+.datepicker table tr td.active.disabled.disabled,
+.datepicker table tr td.active.disabled:hover.disabled,
+.datepicker table tr td.active[disabled],
+.datepicker table tr td.active:hover[disabled],
+.datepicker table tr td.active.disabled[disabled],
+.datepicker table tr td.active.disabled:hover[disabled] {
+  background-color: #0044cc;
+}
+.datepicker table tr td.active:active,
+.datepicker table tr td.active:hover:active,
+.datepicker table tr td.active.disabled:active,
+.datepicker table tr td.active.disabled:hover:active,
+.datepicker table tr td.active.active,
+.datepicker table tr td.active:hover.active,
+.datepicker table tr td.active.disabled.active,
+.datepicker table tr td.active.disabled:hover.active {
+  background-color: #003399 \9;
+}
+.datepicker table tr td span {
+  display: block;
+  width: 23%;
+  height: 54px;
+  line-height: 54px;
+  float: left;
+  margin: 1%;
+  cursor: pointer;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.datepicker table tr td span:hover {
+  background: #eeeeee;
+}
+.datepicker table tr td span.disabled,
+.datepicker table tr td span.disabled:hover {
+  background: none;
+  color: #999999;
+  cursor: default;
+}
+.datepicker table tr td span.active,
+.datepicker table tr td span.active:hover,
+.datepicker table tr td span.active.disabled,
+.datepicker table tr td span.active.disabled:hover {
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(top, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td span.active:hover,
+.datepicker table tr td span.active:hover:hover,
+.datepicker table tr td span.active.disabled:hover,
+.datepicker table tr td span.active.disabled:hover:hover,
+.datepicker table tr td span.active:active,
+.datepicker table tr td span.active:hover:active,
+.datepicker table tr td span.active.disabled:active,
+.datepicker table tr td span.active.disabled:hover:active,
+.datepicker table tr td span.active.active,
+.datepicker table tr td span.active:hover.active,
+.datepicker table tr td span.active.disabled.active,
+.datepicker table tr td span.active.disabled:hover.active,
+.datepicker table tr td span.active.disabled,
+.datepicker table tr td span.active:hover.disabled,
+.datepicker table tr td span.active.disabled.disabled,
+.datepicker table tr td span.active.disabled:hover.disabled,
+.datepicker table tr td span.active[disabled],
+.datepicker table tr td span.active:hover[disabled],
+.datepicker table tr td span.active.disabled[disabled],
+.datepicker table tr td span.active.disabled:hover[disabled] {
+  background-color: #0044cc;
+}
+.datepicker table tr td span.active:active,
+.datepicker table tr td span.active:hover:active,
+.datepicker table tr td span.active.disabled:active,
+.datepicker table tr td span.active.disabled:hover:active,
+.datepicker table tr td span.active.active,
+.datepicker table tr td span.active:hover.active,
+.datepicker table tr td span.active.disabled.active,
+.datepicker table tr td span.active.disabled:hover.active {
+  background-color: #003399 \9;
+}
+.datepicker table tr td span.old {
+  color: #999999;
+}
+.datepicker th.datepicker-switch {
+  width: 145px;
+}
+.datepicker thead tr:first-child th,
+.datepicker tfoot tr:first-child th {
+  cursor: pointer;
+}
+.datepicker thead tr:first-child th:hover,
+.datepicker tfoot tr:first-child th:hover {
+  background: #eeeeee;
+}
+.datepicker .cw {
+  font-size: 10px;
+  width: 12px;
+  padding: 0 2px 0 5px;
+  vertical-align: middle;
+}
+.datepicker thead tr:first-child th.cw {
+  cursor: default;
+  background-color: transparent;
+}
+.input-append.date .add-on i,
+.input-prepend.date .add-on i {
+  display: block;
+  cursor: pointer;
+  width: 16px;
+  height: 16px;
+}
+.input-daterange input {
+  text-align: center;
+}
+.input-daterange input:first-child {
+  -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
+  border-radius: 3px 0 0 3px;
+}
+.input-daterange input:last-child {
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.input-daterange .add-on {
+  display: inline-block;
+  width: auto;
+  min-width: 16px;
+  height: 18px;
+  padding: 4px 5px;
+  font-weight: normal;
+  line-height: 18px;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  vertical-align: middle;
+  background-color: #eeeeee;
+  border: 1px solid #ccc;
+  margin-left: -5px;
+  margin-right: -5px;
+}

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.ar.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.ar={days:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت","الأحد"],daysShort:["أحد","اثنين","ثلاثاء","أربعاء","خميس","جمعة","سبت","أحد"],daysMin:["ح","ن","ث","ع","خ","ج","س","ح"],months:["يناير","فبراير","مارس","أبريل","مايو","يونيو","يوليو","أغسطس","سبتمبر","أكتوبر","نوفمبر","ديسمبر"],monthsShort:["يناير","فبراير","مارس","أبريل","مايو","يونيو","يوليو","أغسطس","سبتمبر","أكتوبر","نوفمبر","ديسمبر"],today:"هذا اليوم",rtl:!0}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.az.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.az={days:["Bazar","Bazar ertəsi","Çərşənbə axşamı","Çərşənbə","Cümə axşamı","Cümə","Şənbə"],daysShort:["B.","B.e","Ç.a","Ç.","C.a","C.","Ş."],daysMin:["B.","B.e","Ç.a","Ç.","C.a","C.","Ş."],months:["Yanvar","Fevral","Mart","Aprel","May","İyun","İyul","Avqust","Sentyabr","Oktyabr","Noyabr","Dekabr"],monthsShort:["Yan","Fev","Mar","Apr","May","İyun","İyul","Avq","Sen","Okt","Noy","Dek"],today:"Bu gün",weekStart:1}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.bg.js

@@ -0,0 +1,14 @@
+/**
+ * Bulgarian translation for bootstrap-datepicker
+ * Apostol Apostolov <apostol.s.apostolov@gmail.com>
+ */
+;(function($){
+	$.fn.datepicker.dates['bg'] = {
+		days: ["Неделя", "Понеделник", "Вторник", "Сряда", "Четвъртък", "Петък", "Събота", "Неделя"],
+		daysShort: ["Нед", "Пон", "Вто", "Сря", "Чет", "Пет", "Съб", "Нед"],
+		daysMin: ["Н", "П", "В", "С", "Ч", "П", "С", "Н"],
+		months: ["Януари", "Февруари", "Март", "Април", "Май", "Юни", "Юли", "Август", "Септември", "Октомври", "Ноември", "Декември"],
+		monthsShort: ["Ян", "Фев", "Мар", "Апр", "Май", "Юни", "Юли", "Авг", "Сеп", "Окт", "Ное", "Дек"],
+		today: "днес"
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.bg.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.bg={days:["Неделя","Понеделник","Вторник","Сряда","Четвъртък","Петък","Събота"],daysShort:["Нед","Пон","Вто","Сря","Чет","Пет","Съб"],daysMin:["Н","П","В","С","Ч","П","С"],months:["Януари","Февруари","Март","Април","Май","Юни","Юли","Август","Септември","Октомври","Ноември","Декември"],monthsShort:["Ян","Фев","Мар","Апр","Май","Юни","Юли","Авг","Сеп","Окт","Ное","Дек"],today:"днес"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.bs.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.bs={days:["Nedjelja","Ponedjeljak","Utorak","Srijeda","Četvrtak","Petak","Subota"],daysShort:["Ned","Pon","Uto","Sri","Čet","Pet","Sub"],daysMin:["N","Po","U","Sr","Č","Pe","Su"],months:["Januar","Februar","Mart","April","Maj","Juni","Juli","August","Septembar","Oktobar","Novembar","Decembar"],monthsShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec"],today:"Danas",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.ca.js

@@ -0,0 +1,14 @@
+/**
+ * Catalan translation for bootstrap-datepicker
+ * J. Garcia <jogaco.en@gmail.com>
+ */
+;(function($){
+	$.fn.datepicker.dates['ca'] = {
+		days: ["Diumenge", "Dilluns", "Dimarts", "Dimecres", "Dijous", "Divendres", "Dissabte", "Diumenge"],
+		daysShort: ["Diu",  "Dil", "Dmt", "Dmc", "Dij", "Div", "Dis", "Diu"],
+		daysMin: ["dg", "dl", "dt", "dc", "dj", "dv", "ds", "dg"],
+		months: ["Gener", "Febrer", "Març", "Abril", "Maig", "Juny", "Juliol", "Agost", "Setembre", "Octubre", "Novembre", "Desembre"],
+		monthsShort: ["Gen", "Feb", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Oct", "Nov", "Des"],
+		today: "Avui"
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.ca.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.ca={days:["Diumenge","Dilluns","Dimarts","Dimecres","Dijous","Divendres","Dissabte"],daysShort:["Diu","Dil","Dmt","Dmc","Dij","Div","Dis"],daysMin:["dg","dl","dt","dc","dj","dv","ds"],months:["Gener","Febrer","Març","Abril","Maig","Juny","Juliol","Agost","Setembre","Octubre","Novembre","Desembre"],monthsShort:["Gen","Feb","Mar","Abr","Mai","Jun","Jul","Ago","Set","Oct","Nov","Des"],today:"Avui",monthsTitle:"Mesos",clear:"Esborrar",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.cs.js

@@ -0,0 +1,15 @@
+/**
+ * Czech translation for bootstrap-datepicker
+ * Matěj Koubík <matej@koubik.name>
+ * Fixes by Michal Remiš <michal.remis@gmail.com>
+ */
+;(function($){
+	$.fn.datepicker.dates['cs'] = {
+		days: ["Neděle", "Pondělí", "Úterý", "Středa", "Čtvrtek", "Pátek", "Sobota", "Neděle"],
+		daysShort: ["Ned", "Pon", "Úte", "Stř", "Čtv", "Pát", "Sob", "Ned"],
+		daysMin: ["Ne", "Po", "Út", "St", "Čt", "Pá", "So", "Ne"],
+		months: ["Leden", "Únor", "Březen", "Duben", "Květen", "Červen", "Červenec", "Srpen", "Září", "Říjen", "Listopad", "Prosinec"],
+		monthsShort: ["Led", "Úno", "Bře", "Dub", "Kvě", "Čer", "Čnc", "Srp", "Zář", "Říj", "Lis", "Pro"],
+		today: "Dnes"
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.cs.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.cs={days:["Neděle","Pondělí","Úterý","Středa","Čtvrtek","Pátek","Sobota"],daysShort:["Ned","Pon","Úte","Stř","Čtv","Pát","Sob"],daysMin:["Ne","Po","Út","St","Čt","Pá","So"],months:["Leden","Únor","Březen","Duben","Květen","Červen","Červenec","Srpen","Září","Říjen","Listopad","Prosinec"],monthsShort:["Led","Úno","Bře","Dub","Kvě","Čer","Čnc","Srp","Zář","Říj","Lis","Pro"],today:"Dnes",clear:"Vymazat",weekStart:1,format:"dd.m.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.cy.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.cy={days:["Sul","Llun","Mawrth","Mercher","Iau","Gwener","Sadwrn"],daysShort:["Sul","Llu","Maw","Mer","Iau","Gwe","Sad"],daysMin:["Su","Ll","Ma","Me","Ia","Gwe","Sa"],months:["Ionawr","Chewfror","Mawrth","Ebrill","Mai","Mehefin","Gorfennaf","Awst","Medi","Hydref","Tachwedd","Rhagfyr"],monthsShort:["Ion","Chw","Maw","Ebr","Mai","Meh","Gor","Aws","Med","Hyd","Tach","Rha"],today:"Heddiw"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.da.js

@@ -0,0 +1,14 @@
+/**
+ * Danish translation for bootstrap-datepicker
+ * Christian Pedersen <http://github.com/chripede>
+ */
+;(function($){
+	$.fn.datepicker.dates['da'] = {
+		days: ["Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag", "Søndag"],
+		daysShort: ["Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør", "Søn"],
+		daysMin: ["Sø", "Ma", "Ti", "On", "To", "Fr", "Lø", "Sø"],
+		months: ["Januar", "Februar", "Marts", "April", "Maj", "Juni", "Juli", "August", "September", "Oktober", "November", "December"],
+		monthsShort: ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"],
+		today: "I Dag"
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.da.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.da={days:["søndag","mandag","tirsdag","onsdag","torsdag","fredag","lørdag"],daysShort:["søn","man","tir","ons","tor","fre","lør"],daysMin:["sø","ma","ti","on","to","fr","lø"],months:["januar","februar","marts","april","maj","juni","juli","august","september","oktober","november","december"],monthsShort:["jan","feb","mar","apr","maj","jun","jul","aug","sep","okt","nov","dec"],today:"I Dag",clear:"Nulstil"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.de.js

@@ -0,0 +1,16 @@
+/**
+ * German translation for bootstrap-datepicker
+ * Sam Zurcher <sam@orelias.ch>
+ */
+;(function($){
+	$.fn.datepicker.dates['de'] = {
+		days: ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"],
+		daysShort: ["Son", "Mon", "Die", "Mit", "Don", "Fre", "Sam", "Son"],
+		daysMin: ["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"],
+		months: ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"],
+		monthsShort: ["Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"],
+		today: "Heute",
+		weekStart: 1,
+		format: "dd.mm.yyyy"
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.de.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.de={days:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],daysShort:["Son","Mon","Die","Mit","Don","Fre","Sam"],daysMin:["So","Mo","Di","Mi","Do","Fr","Sa"],months:["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],monthsShort:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],today:"Heute",monthsTitle:"Monate",clear:"Löschen",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.el.js

@@ -0,0 +1,13 @@
+/**
+* Greek translation for bootstrap-datepicker
+*/
+;(function($){
+  $.fn.datepicker.dates['el'] = {
+    days: ["Κυριακή", "Δευτέρα", "Τρίτη", "Τετάρτη", "Πέμπτη", "Παρασκευή", "Σάββατο", "Κυριακή"],
+    daysShort: ["Κυρ", "Δευ", "Τρι", "Τετ", "Πεμ", "Παρ", "Σαβ", "Κυρ"],
+    daysMin: ["Κυ", "Δε", "Τρ", "Τε", "Πε", "Πα", "Σα", "Κυ"],
+    months: ["Ιανουάριος", "Φεβρουάριος", "Μάρτιος", "Απρίλιος", "Μάιος", "Ιούνιος", "Ιούλιος", "Αύγουστος", "Σεπτέμβριος", "Οκτώβριος", "Νοέμβριος", "Δεκέμβριος"],
+    monthsShort: ["Ιαν", "Φεβ", "Μαρ", "Απρ", "Μάι", "Ιουν", "Ιουλ", "Αυγ", "Σεπ", "Οκτ", "Νοε", "Δεκ"],
+    today: "Σήμερα"
+  };
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.el.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.el={days:["Κυριακή","Δευτέρα","Τρίτη","Τετάρτη","Πέμπτη","Παρασκευή","Σάββατο"],daysShort:["Κυρ","Δευ","Τρι","Τετ","Πεμ","Παρ","Σαβ"],daysMin:["Κυ","Δε","Τρ","Τε","Πε","Πα","Σα"],months:["Ιανουάριος","Φεβρουάριος","Μάρτιος","Απρίλιος","Μάιος","Ιούνιος","Ιούλιος","Αύγουστος","Σεπτέμβριος","Οκτώβριος","Νοέμβριος","Δεκέμβριος"],monthsShort:["Ιαν","Φεβ","Μαρ","Απρ","Μάι","Ιουν","Ιουλ","Αυγ","Σεπ","Οκτ","Νοε","Δεκ"],today:"Σήμερα",clear:"Καθαρισμός",weekStart:1,format:"d/m/yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.en-AU.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates["en-AU"]={days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],today:"Today",monthsTitle:"Months",clear:"Clear",weekStart:1,format:"d/mm/yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.en-GB.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates["en-GB"]={days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],today:"Today",monthsTitle:"Months",clear:"Clear",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.eo.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.eo={days:["dimanĉo","lundo","mardo","merkredo","ĵaŭdo","vendredo","sabato"],daysShort:["dim.","lun.","mar.","mer.","ĵaŭ.","ven.","sam."],daysMin:["d","l","ma","me","ĵ","v","s"],months:["januaro","februaro","marto","aprilo","majo","junio","julio","aŭgusto","septembro","oktobro","novembro","decembro"],monthsShort:["jan.","feb.","mar.","apr.","majo","jun.","jul.","aŭg.","sep.","okt.","nov.","dec."],today:"Hodiaŭ",clear:"Nuligi",weekStart:1,format:"yyyy-mm-dd"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.es.js

@@ -0,0 +1,14 @@
+/**
+ * Spanish translation for bootstrap-datepicker
+ * Bruno Bonamin <bruno.bonamin@gmail.com>
+ */
+;(function($){
+	$.fn.datepicker.dates['es'] = {
+		days: ["Domingo", "Lunes", "Martes", "Miércoles", "Jueves", "Viernes", "Sábado", "Domingo"],
+		daysShort: ["Dom", "Lun", "Mar", "Mié", "Jue", "Vie", "Sáb", "Dom"],
+		daysMin: ["Do", "Lu", "Ma", "Mi", "Ju", "Vi", "Sa", "Do"],
+		months: ["Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"],
+		monthsShort: ["Ene", "Feb", "Mar", "Abr", "May", "Jun", "Jul", "Ago", "Sep", "Oct", "Nov", "Dic"],
+		today: "Hoy"
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.es.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.es={days:["Domingo","Lunes","Martes","Miércoles","Jueves","Viernes","Sábado"],daysShort:["Dom","Lun","Mar","Mié","Jue","Vie","Sáb"],daysMin:["Do","Lu","Ma","Mi","Ju","Vi","Sa"],months:["Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"],monthsShort:["Ene","Feb","Mar","Abr","May","Jun","Jul","Ago","Sep","Oct","Nov","Dic"],today:"Hoy",monthsTitle:"Meses",clear:"Borrar",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.et.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.et={days:["Pühapäev","Esmaspäev","Teisipäev","Kolmapäev","Neljapäev","Reede","Laupäev"],daysShort:["Pühap","Esmasp","Teisip","Kolmap","Neljap","Reede","Laup"],daysMin:["P","E","T","K","N","R","L"],months:["Jaanuar","Veebruar","Märts","Aprill","Mai","Juuni","Juuli","August","September","Oktoober","November","Detsember"],monthsShort:["Jaan","Veebr","Märts","Apr","Mai","Juuni","Juuli","Aug","Sept","Okt","Nov","Dets"],today:"Täna",clear:"Tühjenda",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.eu.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.eu={days:["Igandea","Astelehena","Asteartea","Asteazkena","Osteguna","Ostirala","Larunbata"],daysShort:["Ig","Al","Ar","Az","Og","Ol","Lr"],daysMin:["Ig","Al","Ar","Az","Og","Ol","Lr"],months:["Urtarrila","Otsaila","Martxoa","Apirila","Maiatza","Ekaina","Uztaila","Abuztua","Iraila","Urria","Azaroa","Abendua"],monthsShort:["Urt","Ots","Mar","Api","Mai","Eka","Uzt","Abu","Ira","Urr","Aza","Abe"],today:"Gaur"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.fa.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.fa={days:["یک‌شنبه","دوشنبه","سه‌شنبه","چهارشنبه","پنج‌شنبه","جمعه","شنبه","یک‌شنبه"],daysShort:["یک","دو","سه","چهار","پنج","جمعه","شنبه","یک"],daysMin:["ی","د","س","چ","پ","ج","ش","ی"],months:["ژانویه","فوریه","مارس","آوریل","مه","ژوئن","ژوئیه","اوت","سپتامبر","اکتبر","نوامبر","دسامبر"],monthsShort:["ژان","فور","مار","آور","مه","ژون","ژوی","اوت","سپت","اکت","نوا","دسا"],today:"امروز",clear:"پاک کن",weekStart:1,format:"yyyy/mm/dd"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.fi.js

@@ -0,0 +1,14 @@
+/**
+ * Finnish translation for bootstrap-datepicker
+ * Jaakko Salonen <https://github.com/jsalonen>
+ */
+;(function($){
+	$.fn.datepicker.dates['fi'] = {
+		days: ["sunnuntai", "maanantai", "tiistai", "keskiviikko", "torstai", "perjantai", "lauantai", "sunnuntai"],
+		daysShort: ["sun", "maa", "tii", "kes", "tor", "per", "lau", "sun"],
+		daysMin: ["su", "ma", "ti", "ke", "to", "pe", "la", "su"],
+		months: ["tammikuu", "helmikuu", "maaliskuu", "huhtikuu", "toukokuu", "kesäkuu", "heinäkuu", "elokuu", "syyskuu", "lokakuu", "marraskuu", "joulukuu"],
+		monthsShort: ["tam", "hel", "maa", "huh", "tou", "kes", "hei", "elo", "syy", "lok", "mar", "jou"],
+		today: "tänään"
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.fi.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.fi={days:["sunnuntai","maanantai","tiistai","keskiviikko","torstai","perjantai","lauantai"],daysShort:["sun","maa","tii","kes","tor","per","lau"],daysMin:["su","ma","ti","ke","to","pe","la"],months:["tammikuu","helmikuu","maaliskuu","huhtikuu","toukokuu","kesäkuu","heinäkuu","elokuu","syyskuu","lokakuu","marraskuu","joulukuu"],monthsShort:["tam","hel","maa","huh","tou","kes","hei","elo","syy","lok","mar","jou"],today:"tänään",clear:"Tyhjennä",weekStart:1,format:"d.m.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.fo.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.fo={days:["Sunnudagur","Mánadagur","Týsdagur","Mikudagur","Hósdagur","Fríggjadagur","Leygardagur"],daysShort:["Sun","Mán","Týs","Mik","Hós","Frí","Ley"],daysMin:["Su","Má","Tý","Mi","Hó","Fr","Le"],months:["Januar","Februar","Marts","Apríl","Mei","Juni","Juli","August","Septembur","Oktobur","Novembur","Desembur"],monthsShort:["Jan","Feb","Mar","Apr","Mei","Jun","Jul","Aug","Sep","Okt","Nov","Des"],today:"Í Dag",clear:"Reinsa"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.fr-CH.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.fr={days:["Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi"],daysShort:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],daysMin:["D","L","Ma","Me","J","V","S"],months:["Janvier","Février","Mars","Avril","Mai","Juin","Juillet","Août","Septembre","Octobre","Novembre","Décembre"],monthsShort:["Jan","Fév","Mar","Avr","Mai","Jui","Jul","Aou","Sep","Oct","Nov","Déc"],today:"Aujourd'hui",monthsTitle:"Mois",clear:"Effacer",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.fr.js

@@ -0,0 +1,16 @@
+/**
+ * French translation for bootstrap-datepicker
+ * Nico Mollet <nico.mollet@gmail.com>
+ */
+;(function($){
+	$.fn.datepicker.dates['fr'] = {
+		days: ["Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche"],
+		daysShort: ["Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam", "Dim"],
+		daysMin: ["D", "L", "Ma", "Me", "J", "V", "S", "D"],
+		months: ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"],
+		monthsShort: ["Jan", "Fev", "Mar", "Avr", "Mai", "Jui", "Jul", "Aou", "Sep", "Oct", "Nov", "Dec"],
+		today: "Aujourd'hui",
+		weekStart: 1,
+		format: "dd/mm/yyyy"
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.fr.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.fr={days:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],daysShort:["dim.","lun.","mar.","mer.","jeu.","ven.","sam."],daysMin:["d","l","ma","me","j","v","s"],months:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],monthsShort:["janv.","févr.","mars","avril","mai","juin","juil.","août","sept.","oct.","nov.","déc."],today:"Aujourd'hui",monthsTitle:"Mois",clear:"Effacer",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.gl.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.gl={days:["Domingo","Luns","Martes","Mércores","Xoves","Venres","Sábado"],daysShort:["Dom","Lun","Mar","Mér","Xov","Ven","Sáb"],daysMin:["Do","Lu","Ma","Me","Xo","Ve","Sa"],months:["Xaneiro","Febreiro","Marzo","Abril","Maio","Xuño","Xullo","Agosto","Setembro","Outubro","Novembro","Decembro"],monthsShort:["Xan","Feb","Mar","Abr","Mai","Xun","Xul","Ago","Sep","Out","Nov","Dec"],today:"Hoxe",clear:"Limpar",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.he.js

@@ -0,0 +1,15 @@
+/**
+ * Hebrew translation for bootstrap-datepicker
+ * Sagie Maoz <sagie@maoz.info>
+ */
+;(function($){
+  $.fn.datepicker.dates['he'] = {
+      days: ["ראשון", "שני", "שלישי", "רביעי", "חמישי", "שישי", "שבת", "ראשון"],
+      daysShort: ["א", "ב", "ג", "ד", "ה", "ו", "ש", "א"],
+      daysMin: ["א", "ב", "ג", "ד", "ה", "ו", "ש", "א"],
+      months: ["ינואר", "פברואר", "מרץ", "אפריל", "מאי", "יוני", "יולי", "אוגוסט", "ספטמבר", "אוקטובר", "נובמבר", "דצמבר"],
+      monthsShort: ["ינו", "פבר", "מרץ", "אפר", "מאי", "יונ", "יול", "אוג", "ספט", "אוק", "נוב", "דצמ"],
+      today: "היום",
+      rtl: true
+  };
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.he.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.he={days:["ראשון","שני","שלישי","רביעי","חמישי","שישי","שבת","ראשון"],daysShort:["א","ב","ג","ד","ה","ו","ש","א"],daysMin:["א","ב","ג","ד","ה","ו","ש","א"],months:["ינואר","פברואר","מרץ","אפריל","מאי","יוני","יולי","אוגוסט","ספטמבר","אוקטובר","נובמבר","דצמבר"],monthsShort:["ינו","פבר","מרץ","אפר","מאי","יונ","יול","אוג","ספט","אוק","נוב","דצמ"],today:"היום",rtl:!0}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.hr.js

@@ -0,0 +1,13 @@
+/**
+ * Croatian localisation
+ */
+;(function($){
+	$.fn.datepicker.dates['hr'] = {
+		days: ["Nedjelja", "Ponedjelja", "Utorak", "Srijeda", "Četrtak", "Petak", "Subota", "Nedjelja"],
+		daysShort: ["Ned", "Pon", "Uto", "Srr", "Čet", "Pet", "Sub", "Ned"],
+		daysMin: ["Ne", "Po", "Ut", "Sr", "Če", "Pe", "Su", "Ne"],
+		months: ["Siječanj", "Veljača", "Ožujak", "Travanj", "Svibanj", "Lipanj", "Srpanj", "Kolovoz", "Rujan", "Listopad", "Studeni", "Prosinac"],
+		monthsShort: ["Sije", "Velj", "Ožu", "Tra", "Svi", "Lip", "Jul", "Kol", "Ruj", "Lis", "Stu", "Pro"],
+		today: "Danas"
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.hr.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.hr={days:["Nedjelja","Ponedjeljak","Utorak","Srijeda","Četvrtak","Petak","Subota"],daysShort:["Ned","Pon","Uto","Sri","Čet","Pet","Sub"],daysMin:["Ne","Po","Ut","Sr","Če","Pe","Su"],months:["Siječanj","Veljača","Ožujak","Travanj","Svibanj","Lipanj","Srpanj","Kolovoz","Rujan","Listopad","Studeni","Prosinac"],monthsShort:["Sij","Velj","Ožu","Tra","Svi","Lip","Srp","Kol","Ruj","Lis","Stu","Pro"],today:"Danas"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.hu.js

@@ -0,0 +1,16 @@
+/**
+ * Hungarian translation for bootstrap-datepicker
+ * Sotus László <lacisan@gmail.com>
+ */
+;(function($){
+  $.fn.datepicker.dates['hu'] = {
+		days: ["Vasárnap", "Hétfő", "Kedd", "Szerda", "Csütörtök", "Péntek", "Szombat", "Vasárnap"],
+		daysShort: ["Vas", "Hét", "Ked", "Sze", "Csü", "Pén", "Szo", "Vas"],
+		daysMin: ["Va", "Hé", "Ke", "Sz", "Cs", "Pé", "Sz", "Va"],
+		months: ["Január", "Február", "Március", "Április", "Május", "Június", "Július", "Augusztus", "Szeptember", "Október", "November", "December"],
+		monthsShort: ["Jan", "Feb", "Már", "Ápr", "Máj", "Jún", "Júl", "Aug", "Sze", "Okt", "Nov", "Dec"],
+		today: "Ma",
+		weekStart: 1,
+		format: "yyyy.mm.dd"
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.hu.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.hu={days:["vasárnap","hétfő","kedd","szerda","csütörtök","péntek","szombat"],daysShort:["vas","hét","ked","sze","csü","pén","szo"],daysMin:["V","H","K","Sze","Cs","P","Szo"],months:["január","február","március","április","május","június","július","augusztus","szeptember","október","november","december"],monthsShort:["jan","feb","már","ápr","máj","jún","júl","aug","sze","okt","nov","dec"],today:"ma",weekStart:1,clear:"töröl",titleFormat:"yyyy. MM",format:"yyyy.mm.dd"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.hy.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.hy={days:["Կիրակի","Երկուշաբթի","Երեքշաբթի","Չորեքշաբթի","Հինգշաբթի","Ուրբաթ","Շաբաթ"],daysShort:["Կրկ","Երկ","Երք","Չրք","Հնգ","Ուր","Շբթ"],daysMin:["Կրկ","Երկ","Երք","Չրք","Հնգ","Ուր","Շբթ"],months:["Հունվար","Փետրվար","Մարտ","Ապրիլ","Մայիս","Հունիս","Հուլիս","Օգոստոս","Սեպտեմբեր","Հոկտեմբեր","Նոյեմբեր","Դեկտեմբեր"],monthsShort:["Հուն","Փետ","Մար","Ապր","Մայ","Հնս","Հլս","Օգս","Սեպ","Հոկ","Նմբ","Դեկ"],today:"Այսօր",clear:"Ջնջել",format:"dd.mm.yyyy",weekStart:1}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.id.js

@@ -0,0 +1,13 @@
+/**
+ * Bahasa translation for bootstrap-datepicker
+ * Azwar Akbar <azwar.akbar@gmail.com>
+ */
+;(function($){
+	$.fn.datepicker.dates['id'] = {
+		days: ["Minggu", "Senin", "Selasa", "Rabu", "Kamis", "Jumat", "Sabtu", "Minggu"],
+		daysShort: ["Mgu", "Sen", "Sel", "Rab", "Kam", "Jum", "Sab", "Mgu"],
+		daysMin: ["Mg", "Sn", "Sl", "Ra", "Ka", "Ju", "Sa", "Mg"],
+		months: ["Januari", "Februari", "Maret", "April", "Mei", "Juni", "Juli", "Agustus", "September", "Oktober", "November", "Desember"],
+		monthsShort: ["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Ags", "Sep", "Okt", "Nov", "Des"]
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.id.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.id={days:["Minggu","Senin","Selasa","Rabu","Kamis","Jumat","Sabtu"],daysShort:["Mgu","Sen","Sel","Rab","Kam","Jum","Sab"],daysMin:["Mg","Sn","Sl","Ra","Ka","Ju","Sa"],months:["Januari","Februari","Maret","April","Mei","Juni","Juli","Agustus","September","Oktober","November","Desember"],monthsShort:["Jan","Feb","Mar","Apr","Mei","Jun","Jul","Ags","Sep","Okt","Nov","Des"],today:"Hari Ini",clear:"Kosongkan"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.is.js

@@ -0,0 +1,14 @@
+/**
+ * Icelandic translation for bootstrap-datepicker
+ * Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
+ */
+;(function($){
+	$.fn.datepicker.dates['is'] = {
+		days: ["Sunnudagur", "Mánudagur", "Þriðjudagur", "Miðvikudagur", "Fimmtudagur", "Föstudagur", "Laugardagur", "Sunnudagur"],
+		daysShort: ["Sun", "Mán", "Þri", "Mið", "Fim", "Fös", "Lau", "Sun"],
+		daysMin: ["Su", "Má", "Þr", "Mi", "Fi", "Fö", "La", "Su"],
+		months: ["Janúar", "Febrúar", "Mars", "Apríl", "Maí", "Júní", "Júlí", "Ágúst", "September", "Október", "Nóvember", "Desember"],
+		monthsShort: ["Jan", "Feb", "Mar", "Apr", "Maí", "Jún", "Júl", "Ágú", "Sep", "Okt", "Nóv", "Des"],
+		today: "Í Dag"
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.is.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.is={days:["Sunnudagur","Mánudagur","Þriðjudagur","Miðvikudagur","Fimmtudagur","Föstudagur","Laugardagur"],daysShort:["Sun","Mán","Þri","Mið","Fim","Fös","Lau"],daysMin:["Su","Má","Þr","Mi","Fi","Fö","La"],months:["Janúar","Febrúar","Mars","Apríl","Maí","Júní","Júlí","Ágúst","September","Október","Nóvember","Desember"],monthsShort:["Jan","Feb","Mar","Apr","Maí","Jún","Júl","Ágú","Sep","Okt","Nóv","Des"],today:"Í Dag"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.it-CH.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.it={days:["Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato"],daysShort:["Dom","Lun","Mar","Mer","Gio","Ven","Sab"],daysMin:["Do","Lu","Ma","Me","Gi","Ve","Sa"],months:["Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno","Luglio","Agosto","Settembre","Ottobre","Novembre","Dicembre"],monthsShort:["Gen","Feb","Mar","Apr","Mag","Giu","Lug","Ago","Set","Ott","Nov","Dic"],today:"Oggi",clear:"Cancella",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.it.js

@@ -0,0 +1,16 @@
+/**
+ * Italian translation for bootstrap-datepicker
+ * Enrico Rubboli <rubboli@gmail.com>
+ */
+;(function($){
+	$.fn.datepicker.dates['it'] = {
+		days: ["Domenica", "Lunedì", "Martedì", "Mercoledì", "Giovedì", "Venerdì", "Sabato", "Domenica"],
+		daysShort: ["Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab", "Dom"],
+		daysMin: ["Do", "Lu", "Ma", "Me", "Gi", "Ve", "Sa", "Do"],
+		months: ["Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"],
+		monthsShort: ["Gen", "Feb", "Mar", "Apr", "Mag", "Giu", "Lug", "Ago", "Set", "Ott", "Nov", "Dic"],
+		today: "Oggi",
+		weekStart: 1,
+		format: "dd/mm/yyyy"
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.it.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.it={days:["Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato"],daysShort:["Dom","Lun","Mar","Mer","Gio","Ven","Sab"],daysMin:["Do","Lu","Ma","Me","Gi","Ve","Sa"],months:["Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno","Luglio","Agosto","Settembre","Ottobre","Novembre","Dicembre"],monthsShort:["Gen","Feb","Mar","Apr","Mag","Giu","Lug","Ago","Set","Ott","Nov","Dic"],today:"Oggi",monthsTitle:"Mesi",clear:"Cancella",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.ja.js

@@ -0,0 +1,15 @@
+/**
+ * Japanese translation for bootstrap-datepicker
+ * Norio Suzuki <https://github.com/suzuki/>
+ */
+;(function($){
+	$.fn.datepicker.dates['ja'] = {
+		days: ["日曜", "月曜", "火曜", "水曜", "木曜", "金曜", "土曜", "日曜"],
+		daysShort: ["日", "月", "火", "水", "木", "金", "土", "日"],
+		daysMin: ["日", "月", "火", "水", "木", "金", "土", "日"],
+		months: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+		monthsShort: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+		today: "今日",
+		format: "yyyy/mm/dd"
+	};
+}(jQuery));

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.ja.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.ja={days:["日曜","月曜","火曜","水曜","木曜","金曜","土曜"],daysShort:["日","月","火","水","木","金","土"],daysMin:["日","月","火","水","木","金","土"],months:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],monthsShort:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],today:"今日",format:"yyyy/mm/dd",titleFormat:"yyyy年mm月",clear:"クリア"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.ka.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.ka={days:["კვირა","ორშაბათი","სამშაბათი","ოთხშაბათი","ხუთშაბათი","პარასკევი","შაბათი"],daysShort:["კვი","ორშ","სამ","ოთხ","ხუთ","პარ","შაბ"],daysMin:["კვ","ორ","სა","ოთ","ხუ","პა","შა"],months:["იანვარი","თებერვალი","მარტი","აპრილი","მაისი","ივნისი","ივლისი","აგვისტო","სექტემბერი","ოქტომები","ნოემბერი","დეკემბერი"],monthsShort:["იან","თებ","მარ","აპრ","მაი","ივნ","ივლ","აგვ","სექ","ოქტ","ნოე","დეკ"],today:"დღეს",clear:"გასუფთავება",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.kh.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.kh={days:["អាទិត្យ","ចន្ទ","អង្គារ","ពុធ","ព្រហស្បតិ៍","សុក្រ","សៅរ៍","អាទិត្យ"],daysShort:["អា.ទិ","ចន្ទ","អង្គារ","ពុធ","ព្រ.ហ","សុក្រ","សៅរ៍","អា.ទិ"],daysMin:["អា.ទិ","ចន្ទ","អង្គារ","ពុធ","ព្រ.ហ","សុក្រ","សៅរ៍","អា.ទិ"],months:["មករា","កុម្ភះ","មិនា","មេសា","ឧសភា","មិថុនា","កក្កដា","សីហា","កញ្ញា","តុលា","វិច្ឆិកា","ធ្នូ"],monthsShort:["មករា","កុម្ភះ","មិនា","មេសា","ឧសភា","មិថុនា","កក្កដា","សីហា","កញ្ញា","តុលា","វិច្ឆិកា","ធ្នូ"],today:"ថ្ងៃនេះ",clear:"សំអាត"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.kk.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.kk={days:["Жексенбі","Дүйсенбі","Сейсенбі","Сәрсенбі","Бейсенбі","Жұма","Сенбі"],daysShort:["Жек","Дүй","Сей","Сәр","Бей","Жұм","Сен"],daysMin:["Жк","Дс","Сс","Ср","Бс","Жм","Сн"],months:["Қаңтар","Ақпан","Наурыз","Сәуір","Мамыр","Маусым","Шілде","Тамыз","Қыркүйек","Қазан","Қараша","Желтоқсан"],monthsShort:["Қаң","Ақп","Нау","Сәу","Мам","Мау","Шіл","Там","Қыр","Қаз","Қар","Жел"],today:"Бүгін",weekStart:1}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.ko.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.ko={days:["일요일","월요일","화요일","수요일","목요일","금요일","토요일"],daysShort:["일","월","화","수","목","금","토"],daysMin:["일","월","화","수","목","금","토"],months:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],monthsShort:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],today:"오늘",clear:"삭제",format:"yyyy-mm-dd",titleFormat:"yyyy년mm월",weekStart:0}}(jQuery);