Grunt

.gitignore

@@ -9,4 +9,3 @@
 shinyapps/
 README.html
 .*.Rnb.cached
-tools/yarn-error.log

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 1.3.2
+Version: 1.2.0
 Authors@R: c(
     person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com"),
     person("Joe", "Cheng", role = "aut", email = "joe@rstudio.com"),
@@ -65,12 +65,12 @@ Depends:
 Imports:
     utils,
     grDevices,
-    httpuv (>= 1.5.0),
+    httpuv (>= 1.4.4),
     mime (>= 0.3),
     jsonlite (>= 0.9.16),
     xtable,
     digest,
-    htmltools (>= 0.3.6),
+    htmltools (>= 0.3.5),
     R6 (>= 2.0),
     sourcetools,
     later (>= 0.7.2),
@@ -86,7 +86,6 @@ Suggests:
     markdown,
     rmarkdown,
     ggplot2,
-    reactlog (>= 1.0.0),
     magrittr
 URL: http://shiny.rstudio.com
 BugReports: https://github.com/rstudio/shiny/issues
@@ -107,7 +106,6 @@ Collate:
     'cache-utils.R'
     'diagnose.R'
     'fileupload.R'
-    'font-awesome.R'
     'graph.R'
     'reactives.R'
     'reactive-domains.R'
@@ -161,5 +159,4 @@ Collate:
     'test-export.R'
     'timer.R'
     'update-input.R'
-RoxygenNote: 6.1.1
-Encoding: UTF-8
+RoxygenNote: 6.1.0

NAMESPACE

@@ -189,9 +189,6 @@ export(reactiveUI)
 export(reactiveVal)
 export(reactiveValues)
 export(reactiveValuesToList)
-export(reactlog)
-export(reactlogReset)
-export(reactlogShow)
 export(registerInputHandler)
 export(removeInputHandler)
 export(removeModal)

NEWS.md

@@ -1,53 +1,3 @@
-shiny 1.3.2
-===========
-
-### Bug fixes
-
-* Fixed [#2285](https://github.com/rstudio/shiny/issues/2285), [#2288](https://github.com/rstudio/shiny/issues/2288): Static CSS/JS resources in subapps in R Markdown documents did not render properly. ([#2386](https://github.com/rstudio/shiny/pull/2386))
-
-* Fixed [#2280](https://github.com/rstudio/shiny/issues/2280): Shiny applications that used a www/index.html file did not serve up the index file. ([#2382](https://github.com/rstudio/shiny/pull/2382))
-
-
-shiny 1.3.1
-===========
-
-### Bug fixes
-
-* Fixed a performance issue introduced in v1.3.0 when using large nested lists within Shiny. ([#2377](https://github.com/rstudio/shiny/pull/2377))
-
-
-shiny 1.3.0
-===========
-
-## Full changelog
-
-### Breaking changes
-
-### New features
-
-* Revamped Shiny's [reactlog](https://github.com/rstudio/reactlog) viewer which debugs reactivity within a shiny application.  This allows users to traverse the reactivity history of a shiny application, filter to the dependency tree of a selected reactive object, and search for matching reactive objects.  See `?reactlogShow` for more details and how to enable this feature. ([#2107](https://github.com/rstudio/shiny/pull/2107))
-
-* Shiny now serves static files on a background thread. This means that things like JavaScript and CSS assets can be served without blocking or being blocked by the main R thread, and should result in significantly better performance for heavily loaded servers. ([#2280](https://github.com/rstudio/shiny/pull/2280))
-
-### Minor new features and improvements
-
-* The `Shiny-Shared-Secret` security header is now checked using constant-time comparison to prevent timing attacks (thanks @dirkschumacher!). ([#2319](https://github.com/rstudio/shiny/pull/2319))
-
-### Bug fixes
-
-* Fixed [#2245](https://github.com/rstudio/shiny/issues/2245): `updateSelectizeInput()` did not update labels. ([#2248](https://github.com/rstudio/shiny/pull/2248))
-
-* Fixed [#2308](https://github.com/rstudio/shiny/issues/2308): When restoring a bookmarked application, inputs with a leading `.` would not be restored. ([#2311](https://github.com/rstudio/shiny/pull/2311))
-
-* Fixed [#2305](https://github.com/rstudio/shiny/issues/2305), [#2322](https://github.com/rstudio/shiny/issues/2322), [#2351](https://github.com/rstudio/shiny/issues/2351): When an input in dynamic UI is restored from bookmarks, it would keep getting set to the same value. ([#2360](https://github.com/rstudio/shiny/pull/2360))
-
-* Fixed [#2349](https://github.com/rstudio/shiny/issues/2349), [#2329](https://github.com/rstudio/shiny/issues/2329), [#1817](https://github.com/rstudio/shiny/issues/1817): These were various bugs triggered by the presence of the [networkD3](https://christophergandrud.github.io/networkD3/) package's Sankey plot in an app. Impacted features included `dateRangeInput`, `withProgressBar`, and bookmarking ([#2359](https://github.com/rstudio/shiny/pull/2359))
-
-### Documentation Updates
-
-* Fixed [#2247](https://github.com/rstudio/shiny/issues/2247): `renderCachedPlot` now supports using promises for either `expr` or `cacheKeyExpr`. (Shiny v1.2.0 supported async `expr`, but only if `cacheKeyExpr` was async as well; now you can use any combination of sync/async for `expr` and `cacheKeyExpr`.) [#2261](https://github.com/rstudio/shiny/pull/2261)
-
-
 shiny 1.2.0
 ===========
 
@@ -55,17 +5,13 @@ This release features plot caching, an important new tool for improving performa
 
 ## Full changelog
 
-### Breaking changes
-
-* The URL paths for FontAwesome CSS/JS/font assets have changed, due to our upgrade from FontAwesome 4 to 5. This shouldn't affect you unless you're using `www/index.html` to provide your UI and have hardcoded the old FontAwesome paths into your HTML. If that's you, consider switching to [HTML templates](https://shiny.rstudio.com/articles/templates.html), which give you the syntax of raw HTML while still taking advantage of Shiny's automatic management of web dependencies.
-
 ### New features
 
 * Added `renderCachedPlot()`, which stores plots in a cache so that they can be served up almost instantly. ([#1997](https://github.com/rstudio/shiny/pull/1997))
 
 ### Minor new features and improvements
 
-* Upgrade FontAwesome from 4.7.0 to 5.3.1 and made `icon` tags browsable, which means they will display in a web browser or RStudio viewer by default ([#2186](https://github.com/rstudio/shiny/issues/2186)). Note that if your application or library depends on FontAwesome directly using custom CSS, you may need to make some or all of the changes recommended in [Upgrade from Version 4](https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4). Font Awesome icons can also now be used in static R Markdown documents.
+* Upgrade FontAwesome from 4.7.0 to 5.3.1 and made `icon` tags browsable [#2186](https://github.com/rstudio/shiny/issues/2186).
 
 * Address [#174](https://github.com/rstudio/shiny/issues/174): Added `datesdisabled` and `daysofweekdisabled` as new parameters to `dateInput()`. This resolves [#174](https://github.com/rstudio/shiny/issues/174) and exposes the underlying arguments of [Bootstrap Datepicker](http://bootstrap-datepicker.readthedocs.io/en/latest/options.html#datesdisabled). `datesdisabled` expects a character vector with values in `yyyy/mm/dd` format and `daysofweekdisabled` expects an integer vector with day interger ids (Sunday=0, Saturday=6). The default value for both is `NULL`, which leaves all days selectable. Thanks, @nathancday! ([#2147](https://github.com/rstudio/shiny/pull/2147))
 
@@ -101,11 +47,7 @@ This release features plot caching, an important new tool for improving performa
 
 * Fixed [#2142](https://github.com/rstudio/shiny/issues/2142): Dropping files on `fileInput`s stopped working on recent releases of Firefox. Thanks @dmenne for reporting! [#2203](https://github.com/rstudio/shiny/pull/2203)
 
-* Fixed [#2204](https://github.com/rstudio/shiny/issues/2204): `updateDateInput` could set the wrong date on days where DST begins. (Thanks @GaGaMan1101!) [#2212](https://github.com/rstudio/shiny/pull/2212)
-
-* Fixed [#2225](https://github.com/rstudio/shiny/issues/2225): Input event queue can stall in apps that use async. [#2226](https://github.com/rstudio/shiny/pull/2226)
-
-* Fixed [#2228](https://github.com/rstudio/shiny/issues/2228): `reactiveTimer` fails when not owned by a session. Thanks, @P-Bettega! [#2229](https://github.com/rstudio/shiny/pull/2229)
+* Fixed [#2204](https://github.com/rstudio/shiny/issues/2204): `updateDateInput` could set the wrong date on days where DST begins. [#2211](https://github.com/rstudio/shiny/pull/2211)
 
 ### Documentation Updates
 
@@ -167,7 +109,7 @@ This is a significant release for Shiny, with a major new feature that was nearl
 
 * Improved the error handling inside the `addResourcePath()` function, to give end users more informative error messages when the `directoryPath` argument cannot be normalized. This is especially useful for `runtime: shiny_prerendered` Rmd documents, like `learnr` tutorials. ([#1968](https://github.com/rstudio/shiny/pull/1968))
 
-* Changed script tags in reactlog ([inst/www/reactive-graph.html](https://github.com/rstudio/shiny/blob/v1.1.0/inst/www/reactive-graph.html)) from HTTP to HTTPS in order to avoid mixed content blocking by most browsers. (Thanks, @jekriske-lilly! [#1844](https://github.com/rstudio/shiny/pull/1844))
+* Changed script tags in reactlog ([inst/www/reactive-graph.html](https://github.com/rstudio/shiny/blob/master/inst/www/reactive-graph.html)) from HTTP to HTTPS in order to avoid mixed content blocking by most browsers. (Thanks, @jekriske-lilly! [#1844](https://github.com/rstudio/shiny/pull/1844))
 
 * Addressed [#1784](https://github.com/rstudio/shiny/issues/1784): `runApp()` will avoid port 6697, which is considered unsafe by Chrome.
 

R/app.R

@@ -170,14 +170,7 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
   }
 
   wwwDir <- file.path.ci(appDir, "www")
-  if (dirExists(wwwDir)) {
-    staticPaths <- list("/" = staticPath(wwwDir, indexhtml = FALSE, fallthrough = TRUE))
-  } else {
-    staticPaths <- list()
-  }
-
   fallbackWWWDir <- system.file("www-dir", package = "shiny")
-
   serverSource <- cachedFuncWithFile(appDir, "server.R", case.sensitive = FALSE,
     function(serverR) {
       # If server.R contains a call to shinyServer (which sets .globals$server),
@@ -227,13 +220,6 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
 
   structure(
     list(
-      staticPaths = staticPaths,
-      # Even though the wwwDir is handled as a static path, we need to include
-      # it here to be handled by R as well. This is because the special case
-      # of index.html: it is specifically not handled as a staticPath for
-      # reasons explained above, but if someone does want to serve up an
-      # index.html, we need to handle it, and we do it by using the
-      # staticHandler in the R code path. (#2380)
       httpHandler = joinHandlers(c(uiHandler, wwwDir, fallbackWWWDir)),
       serverFuncSource = serverFuncSource,
       onStart = onStart,
@@ -323,20 +309,6 @@ shinyAppDir_appR <- function(fileName, appDir, options=list())
   }
 
   wwwDir <- file.path.ci(appDir, "www")
-  if (dirExists(wwwDir)) {
-    # wwwDir is a static path served by httpuv. It does _not_ serve up
-    # index.html, for two reasons. (1) It's possible that the user's
-    # www/index.html file is not actually used as the index, but as a template
-    # that gets processed before being sent; and (2) the index content may be
-    # modified by the hosting environment (as in SockJSAdapter.R).
-    #
-    # The call to staticPath normalizes the path, so that if the working dir
-    # later changes, it will continue to point to the right place.
-    staticPaths <- list("/" = staticPath(wwwDir, indexhtml = FALSE, fallthrough = TRUE))
-  } else {
-    staticPaths <- list()
-  }
-
   fallbackWWWDir <- system.file("www-dir", package = "shiny")
 
   oldwd <- NULL
@@ -355,18 +327,6 @@ shinyAppDir_appR <- function(fileName, appDir, options=list())
 
   structure(
     list(
-      # fallbackWWWDir is _not_ listed in staticPaths, because it needs to
-      # come after the uiHandler. It also does not need to be fast, since it
-      # should rarely be hit. The order is wwwDir (in staticPaths), then
-      # uiHandler, then falbackWWWDir (which is served up by the R
-      # staticHandler function).
-      staticPaths = staticPaths,
-      # Even though the wwwDir is handled as a static path, we need to include
-      # it here to be handled by R as well. This is because the special case
-      # of index.html: it is specifically not handled as a staticPath for
-      # reasons explained above, but if someone does want to serve up an
-      # index.html, we need to handle it, and we do it by using the
-      # staticHandler in the R code path. (#2380)
       httpHandler = joinHandlers(c(dynHttpHandler, wwwDir, fallbackWWWDir)),
       serverFuncSource = dynServerFuncSource,
       onStart = onStart,

R/bookmark-state.R

@@ -426,7 +426,7 @@ RestoreInputSet <- R6Class("RestoreInputSet",
     },
 
     asList = function() {
-      as.list.environment(private$values, all.names = TRUE)
+      as.list.environment(private$values)
     }
   )
 )

R/bootstrap.R

@@ -1508,6 +1508,10 @@ downloadLink <- function(outputId, label="Download", class=NULL, ...) {
 #'
 #'
 #' @examples
+#' icon("calendar")               # standard icon
+#' icon("calendar", "fa-3x")      # 3x normal size
+#' icon("cog", lib = "glyphicon") # From glyphicon library
+#'
 #' # add an icon to a submit button
 #' submitButton("Update View", icon = icon("refresh"))
 #'
@@ -1533,13 +1537,8 @@ icon <- function(name, class = NULL, lib = "font-awesome") {
   # build the icon class (allow name to be null so that other functions
   # e.g. buildTabset can pass an explicit class value)
   iconClass <- ""
-  if (!is.null(name)) {
-    prefix_class <- prefix
-    if (prefix_class == "fa" && name %in% font_awesome_brands) {
-      prefix_class <- "fab"
-    }
-    iconClass <- paste0(prefix_class, " ", prefix, "-", name)
-  }
+  if (!is.null(name))
+    iconClass <- paste0(prefix, " ", prefix, "-", name)
   if (!is.null(class))
     iconClass <- paste(iconClass, class)
 

R/font-awesome.R

@@ -1,75 +0,0 @@
-font_awesome_brands <- c(
-  "500px", "accessible-icon", "accusoft", "adn", "adversal",
-  "affiliatetheme", "algolia", "alipay", "amazon", "amazon-pay",
-  "amilia", "android", "angellist", "angrycreative", "angular",
-  "app-store", "app-store-ios", "apper", "apple", "apple-pay",
-  "asymmetrik", "audible", "autoprefixer", "avianex", "aviato",
-  "aws", "bandcamp", "behance", "behance-square", "bimobject",
-  "bitbucket", "bitcoin", "bity", "black-tie", "blackberry", "blogger",
-  "blogger-b", "bluetooth", "bluetooth-b", "btc", "buromobelexperte",
-  "buysellads", "cc-amazon-pay", "cc-amex", "cc-apple-pay", "cc-diners-club",
-  "cc-discover", "cc-jcb", "cc-mastercard", "cc-paypal", "cc-stripe",
-  "cc-visa", "centercode", "chrome", "cloudscale", "cloudsmith",
-  "cloudversify", "codepen", "codiepie", "connectdevelop", "contao",
-  "cpanel", "creative-commons", "creative-commons-by", "creative-commons-nc",
-  "creative-commons-nc-eu", "creative-commons-nc-jp", "creative-commons-nd",
-  "creative-commons-pd", "creative-commons-pd-alt", "creative-commons-remix",
-  "creative-commons-sa", "creative-commons-sampling", "creative-commons-sampling-plus",
-  "creative-commons-share", "css3", "css3-alt", "cuttlefish", "d-and-d",
-  "dashcube", "delicious", "deploydog", "deskpro", "deviantart",
-  "digg", "digital-ocean", "discord", "discourse", "dochub", "docker",
-  "draft2digital", "dribbble", "dribbble-square", "dropbox", "drupal",
-  "dyalog", "earlybirds", "ebay", "edge", "elementor", "ello",
-  "ember", "empire", "envira", "erlang", "ethereum", "etsy", "expeditedssl",
-  "facebook", "facebook-f", "facebook-messenger", "facebook-square",
-  "firefox", "first-order", "first-order-alt", "firstdraft", "flickr",
-  "flipboard", "fly", "font-awesome", "font-awesome-alt", "font-awesome-flag",
-  "font-awesome-logo-full", "fonticons", "fonticons-fi", "fort-awesome",
-  "fort-awesome-alt", "forumbee", "foursquare", "free-code-camp",
-  "freebsd", "fulcrum", "galactic-republic", "galactic-senate",
-  "get-pocket", "gg", "gg-circle", "git", "git-square", "github",
-  "github-alt", "github-square", "gitkraken", "gitlab", "gitter",
-  "glide", "glide-g", "gofore", "goodreads", "goodreads-g", "google",
-  "google-drive", "google-play", "google-plus", "google-plus-g",
-  "google-plus-square", "google-wallet", "gratipay", "grav", "gripfire",
-  "grunt", "gulp", "hacker-news", "hacker-news-square", "hackerrank",
-  "hips", "hire-a-helper", "hooli", "hornbill", "hotjar", "houzz",
-  "html5", "hubspot", "imdb", "instagram", "internet-explorer",
-  "ioxhost", "itunes", "itunes-note", "java", "jedi-order", "jenkins",
-  "joget", "joomla", "js", "js-square", "jsfiddle", "kaggle", "keybase",
-  "keycdn", "kickstarter", "kickstarter-k", "korvue", "laravel",
-  "lastfm", "lastfm-square", "leanpub", "less", "line", "linkedin",
-  "linkedin-in", "linode", "linux", "lyft", "magento", "mailchimp",
-  "mandalorian", "markdown", "mastodon", "maxcdn", "medapps", "medium",
-  "medium-m", "medrt", "meetup", "megaport", "microsoft", "mix",
-  "mixcloud", "mizuni", "modx", "monero", "napster", "neos", "nimblr",
-  "nintendo-switch", "node", "node-js", "npm", "ns8", "nutritionix",
-  "odnoklassniki", "odnoklassniki-square", "old-republic", "opencart",
-  "openid", "opera", "optin-monster", "osi", "page4", "pagelines",
-  "palfed", "patreon", "paypal", "periscope", "phabricator", "phoenix-framework",
-  "phoenix-squadron", "php", "pied-piper", "pied-piper-alt", "pied-piper-hat",
-  "pied-piper-pp", "pinterest", "pinterest-p", "pinterest-square",
-  "playstation", "product-hunt", "pushed", "python", "qq", "quinscape",
-  "quora", "r-project", "ravelry", "react", "readme", "rebel",
-  "red-river", "reddit", "reddit-alien", "reddit-square", "rendact",
-  "renren", "replyd", "researchgate", "resolving", "rev", "rocketchat",
-  "rockrms", "safari", "sass", "schlix", "scribd", "searchengin",
-  "sellcast", "sellsy", "servicestack", "shirtsinbulk", "shopware",
-  "simplybuilt", "sistrix", "sith", "skyatlas", "skype", "slack",
-  "slack-hash", "slideshare", "snapchat", "snapchat-ghost", "snapchat-square",
-  "soundcloud", "speakap", "spotify", "squarespace", "stack-exchange",
-  "stack-overflow", "staylinked", "steam", "steam-square", "steam-symbol",
-  "sticker-mule", "strava", "stripe", "stripe-s", "studiovinari",
-  "stumbleupon", "stumbleupon-circle", "superpowers", "supple",
-  "teamspeak", "telegram", "telegram-plane", "tencent-weibo", "the-red-yeti",
-  "themeco", "themeisle", "trade-federation", "trello", "tripadvisor",
-  "tumblr", "tumblr-square", "twitch", "twitter", "twitter-square",
-  "typo3", "uber", "uikit", "uniregistry", "untappd", "usb", "ussunnah",
-  "vaadin", "viacoin", "viadeo", "viadeo-square", "viber", "vimeo",
-  "vimeo-square", "vimeo-v", "vine", "vk", "vnv", "vuejs", "weebly",
-  "weibo", "weixin", "whatsapp", "whatsapp-square", "whmcs", "wikipedia-w",
-  "windows", "wix", "wolf-pack-battalion", "wordpress", "wordpress-simple",
-  "wpbeginner", "wpexplorer", "wpforms", "xbox", "xing", "xing-square",
-  "y-combinator", "yahoo", "yandex", "yandex-international", "yelp",
-  "yoast", "youtube", "youtube-square", "zhihu"
-)

R/graph.R

@@ -1,58 +1,13 @@
-is_installed <- function(package, version) {
-  installedVersion <- tryCatch(utils::packageVersion(package), error = function(e) NA)
-  !is.na(installedVersion) && installedVersion >= version
-}
-
-# Check that the version of an suggested package satisfies the requirements
-#
-# @param package The name of the suggested package
-# @param version The version of the package
-check_suggested <- function(package, version, location) {
-
-  if (is_installed(package, version)) {
-    return()
+writeReactLog <- function(file=stdout(), sessionToken = NULL) {
+  log <- .graphStack$as_list()
+  if (!is.null(sessionToken)) {
+    log <- Filter(function(x) {
+      is.null(x$session) || identical(x$session, sessionToken)
+    }, log)
   }
-
-  missing_location <- missing(location)
-  msg <- paste0(
-    sQuote(package),
-    if (is.na(version)) "" else paste0("(>= ", version, ")"),
-    " must be installed for this functionality.",
-    if (!missing_location)
-      paste0(
-        "\nPlease install the missing package: \n",
-        "  source(\"https://install-github.me/", location, "\")"
-      )
-  )
-
-  if (interactive() && missing_location) {
-    message(msg, "\nWould you like to install it?")
-    if (utils::menu(c("Yes", "No")) == 1) {
-      return(utils::install.packages(package))
-    }
-  }
-
-  stop(msg, call. = FALSE)
+  cat(toJSON(log, pretty=TRUE), file=file)
 }
 
-
-
-
-# domain is like session
-
-
-# used to help define truly global react id's.
-# should work across session and in global namespace
-.globals$reactIdCounter <- 0L
-nextGlobalReactId <- function() {
-  .globals$reactIdCounter <- .globals$reactIdCounter + 1L
-  reactIdStr(.globals$reactIdCounter)
-}
-reactIdStr <- function(num) {
-  paste0("r", num)
-}
-
-
 #' Reactive Log Visualizer
 #'
 #' Provides an interactive browser-based tool for visualizing reactive
@@ -75,499 +30,88 @@ reactIdStr <- function(num) {
 #'
 #' As an alternative to pressing Ctrl/Command+F3--for example, if you
 #' are using reactives outside of the context of a Shiny
-#' application--you can run the \code{reactlogShow} function, which will
+#' application--you can run the \code{showReactLog} function, which will
 #' generate the reactive log visualization as a static HTML file and
 #' launch it in your default browser. In this case, refreshing your
 #' browser will not load new activity into the report; you will need to
-#' call \code{reactlogShow()} explicitly.
+#' call \code{showReactLog()} explicitly.
 #'
 #' For security and performance reasons, do not enable
 #' \code{shiny.reactlog} in production environments. When the option is
 #' enabled, it's possible for any user of your app to see at least some
 #' of the source code of your reactive expressions and observers.
 #'
-#' @name reactlog
-NULL
-
-
-#' @describeIn reactlog Return a list of reactive information.  Can be used in conjunction with
-#'   \code{reactlog::\link[reactlog]{reactlog_show}} to later display the reactlog graph.
+#' @param time A boolean that specifies whether or not to display the
+#' time that each reactive.
 #' @export
-reactlog <- function() {
-  rLog$asList()
-}
-
-#' @describeIn reactlog Display a full reactlog graph for all sessions.
-#' @inheritParams reactlog::reactlog_show
-#' @export
-reactlogShow <- function(time = TRUE) {
-  check_reactlog()
-  reactlog::reactlog_show(reactlog(), time = time)
-}
-#' @describeIn reactlog This function is deprecated. You should use \code{\link{reactlogShow}}
-#' @export
-# legacy purposes
 showReactLog <- function(time = TRUE) {
-  shinyDeprecated(new = "`reactlogShow`", version = "1.2.0")
-  reactlogShow(time = time)
-}
-#' @describeIn reactlog Resets the entire reactlog stack.  Useful for debugging and removing all prior reactive history.
-#' @export
-reactlogReset <- function() {
-  rLog$reset()
+  utils::browseURL(renderReactLog(time = as.logical(time)))
 }
 
-# called in "/reactlog" middleware
-renderReactlog <- function(sessionToken = NULL, time = TRUE) {
-  check_reactlog()
-  reactlog::reactlog_render(
-    reactlog(),
-    session_token = sessionToken,
-    time = time
-  )
+renderReactLog <- function(sessionToken = NULL, time = TRUE) {
+  templateFile <- system.file('www/reactive-graph.html', package='shiny')
+  html <- paste(readLines(templateFile, warn=FALSE), collapse='\r\n')
+  tc <- textConnection(NULL, 'w')
+  on.exit(close(tc))
+  writeReactLog(tc, sessionToken)
+  cat('\n', file=tc)
+  flush(tc)
+  html <- sub('__DATA__', paste(textConnectionValue(tc), collapse='\r\n'), html, fixed=TRUE)
+  html <- sub('__TIME__', paste0('"', time, '"'), html, fixed=TRUE)
+  file <- tempfile(fileext = '.html')
+  writeLines(html, file)
+  return(file)
 }
-check_reactlog <- function() {
-  check_suggested("reactlog", reactlog_version())
-}
-# read reactlog version from description file
-# prevents version mismatch in code and description file
-reactlog_version <- function() {
-  desc <- read.dcf(system.file("DESCRIPTION", package = "shiny", mustWork = TRUE))
-  suggests <- desc[1,"Suggests"][[1]]
-  suggests_pkgs <- strsplit(suggests, "\n")[[1]]
 
-  reactlog_info <- suggests_pkgs[grepl("reactlog", suggests_pkgs)]
-  if (length(reactlog_info) == 0) {
-    stop("reactlog can not be found in shiny DESCRIPTION file")
+.graphAppend <- function(logEntry, domain = getDefaultReactiveDomain()) {
+  if (isTRUE(getOption('shiny.reactlog'))) {
+    sessionToken <- if (is.null(domain)) NULL else domain$token
+    .graphStack$push(c(logEntry, list(
+      session = sessionToken,
+      time = as.numeric(Sys.time())
+    )))
   }
 
-  reactlog_info <- sub("^[^\\(]*\\(", "", reactlog_info)
-  reactlog_info <- sub("\\)[^\\)]*$", "", reactlog_info)
-  reactlog_info <- sub("^[>= ]*", "", reactlog_info)
-
-  package_version(reactlog_info)
+  if (!is.null(domain)) {
+    domain$reactlog(logEntry)
+  }
 }
 
+.graphDependsOn <- function(id, label) {
+  .graphAppend(list(action='dep', id=id, dependsOn=label))
+}
 
-RLog <- R6Class(
-  "RLog",
-  portable = FALSE,
-  private = list(
-    option = "shiny.reactlog",
-    msgOption = "shiny.reactlog.console",
+.graphDependsOnId <- function(id, dependee) {
+  .graphAppend(list(action='depId', id=id, dependsOn=dependee))
+}
 
-    appendEntry = function(domain, logEntry) {
-      if (self$isLogging()) {
-        sessionToken <- if (is.null(domain)) NULL else domain$token
-        logStack$push(c(logEntry, list(
-          session = sessionToken,
-          time = as.numeric(Sys.time())
-        )))
-      }
-      if (!is.null(domain)) domain$reactlog(logEntry)
-    }
-  ),
-  public = list(
-    msg = "<MessageLogger>",
-    logStack = "<Stack>",
+.graphCreateContext <- function(id, label, type, prevId, domain) {
+  .graphAppend(list(
+    action='ctx', id=id, label=paste(label, collapse='\n'),
+    srcref=as.vector(attr(label, "srcref")), srcfile=attr(label, "srcfile"),
+    type=type, prevId=prevId
+  ), domain = domain)
+}
 
-    noReactIdLabel = "NoCtxReactId",
-    noReactId = reactIdStr("NoCtxReactId"),
-    dummyReactIdLabel = "DummyReactId",
-    dummyReactId = reactIdStr("DummyReactId"),
+.graphEnterContext <- function(id) {
+  .graphAppend(list(action='enter', id=id))
+}
 
-    asList = function() {
-      ret <- self$logStack$as_list()
-      attr(ret, "version") <- "1"
-      ret
-    },
+.graphExitContext <- function(id, domain) {
+  .graphAppend(list(action='exit', id=id), domain = domain)
+}
 
-    ctxIdStr = function(ctxId) {
-      if (is.null(ctxId) || identical(ctxId, "")) return(NULL)
-      paste0("ctx", ctxId)
-    },
-    namesIdStr = function(reactId) {
-      paste0("names(", reactId, ")")
-    },
-    asListIdStr = function(reactId) {
-      paste0("as.list(", reactId, ")")
-    },
-    asListAllIdStr = function(reactId) {
-      paste0("as.list(", reactId, ", all.names = TRUE)")
-    },
-    keyIdStr = function(reactId, key) {
-      paste0(reactId, "$", key)
-    },
+.graphValueChange <- function(label, value) {
+  .graphAppend(list(
+    action = 'valueChange',
+    id = label,
+    value = paste(utils::capture.output(utils::str(value)), collapse='\n')
+  ))
+}
 
-    valueStr = function(value, n = 200) {
-      if (!self$isLogging()) {
-        # return a placeholder string to avoid calling str
-        return("<reactlog is turned off>")
-      }
-      output <- try(silent = TRUE, {
-        # only capture the first level of the object
-        utils::capture.output(utils::str(value, max.level = 1))
-      })
-      outputTxt <- paste0(output, collapse="\n")
-      msg$shortenString(outputTxt, n = n)
-    },
-
-    initialize = function(rlogOption = "shiny.reactlog", msgOption = "shiny.reactlog.console") {
-      private$option <- rlogOption
-      private$msgOption <- msgOption
-
-      self$reset()
-    },
-    reset = function() {
-      .globals$reactIdCounter <- 0L
-
-      self$logStack <- Stack$new()
-      self$msg <- MessageLogger$new(option = private$msgOption)
-
-      # setup dummy and missing react information
-      self$msg$setReact(force = TRUE, list(reactId = self$noReactId, label = self$noReactIdLabel))
-      self$msg$setReact(force = TRUE, list(reactId = self$dummyReactId, label = self$dummyReactIdLabel))
-    },
-    isLogging = function() {
-      isTRUE(getOption(private$option, FALSE))
-    },
-
-    define = function(reactId, value, label, type, domain) {
-      valueStr <- self$valueStr(value)
-      if (msg$hasReact(reactId)) {
-        stop("react definition for id: ", reactId, " already found!!", "Label: ", label, "Type: ", type)
-      }
-      msg$setReact(list(reactId = reactId, label = label))
-      msg$log("define:", msg$reactStr(reactId), msg$typeStr(type = type), msg$valueStr(valueStr))
-      private$appendEntry(domain, list(
-        action = "define",
-        reactId = reactId,
-        label = msg$shortenString(label),
-        type = type,
-        value = valueStr
-      ))
-    },
-    defineNames = function(reactId, value, label, domain) {
-      self$define(self$namesIdStr(reactId), value, self$namesIdStr(label), "reactiveValuesNames", domain)
-    },
-    defineAsList = function(reactId, value, label, domain) {
-      self$define(self$asListIdStr(reactId), value, self$asListIdStr(label), "reactiveValuesAsList", domain)
-    },
-    defineAsListAll = function(reactId, value, label, domain) {
-      self$define(self$asListAllIdStr(reactId), value, self$asListAllIdStr(label), "reactiveValuesAsListAll", domain)
-    },
-    defineKey = function(reactId, value, key, label, domain) {
-      self$define(self$keyIdStr(reactId, key), value, self$keyIdStr(label, key), "reactiveValuesKey", domain)
-    },
-    defineObserver = function(reactId, label, domain) {
-      self$define(reactId, value = NULL, label, "observer", domain)
-    },
-
-    dependsOn = function(reactId, depOnReactId, ctxId, domain) {
-      if (is.null(reactId)) return()
-      ctxId <- ctxIdStr(ctxId)
-      msg$log("dependsOn:", msg$reactStr(reactId), " on", msg$reactStr(depOnReactId), msg$ctxStr(ctxId))
-      private$appendEntry(domain, list(
-        action = "dependsOn",
-        reactId = reactId,
-        depOnReactId = depOnReactId,
-        ctxId = ctxId
-      ))
-    },
-    dependsOnKey = function(reactId, depOnReactId, key, ctxId, domain) {
-      self$dependsOn(reactId, self$keyIdStr(depOnReactId, key), ctxId, domain)
-    },
-
-    dependsOnRemove = function(reactId, depOnReactId, ctxId, domain) {
-      ctxId <- self$ctxIdStr(ctxId)
-      msg$log("dependsOnRemove:", msg$reactStr(reactId), " on", msg$reactStr(depOnReactId), msg$ctxStr(ctxId))
-      private$appendEntry(domain, list(
-        action = "dependsOnRemove",
-        reactId = reactId,
-        depOnReactId = depOnReactId,
-        ctxId = ctxId
-      ))
-    },
-    dependsOnKeyRemove = function(reactId, depOnReactId, key, ctxId, domain) {
-      self$dependsOnRemove(reactId, self$keyIdStr(depOnReactId, key), ctxId, domain)
-    },
-
-    createContext = function(ctxId, label, type, prevCtxId, domain) {
-      ctxId <- self$ctxIdStr(ctxId)
-      prevCtxId <- self$ctxIdStr(prevCtxId)
-      msg$log("createContext:", msg$ctxPrevCtxStr(preCtxIdTxt = " ", ctxId, prevCtxId, type))
-      private$appendEntry(domain, list(
-        action = "createContext",
-        ctxId = ctxId,
-        label = msg$shortenString(label),
-        type = type,
-        prevCtxId = prevCtxId,
-        srcref = as.vector(attr(label, "srcref")), srcfile=attr(label, "srcfile")
-      ))
-    },
-
-    enter = function(reactId, ctxId, type, domain) {
-      ctxId <- self$ctxIdStr(ctxId)
-      if (identical(type, "isolate")) {
-        msg$log("isolateEnter:", msg$reactStr(reactId), msg$ctxStr(ctxId))
-        msg$depthIncrement()
-        private$appendEntry(domain, list(
-          action = "isolateEnter",
-          reactId = reactId,
-          ctxId = ctxId
-        ))
-      } else {
-        msg$log("enter:", msg$reactStr(reactId), msg$ctxStr(ctxId, type))
-        msg$depthIncrement()
-        private$appendEntry(domain, list(
-          action = "enter",
-          reactId = reactId,
-          ctxId = ctxId,
-          type = type
-        ))
-      }
-    },
-    exit = function(reactId, ctxId, type, domain) {
-      ctxId <- self$ctxIdStr(ctxId)
-      if (identical(type, "isolate")) {
-        msg$depthDecrement()
-        msg$log("isolateExit:", msg$reactStr(reactId), msg$ctxStr(ctxId))
-        private$appendEntry(domain, list(
-          action = "isolateExit",
-          reactId = reactId,
-          ctxId = ctxId
-        ))
-      } else {
-        msg$depthDecrement()
-        msg$log("exit:", msg$reactStr(reactId), msg$ctxStr(ctxId, type))
-        private$appendEntry(domain, list(
-          action = "exit",
-          reactId = reactId,
-          ctxId = ctxId,
-          type = type
-        ))
-      }
-    },
-
-    valueChange = function(reactId, value, domain) {
-      valueStr <- self$valueStr(value)
-      msg$log("valueChange:", msg$reactStr(reactId), msg$valueStr(valueStr))
-      private$appendEntry(domain, list(
-        action = "valueChange",
-        reactId = reactId,
-        value = valueStr
-      ))
-    },
-    valueChangeNames = function(reactId, nameValues, domain) {
-      self$valueChange(self$namesIdStr(reactId), nameValues, domain)
-    },
-    valueChangeAsList = function(reactId, listValue, domain) {
-      self$valueChange(self$asListIdStr(reactId), listValue, domain)
-    },
-    valueChangeAsListAll = function(reactId, listValue, domain) {
-      self$valueChange(self$asListAllIdStr(reactId), listValue, domain)
-    },
-    valueChangeKey = function(reactId, key, value, domain) {
-      self$valueChange(self$keyIdStr(reactId, key), value, domain)
-    },
-
-
-    invalidateStart = function(reactId, ctxId, type, domain) {
-      ctxId <- self$ctxIdStr(ctxId)
-      if (identical(type, "isolate")) {
-        msg$log("isolateInvalidateStart:", msg$reactStr(reactId), msg$ctxStr(ctxId))
-        msg$depthIncrement()
-        private$appendEntry(domain, list(
-          action = "isolateInvalidateStart",
-          reactId = reactId,
-          ctxId = ctxId
-        ))
-      } else {
-        msg$log("invalidateStart:", msg$reactStr(reactId), msg$ctxStr(ctxId, type))
-        msg$depthIncrement()
-        private$appendEntry(domain, list(
-          action = "invalidateStart",
-          reactId = reactId,
-          ctxId = ctxId,
-          type = type
-        ))
-      }
-    },
-    invalidateEnd = function(reactId, ctxId, type, domain) {
-      ctxId <- self$ctxIdStr(ctxId)
-      if (identical(type, "isolate")) {
-        msg$depthDecrement()
-        msg$log("isolateInvalidateEnd:", msg$reactStr(reactId), msg$ctxStr(ctxId))
-        private$appendEntry(domain, list(
-          action = "isolateInvalidateEnd",
-          reactId = reactId,
-          ctxId = ctxId
-        ))
-      } else {
-        msg$depthDecrement()
-        msg$log("invalidateEnd:", msg$reactStr(reactId), msg$ctxStr(ctxId, type))
-        private$appendEntry(domain, list(
-          action = "invalidateEnd",
-          reactId = reactId,
-          ctxId = ctxId,
-          type = type
-        ))
-      }
-    },
-
-    invalidateLater = function(reactId, runningCtx, millis, domain) {
-      msg$log("invalidateLater: ", millis, "ms", msg$reactStr(reactId), msg$ctxStr(runningCtx))
-      private$appendEntry(domain, list(
-        action = "invalidateLater",
-        reactId = reactId,
-        ctxId = runningCtx,
-        millis = millis
-      ))
-    },
-
-    idle = function(domain = NULL) {
-      msg$log("idle")
-      private$appendEntry(domain, list(
-        action = "idle"
-      ))
-    },
-
-    asyncStart = function(domain = NULL) {
-      msg$log("asyncStart")
-      private$appendEntry(domain, list(
-        action = "asyncStart"
-      ))
-    },
-    asyncStop = function(domain = NULL) {
-      msg$log("asyncStop")
-      private$appendEntry(domain, list(
-        action = "asyncStop"
-      ))
-    },
-
-    freezeReactiveVal = function(reactId, domain) {
-      msg$log("freeze:", msg$reactStr(reactId))
-      private$appendEntry(domain, list(
-        action = "freeze",
-        reactId = reactId
-      ))
-    },
-    freezeReactiveKey = function(reactId, key, domain) {
-      self$freezeReactiveVal(self$keyIdStr(reactId, key), domain)
-    },
-
-    thawReactiveVal = function(reactId, domain) {
-      msg$log("thaw:", msg$reactStr(reactId))
-      private$appendEntry(domain, list(
-        action = "thaw",
-        reactId = reactId
-      ))
-    },
-    thawReactiveKey = function(reactId, key, domain) {
-      self$thawReactiveVal(self$keyIdStr(reactId, key), domain)
-    },
-
-    userMark = function(domain = NULL) {
-      msg$log("userMark")
-      private$appendEntry(domain, list(
-        action = "userMark"
-      ))
-    }
-
-  )
-)
-
-MessageLogger = R6Class(
-  "MessageLogger",
-  portable = FALSE,
-  public = list(
-    depth = 0L,
-    reactCache = list(),
-    option = "shiny.reactlog.console",
-
-    initialize = function(option = "shiny.reactlog.console", depth = 0L) {
-      if (!missing(depth)) self$depth <- depth
-      if (!missing(option)) self$option <- option
-    },
-
-    isLogging = function() {
-      isTRUE(getOption(self$option))
-    },
-    isNotLogging = function() {
-      ! isTRUE(getOption(self$option))
-    },
-    depthIncrement = function() {
-      if (self$isNotLogging()) return(NULL)
-      self$depth <- self$depth + 1L
-    },
-    depthDecrement = function() {
-      if (self$isNotLogging()) return(NULL)
-      self$depth <- self$depth - 1L
-    },
-    hasReact = function(reactId) {
-      if (self$isNotLogging()) return(FALSE)
-      !is.null(self$getReact(reactId))
-    },
-    getReact = function(reactId, force = FALSE) {
-      if (identical(force, FALSE) && self$isNotLogging()) return(NULL)
-      self$reactCache[[reactId]]
-    },
-    setReact = function(reactObj, force = FALSE) {
-      if (identical(force, FALSE) && self$isNotLogging()) return(NULL)
-      self$reactCache[[reactObj$reactId]] <- reactObj
-    },
-    shortenString = function(txt, n = 250) {
-      if (is.null(txt) || isTRUE(is.na(txt))) {
-        return("")
-      }
-      if (nchar(txt) > n) {
-        return(
-          paste0(substr(txt, 1, n - 3), "...")
-        )
-      }
-      return(txt)
-    },
-    singleLine = function(txt) {
-      gsub("[^\\]\\n", "\\\\n", txt)
-    },
-    valueStr = function(valueStr) {
-      paste0(
-        " '",  self$shortenString(self$singleLine(valueStr)), "'"
-      )
-    },
-    reactStr = function(reactId) {
-      if (self$isNotLogging()) return(NULL)
-      reactInfo <- self$getReact(reactId)
-      if (is.null(reactInfo)) return(" <UNKNOWN_REACTID>")
-      paste0(
-        " ", reactInfo$reactId, ":'", self$shortenString(self$singleLine(reactInfo$label)), "'"
-      )
-    },
-    typeStr = function(type = NULL) {
-      self$ctxStr(ctxId = NULL, type = type)
-    },
-    ctxStr = function(ctxId = NULL, type = NULL) {
-      if (self$isNotLogging()) return(NULL)
-      self$ctxPrevCtxStr(ctxId = ctxId, prevCtxId = NULL, type = type)
-    },
-    ctxPrevCtxStr = function(ctxId = NULL, prevCtxId = NULL, type = NULL, preCtxIdTxt = " in ") {
-      if (self$isNotLogging()) return(NULL)
-      paste0(
-        if (!is.null(ctxId)) paste0(preCtxIdTxt, ctxId),
-        if (!is.null(prevCtxId)) paste0(" from ", prevCtxId),
-        if (!is.null(type) && !identical(type, "other")) paste0(" - ", type)
-      )
-    },
-    log = function(...) {
-      if (self$isNotLogging()) return(NULL)
-      msg <- paste0(
-        paste0(rep("= ", depth), collapse = ""), "- ", paste0(..., collapse = ""),
-        collapse = ""
-      )
-      message(msg)
-    }
-  )
-)
+.graphInvalidate <- function(id, domain) {
+  .graphAppend(list(action='invalidate', id=id), domain)
+}
 
 #' @include stack.R
-rLog <- RLog$new("shiny.reactlog", "shiny.reactlog.console")
+.graphStack <- Stack$new()

R/input-date.R

@@ -34,17 +34,18 @@
 #' @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 "ar-tn", "ar", "az", "bg", "bn", "br", "bs",
+#'   "ca", "cs", "cy", "da", "de", "el", "en-AU", "en-CA", "en-GB", "en-IE",
+#'   "en-NZ", "en-ZA", "eo", "es", "et", "eu", "fa", "fi", "fo", "fr-CH", "fr",
+#'   "gl", "he", "hi", "hr", "hu", "hy", "id", "is", "it-CH", "it", "ja", "ka",
+#'   "kh", "kk", "km", "ko", "kr", "lt", "lv", "me", "mk", "mn", "ms", "nl-BE",
+#'   "nl", "no", "oc", "pl", "pt-BR", "pt", "ro", "rs-latin", "rs", "ru", "si",
+#'   "sk", "sl", "sq", "sr-latin", "sr", "sv", "sw", "ta", "tg", "th", "tk",
+#'   "tr", "uk", "uz-cyrl", "uz-latn", "vi", "zh-CN", and "zh-TW".
 #' @param autoclose Whether or not to close the datepicker immediately when a
 #'   date is selected.
-#' @param datesdisabled Which dates should be disabled. Either a Date object,
-#' or a string in \code{yyyy-mm-dd} format.
+#' @param datesdisabled Which dates should be disabled. Either a Date object, or
+#'   a string in \code{yyyy-mm-dd} format.
 #' @param daysofweekdisabled Days of the week that should be disabled. Should be
 #'   a integer vector with values from 0 (Sunday) to 6 (Saturday).
 #'
@@ -78,7 +79,7 @@
 #'
 #'   # Disable Mondays and Tuesdays.
 #'   dateInput("date7", "Date:", daysofweekdisabled = c(1,2)),
-#'   
+#'
 #'   # Disable specific dates.
 #'   dateInput("date8", "Date:", value = "2012-02-29",
 #'             datesdisabled = c("2012-03-01", "2012-03-02"))
@@ -129,7 +130,9 @@ dateInput <- function(inputId, label, value = NULL, min = NULL, max = NULL,
 }
 
 datePickerDependency <- htmlDependency(
-  "bootstrap-datepicker", "1.6.4", c(href = "shared/datepicker"),
+  "bootstrap-datepicker",
+  "1.8.0",
+  c(href = "shared/datepicker"),
   script = "js/bootstrap-datepicker.min.js",
   stylesheet = "css/bootstrap-datepicker3.min.css",
   # Need to enable noConflict mode. See #1346.

R/input-select.R

@@ -5,7 +5,7 @@
 #'
 #' By default, \code{selectInput()} and \code{selectizeInput()} use the
 #' JavaScript library \pkg{selectize.js}
-#' (\url{https://github.com/selectize/selectize.js}) instead of the basic
+#' (\url{https://github.com/selectize/selectize.js}) to instead of the basic
 #' select input element. To use the standard HTML select input element, use
 #' \code{selectInput()} with \code{selectize=FALSE}.
 #'

R/middleware-shiny.R

@@ -2,43 +2,19 @@
 NULL
 
 reactLogHandler <- function(req) {
-  if (! rLog$isLogging()) {
+  if (!identical(req$PATH_INFO, '/reactlog'))
+    return(NULL)
+
+  if (!isTRUE(getOption('shiny.reactlog'))) {
     return(NULL)
   }
 
-  if (identical(req$PATH_INFO, "/reactlog/mark")) {
-    sessionToken <- parseQueryString(req$QUERY_STRING)$s
-    shinysession <- appsByToken$get(sessionToken)
+  sessionToken <- parseQueryString(req$QUERY_STRING)$s
 
-    # log time
-    withReactiveDomain(shinysession, {
-      rLog$userMark(getDefaultReactiveDomain())
-    })
-
-    return(httpResponse(
-      status = 200,
-      content = "marked",
-      content_type = "text/plain"
-    ))
-
-  } else if (identical(req$PATH_INFO, "/reactlog")){
-
-    sessionToken <- parseQueryString(req$QUERY_STRING)$s
-
-    # `renderReactLog` will check/throw if reactlog doesn't exist
-    reactlogFile <- renderReactlog(sessionToken)
-
-    return(httpResponse(
-      status = 200,
-      content = list(
-        file = reactlogFile,
-        owned = TRUE
-      )
-    ))
-
-  } else {
-    return(NULL)
-  }
+  return(httpResponse(
+    status=200,
+    content=list(file=renderReactLog(sessionToken), owned=TRUE)
+  ))
 }
 
 sessionHandler <- function(req) {

R/middleware.R

@@ -321,20 +321,21 @@ HandlerManager <- R6Class("HandlerManager",
               }
             )
           },
-          loadSharedSecret()
+          getOption('shiny.sharedSecret')
         ),
         onWSOpen = function(ws) {
           return(wsHandlers$invoke(ws))
         }
       )
     },
-    .httpServer = function(handler, checkSharedSecret) {
+    .httpServer = function(handler, sharedSecret) {
       filter <- getOption('shiny.http.response.filter')
       if (is.null(filter))
         filter <- function(req, response) response
 
       function(req) {
-        if (!checkSharedSecret(req$HTTP_SHINY_SHARED_SECRET)) {
+        if (!is.null(sharedSecret)
+          && !identical(sharedSecret, req$HTTP_SHINY_SHARED_SECRET)) {
           return(list(status=403,
             body='<h1>403 Forbidden</h1><p>Shared secret mismatch</p>',
             headers=list('Content-Type' = 'text/html')))

R/react.R

@@ -16,15 +16,12 @@ processId <- local({
   }
 })
 
-#' @include graph.R
 Context <- R6Class(
   'Context',
   portable = FALSE,
   class = FALSE,
   public = list(
     id = character(0),
-    .reactId = character(0),
-    .reactType = "other",
     .label = character(0),      # For debug purposes
     .invalidated = FALSE,
     .invalidateCallbacks = list(),
@@ -32,18 +29,12 @@ Context <- R6Class(
     .domain = NULL,
     .pid = NULL,
 
-    initialize = function(
-      domain, label='', type='other', prevId='',
-      reactId = rLog$noReactId,
-      id = .getReactiveEnvironment()$nextId() # For dummy context
-    ) {
-      id <<- id
+    initialize = function(domain, label='', type='other', prevId='') {
+      id <<- .getReactiveEnvironment()$nextId()
       .label <<- label
       .domain <<- domain
       .pid <<- processId()
-      .reactId <<- reactId
-      .reactType <<- type
-      rLog$createContext(id, label, type, prevId, domain)
+      .graphCreateContext(id, label, type, prevId, domain)
     },
     run = function(func) {
       "Run the provided function under this context."
@@ -51,8 +42,10 @@ Context <- R6Class(
       promises::with_promise_domain(reactivePromiseDomain(), {
         withReactiveDomain(.domain, {
           env <- .getReactiveEnvironment()
-          rLog$enter(.reactId, id, .reactType, .domain)
-          on.exit(rLog$exit(.reactId, id, .reactType, .domain), add = TRUE)
+          .graphEnterContext(id)
+          on.exit({
+            .graphExitContext(id, domain = .domain)
+          }, add = TRUE)
           env$runWith(self, func)
         })
       })
@@ -69,9 +62,7 @@ Context <- R6Class(
         return()
       .invalidated <<- TRUE
 
-      rLog$invalidateStart(.reactId, id, .reactType, .domain)
-      on.exit(rLog$invalidateEnd(.reactId, id, .reactType, .domain), add = TRUE)
-
+      .graphInvalidate(id, .domain)
       lapply(.invalidateCallbacks, function(func) {
         func()
       })
@@ -160,10 +151,7 @@ ReactiveEnvironment <- R6Class(
       # If already in a flush, don't start another one
       if (.inFlush) return(invisible(FALSE))
       .inFlush <<- TRUE
-      on.exit({
-        .inFlush <<- FALSE
-        rLog$idle(domain = NULL)
-      })
+      on.exit(.inFlush <<- FALSE)
 
       while (hasPendingFlush()) {
         ctx <- .pendingFlush$dequeue()
@@ -195,16 +183,18 @@ flushReact <- function() {
 getCurrentContext <- function() {
   .getReactiveEnvironment()$currentContext()
 }
-hasCurrentContext <- function() {
-  !is.null(.getReactiveEnvironment()$.currentContext)
-}
 
-getDummyContext <- function() {
-  Context$new(
-    getDefaultReactiveDomain(), '[none]', type = 'isolate',
-    id = "Dummy", reactId = rLog$dummyReactId
-  )
-}
+getDummyContext <- function() {}
+local({
+  dummyContext <- NULL
+  getDummyContext <<- function() {
+    if (is.null(dummyContext)) {
+      dummyContext <<- Context$new(getDefaultReactiveDomain(), '[none]',
+        type='isolate')
+    }
+    return(dummyContext)
+  }
+})
 
 wrapForContext <- function(func, ctx) {
   force(func)

R/reactives.R

@@ -6,43 +6,26 @@ Dependents <- R6Class(
   portable = FALSE,
   class = FALSE,
   public = list(
-    .reactId = character(0),
     .dependents = 'Map',
 
-    initialize = function(reactId = NULL) {
-      .reactId <<- reactId
+    initialize = function() {
       .dependents <<- Map$new()
     },
-    # ... ignored, use to be depLabel and depId, not used anymore
-    register = function(...) {
-      ctx <- getCurrentContext()
+    register = function(depId=NULL, depLabel=NULL) {
+      ctx <- .getReactiveEnvironment()$currentContext()
       if (!.dependents$containsKey(ctx$id)) {
-
-        # must wrap in if statement as ctx react id could be NULL
-        #   if options(shiny.suppressMissingContextError = TRUE)
-        if (is.character(.reactId) && is.character(ctx$.reactId)) {
-          rLog$dependsOn(ctx$.reactId, .reactId, ctx$id, ctx$.domain)
-        }
-
         .dependents$set(ctx$id, ctx)
-
         ctx$onInvalidate(function() {
-          rLog$dependsOnRemove(ctx$.reactId, .reactId, ctx$id, ctx$.domain)
           .dependents$remove(ctx$id)
         })
+
+        if (!is.null(depId) && nchar(depId) > 0)
+          .graphDependsOnId(ctx$id, depId)
+        if (!is.null(depLabel))
+          .graphDependsOn(ctx$id, depLabel)
       }
     },
-    # at times, the context is run in a ctx$onInvalidate(...) which has no runtime context
-    invalidate = function(log = TRUE) {
-      if (isTRUE(log)) {
-
-        domain <- getDefaultReactiveDomain()
-        rLog$invalidateStart(.reactId, NULL, "other", domain)
-        on.exit(
-          rLog$invalidateEnd(.reactId, NULL, "other", domain),
-          add = TRUE
-        )
-      }
+    invalidate = function() {
       lapply(
         .dependents$values(),
         function(ctx) {
@@ -61,7 +44,6 @@ ReactiveVal <- R6Class(
   'ReactiveVal',
   portable = FALSE,
   private = list(
-    reactId = character(0),
     value = NULL,
     label = NULL,
     frozen = FALSE,
@@ -69,15 +51,13 @@ ReactiveVal <- R6Class(
   ),
   public = list(
     initialize = function(value, label = NULL) {
-      reactId <- nextGlobalReactId()
-      private$reactId <- reactId
       private$value <- value
       private$label <- label
-      private$dependents <- Dependents$new(reactId = private$reactId)
-      rLog$define(private$reactId, value, private$label, type = "reactiveVal", getDefaultReactiveDomain())
+      private$dependents <- Dependents$new()
+      .graphValueChange(private$label, value)
     },
     get = function() {
-      private$dependents$register()
+      private$dependents$register(depLabel = private$label)
 
       if (private$frozen)
         reactiveStop()
@@ -88,8 +68,8 @@ ReactiveVal <- R6Class(
       if (identical(private$value, value)) {
         return(invisible(FALSE))
       }
-      rLog$valueChange(private$reactId, value, getDefaultReactiveDomain())
       private$value <- value
+      .graphValueChange(private$label, value)
       private$dependents$invalidate()
       invisible(TRUE)
     },
@@ -97,14 +77,12 @@ ReactiveVal <- R6Class(
       if (is.null(session)) {
         stop("Can't freeze a reactiveVal without a reactive domain")
       }
-      rLog$freezeReactiveVal(private$reactId, session)
       session$onFlushed(function() {
-        self$thaw(session)
+        self$thaw()
       })
       private$frozen <- TRUE
     },
-    thaw = function(session = getDefaultReactiveDomain()) {
-      rLog$thawReactiveVal(private$reactId, session)
+    thaw = function() {
       private$frozen <- FALSE
     },
     isFrozen = function() {
@@ -140,7 +118,7 @@ ReactiveVal <- R6Class(
 #'
 #' @param value An optional initial value.
 #' @param label An optional label, for debugging purposes (see
-#'   \code{\link{reactlog}}). If missing, a label will be automatically
+#'   \code{\link{showReactLog}}). If missing, a label will be automatically
 #'   created.
 #'
 #' @return A function. Call the function with no arguments to (reactively) read
@@ -290,7 +268,6 @@ ReactiveValues <- R6Class(
   portable = FALSE,
   public = list(
     # For debug purposes
-    .reactId = character(0),
     .label = character(0),
     .values = 'environment',
     .metadata = 'environment',
@@ -302,48 +279,29 @@ ReactiveValues <- R6Class(
     # Dependents for all values
     .valuesDeps = 'Dependents',
     .dedupe = logical(0),
-    # Key, asList(), or names() have been retrieved
-    .hasRetrieved = list(),
 
-
-    initialize = function(
-      dedupe = TRUE,
-      label = paste0('reactiveValues', p_randomInt(1000, 10000))
-    ) {
-      .reactId <<- nextGlobalReactId()
-      .label <<- label
+    initialize = function(dedupe = TRUE) {
+      .label <<- paste('reactiveValues',
+                       p_randomInt(1000, 10000),
+                       sep="")
       .values <<- new.env(parent=emptyenv())
       .metadata <<- new.env(parent=emptyenv())
       .dependents <<- new.env(parent=emptyenv())
-      .hasRetrieved <<- list(names = FALSE, asListAll = FALSE, asList = FALSE, keys = list())
-      .namesDeps <<- Dependents$new(reactId = rLog$namesIdStr(.reactId))
-      .allValuesDeps <<- Dependents$new(reactId = rLog$asListAllIdStr(.reactId))
-      .valuesDeps <<- Dependents$new(reactId = rLog$asListIdStr(.reactId))
+      .namesDeps <<- Dependents$new()
+      .allValuesDeps <<- Dependents$new()
+      .valuesDeps <<- Dependents$new()
       .dedupe <<- dedupe
     },
 
     get = function(key) {
-      # get value right away to use for logging
-      if (!exists(key, envir=.values, inherits=FALSE))
-        keyValue <- NULL
-      else
-        keyValue <- .values[[key]]
-
       # Register the "downstream" reactive which is accessing this value, so
       # that we know to invalidate them when this value changes.
-      ctx <- getCurrentContext()
+      ctx <- .getReactiveEnvironment()$currentContext()
       dep.key <- paste(key, ':', ctx$id, sep='')
       if (!exists(dep.key, envir=.dependents, inherits=FALSE)) {
-        reactKeyId <- rLog$keyIdStr(.reactId, key)
-
-        if (!isTRUE(.hasRetrieved$keys[[key]])) {
-          rLog$defineKey(.reactId, keyValue, key, .label, ctx$.domain)
-          .hasRetrieved$keys[[key]] <<- TRUE
-        }
-        rLog$dependsOnKey(ctx$.reactId, .reactId, key, ctx$id, ctx$.domain)
+        .graphDependsOn(ctx$id, sprintf('%s$%s', .label, key))
         .dependents[[dep.key]] <- ctx
         ctx$onInvalidate(function() {
-          rLog$dependsOnKeyRemove(ctx$.reactId, .reactId, key, ctx$id, ctx$.domain)
           rm(list=dep.key, envir=.dependents, inherits=FALSE)
         })
       }
@@ -351,82 +309,34 @@ ReactiveValues <- R6Class(
       if (isFrozen(key))
         reactiveStop()
 
-      keyValue
+      if (!exists(key, envir=.values, inherits=FALSE))
+        NULL
+      else
+        .values[[key]]
     },
 
     set = function(key, value) {
-      # if key exists
-      #   if it is the same value, return
-      #
-      # update value of `key`
-      #
-      # if key exists
-      #   if `key` has been read,
-      #     log `update key`
-      #     ## (invalidate key later in code)
-      # else # if new key
-      #   if `names()` have been read,
-      #     log `update names()`
-      #     invalidate `names()`
-      #
-      # if hidden
-      #   if asListAll has been read,
-      #     log `update asList(all.names = TRUE)`
-      #     invalidate `asListAll`
-      # else # not hidden
-      #   if asList has been read,
-      #     log `update asList()`
-      #     invalidate `asList`
-      #
-      # update value of `key`
-      # invalidate all deps of `key`
-
-      domain <- getDefaultReactiveDomain()
       hidden <- substr(key, 1, 1) == "."
 
-      key_exists <- exists(key, envir=.values, inherits=FALSE)
-
-      if (key_exists) {
+      if (exists(key, envir=.values, inherits=FALSE)) {
         if (.dedupe && identical(.values[[key]], value)) {
           return(invisible())
         }
       }
+      else {
+        .namesDeps$invalidate()
+      }
+
+      if (hidden)
+        .allValuesDeps$invalidate()
+      else
+        .valuesDeps$invalidate()
 
-      # set the value for better logging
       .values[[key]] <- value
 
-      if (key_exists) {
-        # key has been depended upon (can not happen if the key is being set)
-        if (isTRUE(.hasRetrieved$keys[[key]])) {
-          rLog$valueChangeKey(.reactId, key, value, domain)
-          keyReactId <- rLog$keyIdStr(.reactId, key)
-          rLog$invalidateStart(keyReactId, NULL, "other", domain)
-          on.exit(
-            rLog$invalidateEnd(keyReactId, NULL, "other", domain),
-            add = TRUE
-          )
-        }
-
-      } else {
-        # only invalidate if there are deps
-        if (isTRUE(.hasRetrieved$names)) {
-          rLog$valueChangeNames(.reactId, ls(.values, all.names = TRUE), domain)
-          .namesDeps$invalidate()
-        }
-      }
-
-      if (hidden) {
-        if (isTRUE(.hasRetrieved$asListAll)) {
-          rLog$valueChangeAsListAll(.reactId, as.list(.values, all.names = TRUE), domain)
-          .allValuesDeps$invalidate()
-        }
-      } else {
-        if (isTRUE(.hasRetrieved$asList)) {
-          # leave as is. both object would be registered to the listening object
-          rLog$valueChangeAsList(.reactId, as.list(.values, all.names = FALSE), domain)
-          .valuesDeps$invalidate()
-        }
-      }
+      .graphValueChange(sprintf('names(%s)', .label), ls(.values, all.names=TRUE))
+      .graphValueChange(sprintf('%s (all)', .label), as.list(.values))
+      .graphValueChange(sprintf('%s$%s', .label, key), value)
 
       dep.keys <- objects(
         envir=.dependents,
@@ -451,14 +361,10 @@ ReactiveValues <- R6Class(
     },
 
     names = function() {
-      nameValues <- ls(.values, all.names=TRUE)
-      if (!isTRUE(.hasRetrieved$names)) {
-        domain <- getDefaultReactiveDomain()
-        rLog$defineNames(.reactId, nameValues, .label, domain)
-        .hasRetrieved$names <<- TRUE
-      }
+      .graphDependsOn(.getReactiveEnvironment()$currentContext()$id,
+                      sprintf('names(%s)', .label))
       .namesDeps$register()
-      return(nameValues)
+      return(ls(.values, all.names=TRUE))
     },
 
     # Get a metadata value. Does not trigger reactivity.
@@ -483,14 +389,10 @@ ReactiveValues <- R6Class(
     # Mark a value as frozen If accessed while frozen, a shiny.silent.error will
     # be thrown.
     freeze = function(key) {
-      domain <- getDefaultReactiveDomain()
-      rLog$freezeReactiveKey(.reactId, key, domain)
       setMeta(key, "frozen", TRUE)
     },
 
     thaw = function(key) {
-      domain <- getDefaultReactiveDomain()
-      rLog$thawReactiveKey(.reactId, key, domain)
       setMeta(key, "frozen", NULL)
     },
 
@@ -499,27 +401,19 @@ ReactiveValues <- R6Class(
     },
 
     toList = function(all.names=FALSE) {
-      listValue <- as.list(.values, all.names=all.names)
-      if (all.names) {
-        if (!isTRUE(.hasRetrieved$asListAll)) {
-          domain <- getDefaultReactiveDomain()
-          rLog$defineAsListAll(.reactId, listValue, .label, domain)
-          .hasRetrieved$asListAll <<- TRUE
-        }
+      .graphDependsOn(.getReactiveEnvironment()$currentContext()$id,
+                      sprintf('%s (all)', .label))
+      if (all.names)
         .allValuesDeps$register()
-      }
 
-      if (!isTRUE(.hasRetrieved$asList)) {
-        domain <- getDefaultReactiveDomain()
-        # making sure the value being recorded is with `all.names = FALSE`
-        rLog$defineAsList(.reactId, as.list(.values, all.names=FALSE), .label, domain)
-        .hasRetrieved$asList <<- TRUE
-      }
       .valuesDeps$register()
 
-      return(listValue)
-    }
+      return(as.list(.values, all.names=all.names))
+    },
 
+    .setLabel = function(label) {
+      .label <<- label
+    }
   )
 )
 
@@ -668,6 +562,11 @@ as.list.reactivevalues <- function(x, all.names=FALSE, ...) {
   reactiveValuesToList(x, all.names)
 }
 
+# For debug purposes
+.setLabel <- function(x, label) {
+  .subset2(x, 'impl')$.setLabel(label)
+}
+
 #' Convert a reactivevalues object to a list
 #'
 #' This function does something similar to what you might \code{\link[base]{as.list}}
@@ -790,7 +689,6 @@ Observable <- R6Class(
   'Observable',
   portable = FALSE,
   public = list(
-    .reactId = character(0),
     .origFunc = 'function',
     .func = 'function',
     .label = character(0),
@@ -821,18 +719,16 @@ Observable <- R6Class(
         funcLabel <- paste0("<reactive:", label, ">")
       }
 
-      .reactId <<- nextGlobalReactId()
       .origFunc <<- func
       .func <<- wrapFunctionLabel(func, funcLabel,
         ..stacktraceon = ..stacktraceon)
       .label <<- label
       .domain <<- domain
-      .dependents <<- Dependents$new(reactId = .reactId)
+      .dependents <<- Dependents$new()
       .invalidated <<- TRUE
       .running <<- FALSE
       .execCount <<- 0L
       .mostRecentCtxId <<- ""
-      rLog$define(.reactId, .value, .label, type = "observable", .domain)
     },
     getValue = function() {
       .dependents$register()
@@ -843,6 +739,8 @@ Observable <- R6Class(
         )
       }
 
+      .graphDependsOnId(getCurrentContext()$id, .mostRecentCtxId)
+
       if (.error) {
         stop(.value)
       }
@@ -858,12 +756,12 @@ Observable <- R6Class(
     },
     .updateValue = function() {
       ctx <- Context$new(.domain, .label, type = 'observable',
-                         prevId = .mostRecentCtxId, reactId = .reactId)
+                         prevId = .mostRecentCtxId)
       .mostRecentCtxId <<- ctx$id
       ctx$onInvalidate(function() {
         .invalidated <<- TRUE
         .value <<- NULL # Value can be GC'd, it won't be read once invalidated
-        .dependents$invalidate(log = FALSE)
+        .dependents$invalidate()
       })
       .execCount <<- .execCount + 1L
 
@@ -1037,7 +935,6 @@ Observer <- R6Class(
   'Observer',
   portable = FALSE,
   public = list(
-    .reactId = character(0),
     .func = 'function',
     .label = character(0),
     .domain = 'ANY',
@@ -1081,14 +978,11 @@ Observer <- R6Class(
       .autoDestroyHandle <<- NULL
       setAutoDestroy(autoDestroy)
 
-      .reactId <<- nextGlobalReactId()
-      rLog$defineObserver(.reactId, .label, .domain)
-
       # Defer the first running of this until flushReact is called
       .createContext()$invalidate()
     },
     .createContext = function() {
-      ctx <- Context$new(.domain, .label, type='observer', prevId=.prevId, reactId = .reactId)
+      ctx <- Context$new(.domain, .label, type='observer', prevId=.prevId)
       .prevId <<- ctx$id
 
       if (!is.null(.ctx)) {
@@ -1499,10 +1393,6 @@ reactiveTimer <- function(intervalMs=1000, session = getDefaultReactiveDomain())
   # callback below is fired (see #1621).
   force(session)
 
-  # TODO-barret - ## leave alone for now
-  # reactId <- nextGlobalReactId()
-  # rLog$define(reactId, paste0("timer(", intervalMs, ")"))
-
   dependents <- Map$new()
   timerHandle <- scheduleTask(intervalMs, function() {
     # Quit if the session is closed
@@ -1512,23 +1402,14 @@ reactiveTimer <- function(intervalMs=1000, session = getDefaultReactiveDomain())
 
     timerHandle <<- scheduleTask(intervalMs, sys.function())
 
-    doInvalidate <- function() {
+    session$cycleStartAction(function() {
       lapply(
         dependents$values(),
         function(dep.ctx) {
           dep.ctx$invalidate()
           NULL
         })
-    }
-
-    if (!is.null(session)) {
-      # If this timer belongs to a session, we must wait until the next cycle is
-      # ready to invalidate.
-      session$cycleStartAction(doInvalidate)
-    } else {
-      # If this timer doesn't belong to a session, we invalidate right away.
-      doInvalidate()
-    }
+    })
   })
 
   if (!is.null(session)) {
@@ -1536,15 +1417,14 @@ reactiveTimer <- function(intervalMs=1000, session = getDefaultReactiveDomain())
   }
 
   return(function() {
-    newValue <- Sys.time()
-    ctx <- getCurrentContext()
+    ctx <- .getReactiveEnvironment()$currentContext()
     if (!dependents$containsKey(ctx$id)) {
       dependents$set(ctx$id, ctx)
       ctx$onInvalidate(function() {
         dependents$remove(ctx$id)
       })
     }
-    return(newValue)
+    return(Sys.time())
   })
 }
 
@@ -1603,12 +1483,8 @@ reactiveTimer <- function(intervalMs=1000, session = getDefaultReactiveDomain())
 #' }
 #' @export
 invalidateLater <- function(millis, session = getDefaultReactiveDomain()) {
-
   force(session)
-
-  ctx <- getCurrentContext()
-  rLog$invalidateLater(ctx$.reactId, ctx$id, millis, session)
-
+  ctx <- .getReactiveEnvironment()$currentContext()
   timerHandle <- scheduleTask(millis, function() {
     if (is.null(session)) {
       ctx$invalidate()
@@ -1873,12 +1749,7 @@ reactiveFileReader <- function(intervalMillis, session, filePath, readFunc, ...)
 #' # input object, like input$x
 #' @export
 isolate <- function(expr) {
-  if (hasCurrentContext()) {
-    reactId <- getCurrentContext()$.reactId
-  } else {
-    reactId <- rLog$noReactId
-  }
-  ctx <- Context$new(getDefaultReactiveDomain(), '[isolate]', type='isolate', reactId = reactId)
+  ctx <- Context$new(getDefaultReactiveDomain(), '[isolate]', type='isolate')
   on.exit(ctx$invalidate())
   # Matching ..stacktraceon../..stacktraceoff.. pair
   ..stacktraceoff..(ctx$run(function() {

R/render-cached-plot.R

@@ -476,64 +476,62 @@ renderCachedPlot <- function(expr,
           }
         )
       },
-      function(possiblyAsyncResult) {
-        hybrid_chain(possiblyAsyncResult, function(result) {
-          width      <- result$width
-          height     <- result$height
-          pixelratio <- result$pixelratio
+      function(result) {
+        width      <- result$width
+        height     <- result$height
+        pixelratio <- result$pixelratio
 
-          # Three possibilities when we get here:
-          # 1. There was a cache hit. No need to set a value in the cache.
-          # 2. There was a cache miss, and the plotObj is already the correct
-          #    size (because drawReactive re-executed). In this case, we need
-          #    to cache it.
-          # 3. There was a cache miss, and the plotObj was not the corect size.
-          #    In this case, we need to replay the display list, and then cache
-          #    the result.
-          if (!result$cacheHit) {
-            # If the image is already the correct size, this just returns the
-            # object unchanged.
-            result$plotObj <- do.call("resizeSavedPlot", c(
-              list(
-                name,
-                shinysession,
-                result$plotObj,
-                width,
-                height,
-                pixelratio,
-                res
-              ),
-              args
-            ))
+        # Three possibilities when we get here:
+        # 1. There was a cache hit. No need to set a value in the cache.
+        # 2. There was a cache miss, and the plotObj is already the correct
+        #    size (because drawReactive re-executed). In this case, we need
+        #    to cache it.
+        # 3. There was a cache miss, and the plotObj was not the corect size.
+        #    In this case, we need to replay the display list, and then cache
+        #    the result.
+        if (!result$cacheHit) {
+          # If the image is already the correct size, this just returns the
+          # object unchanged.
+          result$plotObj <- do.call("resizeSavedPlot", c(
+            list(
+              name,
+              shinysession,
+              result$plotObj,
+              width,
+              height,
+              pixelratio,
+              res
+            ),
+            args
+          ))
 
-            # Save a cached copy of the plotObj. The recorded displaylist for
-            # the plot can't be serialized and restored properly within the same
-            # R session, so we NULL it out before saving. (The image data and
-            # other metadata be saved and restored just fine.) Displaylists can
-            # also be very large (~1.5MB for a basic ggplot), and they would not
-            # be commonly used. Note that displaylist serialization was fixed in
-            # revision 74506 (2e6c669), and should be in R 3.6. A MemoryCache
-            # doesn't need to serialize objects, so it could actually save a
-            # display list, but for the reasons listed previously, it's
-            # generally not worth it.
-            # The plotResult is not the same as the recordedPlot (it is used to
-            # retrieve coordmap information for ggplot2 objects) but it is only
-            # used in conjunction with the recordedPlot, and we'll remove it
-            # because it can be quite large.
-            result$plotObj$plotResult <- NULL
-            result$plotObj$recordedPlot <- NULL
-            cache$set(result$key, result$plotObj)
-          }
+          # Save a cached copy of the plotObj. The recorded displaylist for
+          # the plot can't be serialized and restored properly within the same
+          # R session, so we NULL it out before saving. (The image data and
+          # other metadata be saved and restored just fine.) Displaylists can
+          # also be very large (~1.5MB for a basic ggplot), and they would not
+          # be commonly used. Note that displaylist serialization was fixed in
+          # revision 74506 (2e6c669), and should be in R 3.6. A MemoryCache
+          # doesn't need to serialize objects, so it could actually save a
+          # display list, but for the reasons listed previously, it's
+          # generally not worth it.
+          # The plotResult is not the same as the recordedPlot (it is used to
+          # retrieve coordmap information for ggplot2 objects) but it is only
+          # used in conjunction with the recordedPlot, and we'll remove it
+          # because it can be quite large.
+          result$plotObj$plotResult <- NULL
+          result$plotObj$recordedPlot <- NULL
+          cache$set(result$key, result$plotObj)
+        }
 
-          img <- result$plotObj$img
-          # Replace exact pixel dimensions; instead, the max-height and
-          # max-width will be set to 100% from CSS.
-          img$class <- "shiny-scalable"
-          img$width  <- NULL
-          img$height <- NULL
+        img <- result$plotObj$img
+        # Replace exact pixel dimensions; instead, the max-height and
+        # max-width will be set to 100% from CSS.
+        img$class <- "shiny-scalable"
+        img$width  <- NULL
+        img$height <- NULL
 
-          img
-        })
+        img
       }
     )
   }

R/server.R

@@ -22,7 +22,6 @@ registerClient <- function(client) {
 }
 
 
-.globals$resourcePaths <- list()
 .globals$resources <- list()
 
 .globals$showcaseDefault <- 0
@@ -42,6 +41,11 @@ registerClient <- function(client) {
 #' @param directoryPath The directory that contains the static resources to be
 #'   served.
 #'
+#' @details You can call \code{addResourcePath} multiple times for a given
+#'   \code{prefix}; only the most recent value will be retained. If the
+#'   normalized \code{directoryPath} is different than the directory that's
+#'   currently mapped to the \code{prefix}, a warning will be issued.
+#'
 #' @seealso \code{\link{singleton}}
 #'
 #' @examples
@@ -62,65 +66,30 @@ addResourcePath <- function(prefix, directoryPath) {
         "`prefix` = '", prefix, "'; `directoryPath` = '" , directoryPath, "'")
     }
   )
-
-  # If a shiny app is currently running, dynamically register this path with
-  # the corresponding httpuv server object.
-  if (!is.null(getShinyOption("server")))
-  {
-    getShinyOption("server")$setStaticPath(.list = stats::setNames(normalizedPath, prefix))
-  }
-
-  # .globals$resourcePaths and .globals$resources persist across runs of applications.
-  .globals$resourcePaths[[prefix]] <- staticPath(normalizedPath)
-  # This is necessary because resourcePaths is only for serving assets out of C++;
-  # to support subapps, we also need assets to be served out of R, because those
-  # URLs are rewritten by R code (i.e. routeHandler) before they can be matched to
-  # a resource path.
   .globals$resources[[prefix]] <- list(
     directoryPath = normalizedPath,
     func = staticHandler(normalizedPath)
   )
 }
 
-# This function handles any GET request with two or more path elements where the
-# first path element matches a prefix that was previously added using
-# addResourcePath().
-#
-# For example, if `addResourcePath("foo", "~/bar")` was called, then a GET
-# request for /foo/one/two.html would rewrite the PATH_INFO as /one/two.html and
-# send it to the resource path function for "foo". As of this writing, that
-# function will always be a staticHandler, which serves up a file if it exists
-# and NULL if it does not.
-#
-# Since Shiny 1.3.x, assets registered via addResourcePath should mostly be
-# served out of httpuv's native static file serving features. However, in the
-# specific case of subapps, the R code path must be used, because subapps insert
-# a giant random ID into the beginning of the URL that must be stripped off by
-# an R route handler (see addSubApp()).
 resourcePathHandler <- function(req) {
   if (!identical(req$REQUEST_METHOD, 'GET'))
     return(NULL)
 
-  # e.g. "/foo/one/two.html"
   path <- req$PATH_INFO
 
   match <- regexpr('^/([^/]+)/', path, perl=TRUE)
   if (match == -1)
     return(NULL)
   len <- attr(match, 'capture.length')
-  # e.g. "foo"
   prefix <- substr(path, 2, 2 + len - 1)
 
   resInfo <- .globals$resources[[prefix]]
   if (is.null(resInfo))
     return(NULL)
 
-  # e.g. "/one/two.html"
   suffix <- substr(path, 2 + len, nchar(path))
 
-  # Create a new request that's a clone of the current request, but adjust
-  # PATH_INFO and SCRIPT_NAME to reflect that we have already matched the first
-  # path element (e.g. "/foo"). See routeHandler() for more info.
   subreq <- as.environment(as.list(req, all.names=TRUE))
   subreq$PATH_INFO <- suffix
   subreq$SCRIPT_NAME <- paste(subreq$SCRIPT_NAME, substr(path, 1, 2 + len), sep='')
@@ -218,7 +187,7 @@ createAppHandlers <- function(httpHandlers, serverFuncSource) {
   # This value, if non-NULL, must be present on all HTTP and WebSocket
   # requests as the Shiny-Shared-Secret header or else access will be
   # denied (403 response for HTTP, and instant close for websocket).
-  checkSharedSecret <- loadSharedSecret()
+  sharedSecret <- getOption('shiny.sharedSecret')
 
   appHandlers <- list(
     http = joinHandlers(c(
@@ -226,10 +195,10 @@ createAppHandlers <- function(httpHandlers, serverFuncSource) {
       httpHandlers,
       sys.www.root,
       resourcePathHandler,
-      reactLogHandler
-    )),
+      reactLogHandler)),
     ws = function(ws) {
-      if (!checkSharedSecret(ws$request$HTTP_SHINY_SHARED_SECRET)) {
+      if (!is.null(sharedSecret)
+          && !identical(sharedSecret, ws$request$HTTP_SHINY_SHARED_SECRET)) {
         ws$close()
         return(TRUE)
       }
@@ -448,27 +417,6 @@ startApp <- function(appObj, port, host, quiet) {
   handlerManager$addHandler(appHandlers$http, "/", tail = TRUE)
   handlerManager$addWSHandler(appHandlers$ws, "/", tail = TRUE)
 
-  httpuvApp <- handlerManager$createHttpuvApp()
-  httpuvApp$staticPaths <- c(
-    appObj$staticPaths,
-    list(
-      # Always handle /session URLs dynamically, even if / is a static path.
-      "session" = excludeStaticPath(),
-      "shared" = system.file(package = "shiny", "www", "shared")
-    ),
-    .globals$resourcePaths
-  )
-  httpuvApp$staticPathOptions <- httpuv::staticPathOptions(
-    html_charset = "utf-8",
-    headers = list("X-UA-Compatible" = "IE=edge,chrome=1"),
-    validation =
-      if (!is.null(getOption("shiny.sharedSecret"))) {
-        sprintf('"Shiny-Shared-Secret" == "%s"', getOption("shiny.sharedSecret"))
-      } else {
-        character(0)
-      }
-  )
-
   if (is.numeric(port) || is.integer(port)) {
     if (!quiet) {
       hostString <- host
@@ -476,7 +424,7 @@ startApp <- function(appObj, port, host, quiet) {
         hostString <- paste0("[", hostString, "]")
       message('\n', 'Listening on http://', hostString, ':', port)
     }
-    return(startServer(host, port, httpuvApp))
+    return(startServer(host, port, handlerManager$createHttpuvApp()))
   } else if (is.character(port)) {
     if (!quiet) {
       message('\n', 'Listening on domain socket ', port)
@@ -488,7 +436,7 @@ startApp <- function(appObj, port, host, quiet) {
            "configuration (and not domain sockets), then `port` must ",
            "be numeric, not a string.")
     }
-    return(startPipeServer(port, mask, httpuvApp))
+    return(startPipeServer(port, mask, handlerManager$createHttpuvApp()))
   }
 }
 
@@ -829,10 +777,6 @@ runApp <- function(appDir=getwd(),
 
   server <- startApp(appParts, port, host, quiet)
 
-  # Make the httpuv server object accessible. Needed for calling
-  # addResourcePath while app is running.
-  shinyOptions(server = server)
-
   on.exit({
     stopServer(server)
   }, add = TRUE)

R/shiny.R

@@ -62,7 +62,7 @@ NULL
 #'     by setting e.g. \code{options(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{reactlogShow}} function.
+#'     which can be viewed later with the \code{\link{showReactLog}} function.
 #'     This incurs a substantial performance penalty and should not be used in
 #'     production.}
 #'   \item{shiny.usecairo}{This is used to disable graphical rendering by the
@@ -576,7 +576,7 @@ ShinySession <- R6Class(
 
             # Apply preprocessor functions for inputs that have them.
             values$input <- lapply(
-              stats::setNames(names(values$input), names(values$input)),
+              setNames(names(values$input), names(values$input)),
               function(name) {
                 preprocess <- private$getSnapshotPreprocessInput(name)
                 preprocess(values$input[[name]])
@@ -604,7 +604,7 @@ ShinySession <- R6Class(
 
             # Apply snapshotPreprocess functions for outputs that have them.
             values$output <- lapply(
-              stats::setNames(names(values$output), names(values$output)),
+              setNames(names(values$output), names(values$output)),
               function(name) {
                 preprocess <- private$getSnapshotPreprocessOutput(name)
                 preprocess(values$output[[name]])
@@ -683,42 +683,11 @@ ShinySession <- R6Class(
 
     # See cycleStartAction
     startCycle = function() {
-      # TODO: This should check for busyCount == 0L, and remove the checks from
-      # the call sites
       if (length(private$cycleStartActionQueue) > 0) {
         head <- private$cycleStartActionQueue[[1L]]
         private$cycleStartActionQueue <- private$cycleStartActionQueue[-1L]
-
-        # After we execute the current cycleStartAction (head), there may be
-        # more items left on the queue. If the current busyCount > 0, then that
-        # means an async task is running; whenever that task finishes, it will
-        # decrement the busyCount back to 0 and a startCycle will then be
-        # scheduled. But if the current busyCount is 0, it means that either
-        # busyCount was incremented and then decremented; OR that running head()
-        # never touched busyCount (one example of the latter is that an input
-        # changed that didn't actually cause any observers to be invalidated,
-        # i.e. an input that's used in the body of an observeEvent). Because of
-        # the possibility of the latter case, we need to conditionally schedule
-        # a startCycle ourselves to ensure that the remaining queue items get
-        # processed.
-        #
-        # Since we can't actually tell whether head() increment and decremented
-        # busyCount, it's possible we're calling startCycle spuriously; that's
-        # OK, it's essentially a no-op in that case.
-        on.exit({
-          if (private$busyCount == 0L && length(private$cycleStartActionQueue) > 0L) {
-            later::later(function() {
-              if (private$busyCount == 0L) {
-                private$startCycle()
-              }
-            })
-          }
-        }, add = TRUE)
-
         head()
       }
-
-      invisible()
     }
   ),
   public = list(
@@ -750,8 +719,8 @@ ShinySession <- R6Class(
       private$flushCallbacks <- Callbacks$new()
       private$flushedCallbacks <- Callbacks$new()
       private$inputReceivedCallbacks <- Callbacks$new()
-      private$.input      <- ReactiveValues$new(dedupe = FALSE, label = "input")
-      private$.clientData <- ReactiveValues$new(dedupe = TRUE, label = "clientData")
+      private$.input      <- ReactiveValues$new(dedupe = FALSE)
+      private$.clientData <- ReactiveValues$new(dedupe = TRUE)
       private$timingRecorder <- ShinyServerTimingRecorder$new()
       self$progressStack <- Stack$new()
       self$files <- Map$new()
@@ -759,7 +728,9 @@ ShinySession <- R6Class(
       self$userData <- new.env(parent = emptyenv())
 
       self$input <- .createReactiveValues(private$.input, readonly=TRUE)
+      .setLabel(self$input, 'input')
       self$clientData <- .createReactiveValues(private$.clientData, readonly=TRUE)
+      .setLabel(self$clientData, 'clientData')
 
       self$output <- .createOutputWriter(self)
 
@@ -1204,11 +1175,6 @@ ShinySession <- R6Class(
       if (self$isClosed())
         return()
 
-      # This is the only place in the session where the restoreContext is
-      # flushed.
-      if (!is.null(self$restoreContext))
-        self$restoreContext$flushPending()
-
       # Return TRUE if there's any stuff to send to the client.
       hasPendingUpdates <- function() {
         # Even though progressKeys isn't sent to the client, we use it in this
@@ -2028,7 +1994,6 @@ ShinySession <- R6Class(
     },
     incrementBusyCount = function() {
       if (private$busyCount == 0L) {
-        rLog$asyncStart(domain = self)
         private$sendMessage(busy = "busy")
       }
       private$busyCount <- private$busyCount + 1L
@@ -2036,7 +2001,6 @@ ShinySession <- R6Class(
     decrementBusyCount = function() {
       private$busyCount <- private$busyCount - 1L
       if (private$busyCount == 0L) {
-        rLog$asyncStop(domain = self)
         private$sendMessage(busy = "idle")
         self$requestFlush()
         # We defer the call to startCycle() using later(), to defend against

R/utils.R

@@ -121,8 +121,8 @@ isWholeNum <- function(x, tol = .Machine$double.eps^0.5) {
 }
 
 `%AND%` <- function(x, y) {
-  if (!is.null(x) && !isTRUE(is.na(x)))
-    if (!is.null(y) && !isTRUE(is.na(y)))
+  if (!is.null(x) && !is.na(x))
+    if (!is.null(y) && !is.na(y))
       return(y)
   return(NULL)
 }
@@ -1050,7 +1050,7 @@ safeError <- function(error) {
 # #' @examples
 # #' ## Note: the breaking of the reactive chain that happens in the app
 # #' ## below (when input$txt = 'bad' and input$allowBad = 'FALSE') is
-# #' ## easily visualized with `reactlogShow()`
+# #' ## easily visualized with `showReactLog()`
 # #'
 # #' ## Only run examples in interactive R sessions
 # #' if (interactive()) {
@@ -1740,42 +1740,3 @@ getSliderType <- function(min, max, value) {
   }
   type[[1]]
 }
-
-# Reads the `shiny.sharedSecret` global option, and returns a function that can
-# be used to test header values for a match.
-loadSharedSecret <- function() {
-  normalizeToRaw <- function(value, label = "value") {
-    if (is.null(value)) {
-      raw()
-    } else if (is.character(value)) {
-      charToRaw(paste(value, collapse = "\n"))
-    } else if (is.raw(value)) {
-      value
-    } else {
-      stop("Wrong type for ", label, "; character or raw expected")
-    }
-  }
-
-  sharedSecret <- normalizeToRaw(getOption("shiny.sharedSecret"))
-  if (is.null(sharedSecret)) {
-    function(x) TRUE
-  } else {
-    # We compare the digest of the two values so that their lengths are equalized
-    function(x) {
-      x <- normalizeToRaw(x)
-      # Constant time comparison to avoid timing attacks
-      constantTimeEquals(sharedSecret, x)
-    }
-  }
-}
-
-# Compares two raw vectors of equal length for equality, in constant time
-constantTimeEquals <- function(raw1, raw2) {
-  stopifnot(is.raw(raw1))
-  stopifnot(is.raw(raw2))
-  if (length(raw1) != length(raw2)) {
-    return(FALSE)
-  }
-
-  sum(as.integer(xor(raw1, raw2))) == 0
-}

README.md

@@ -65,4 +65,7 @@ We welcome contributions to the **shiny** package. Please see our [CONTRIBUTING.
 
 ## License
 
-The shiny package as a whole is licensed under the GPLv3. See the [LICENSE](LICENSE) file for more details.
+The shiny package is licensed under the GPLv3. See these files in the inst directory for additional details:
+
+- COPYING - shiny package license (GPLv3)
+- NOTICE  - Copyright notices for additional included software

inst/staticdocs/index.r

@@ -134,7 +134,7 @@ sd_section("Reactive programming",
     "isolate",
     "invalidateLater",
     "debounce",
-    "reactlog",
+    "showReactLog",
     "makeReactiveBinding",
     "reactiveFileReader",
     "reactivePoll",

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

@@ -1,10 +1,9 @@
 /*!
- * Datepicker for Bootstrap v1.6.4 (https://github.com/eternicode/bootstrap-datepicker)
+ * Datepicker for Bootstrap v1.8.0 (https://github.com/uxsolutions/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;
@@ -12,10 +11,13 @@
 .datepicker-inline {
   width: 220px;
 }
-.datepicker.datepicker-rtl {
+.datepicker-rtl {
   direction: rtl;
 }
-.datepicker.datepicker-rtl table tr td span {
+.datepicker-rtl.dropdown-menu {
+  left: auto;
+}
+.datepicker-rtl table tr td span {
   float: right;
 }
 .datepicker-dropdown {
@@ -644,6 +646,10 @@ fieldset[disabled] .datepicker table tr td span.active.disabled:hover.focus {
 .datepicker tfoot tr th:hover {
   background: #eeeeee;
 }
+.datepicker .prev.disabled,
+.datepicker .next.disabled {
+  visibility: hidden;
+}
 .datepicker .cw {
   font-size: 10px;
   width: 12px;
@@ -670,7 +676,6 @@ fieldset[disabled] .datepicker table tr td span.active.disabled:hover.focus {
   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;

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.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.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.nb.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.nb={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","Mars","April","Mai","Juni","Juli","August","September","Oktober","November","Desember"],monthsShort:["Jan","Feb","Mar","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Des"],today:"I Dag",format:"dd.mm.yyyy"}}(jQuery);

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

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.no={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","Mars","April","Mai","Juni","Juli","August","September","Oktober","November","Desember"],monthsShort:["Jan","Feb","Mar","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Des"],today:"I dag",clear:"Nullstill",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

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

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.pl={days:["niedziela","poniedziałek","wtorek","środa","czwartek","piątek","sobota"],daysShort:["niedz.","pon.","wt.","śr.","czw.","piąt.","sob."],daysMin:["ndz.","pn.","wt.","śr.","czw.","pt.","sob."],months:["styczeń","luty","marzec","kwiecień","maj","czerwiec","lipiec","sierpień","wrzesień","październik","listopad","grudzień"],monthsShort:["sty.","lut.","mar.","kwi.","maj","cze.","lip.","sie.","wrz.","paź.","lis.","gru."],today:"dzisiaj",weekStart:1,clear:"wyczyść",format:"dd.mm.yyyy"}}(jQuery);

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

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.sv={days:["Söndag","Måndag","Tisdag","Onsdag","Torsdag","Fredag","Lördag"],daysShort:["Sön","Mån","Tis","Ons","Tor","Fre","Lör"],daysMin:["Sö","Må","Ti","On","To","Fr","Lö"],months:["Januari","Februari","Mars","April","Maj","Juni","Juli","Augusti","September","Oktober","November","December"],monthsShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec"],today:"Idag",format:"yyyy-mm-dd",weekStart:1,clear:"Rensa"}}(jQuery);

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

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

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

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.bn={days:["রবিবার","সোমবার","মঙ্গলবার","বুধবার","বৃহস্পতিবার","শুক্রবার","শনিবার"],daysShort:["রবিবার","সোমবার","মঙ্গলবার","বুধবার","বৃহস্পতিবার","শুক্রবার","শনিবার"],daysMin:["রবি","সোম","মঙ্গল","বুধ","বৃহস্পতি","শুক্র","শনি"],months:["জানুয়ারী","ফেব্রুয়ারি","মার্চ","এপ্রিল","মে","জুন","জুলাই","অগাস্ট","সেপ্টেম্বর","অক্টোবর","নভেম্বর","ডিসেম্বর"],monthsShort:["জানুয়ারী","ফেব্রুয়ারি","মার্চ","এপ্রিল","মে","জুন","জুলাই","অগাস্ট","সেপ্টেম্বর","অক্টোবর","নভেম্বর","ডিসেম্বর"],today:"আজ",monthsTitle:"মাস",clear:"পরিষ্কার",weekStart:0,format:"mm/dd/yyyy"}}(jQuery);

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

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.br={days:["Sul","Lun","Meurzh","Merc'her","Yaou","Gwener","Sadorn"],daysShort:["Sul","Lun","Meu.","Mer.","Yao.","Gwe.","Sad."],daysMin:["Su","L","Meu","Mer","Y","G","Sa"],months:["Genver","C'hwevrer","Meurzh","Ebrel","Mae","Mezheven","Gouere","Eost","Gwengolo","Here","Du","Kerzu"],monthsShort:["Genv.","C'hw.","Meur.","Ebre.","Mae","Mezh.","Goue.","Eost","Gwen.","Here","Du","Kerz."],today:"Hiziv",monthsTitle:"Miz",clear:"Dilemel",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);

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

@@ -1 +1 @@
-!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);
+!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",monthsTitle:"Měsíc",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

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

@@ -0,0 +1 @@
+!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",weekStart:1,clear:"Nulstil",format:"dd/mm/yyyy",monthsTitle:"Måneder"}}(jQuery);

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

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates["en-CA"]={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:0,format:"yyyy-mm-dd"}}(jQuery);

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

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates["en-IE"]={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/locales/bootstrap-datepicker.en-NZ.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates["en-NZ"]={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/locales/bootstrap-datepicker.en-ZA.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates["en-ZA"]={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:"yyyy/mm/d"}}(jQuery);

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

@@ -1 +1 @@
-!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);
+!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",monthsTitle:"Hilabeteak",clear:"Ezabatu",weekStart:1,format:"yyyy/mm/dd"}}(jQuery);

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

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.hi={days:["रविवार","सोमवार","मंगलवार","बुधवार","गुरुवार","शुक्रवार","शनिवार"],daysShort:["सूर्य","सोम","मंगल","बुध","गुरु","शुक्र","शनि"],daysMin:["र","सो","मं","बु","गु","शु","श"],months:["जनवरी","फ़रवरी","मार्च","अप्रैल","मई","जून","जुलाई","अगस्त","सितम्बर","अक्टूबर","नवंबर","दिसम्बर"],monthsShort:["जन","फ़रवरी","मार्च","अप्रैल","मई","जून","जुलाई","अगस्त","सितं","अक्टूबर","नवं","दिसम्बर"],today:"आज",monthsTitle:"महीने",clear:"साफ",weekStart:1,format:"dd / mm / yyyy"}}(jQuery);

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

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

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

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

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.kh={days:["អាទិត្យ","ចន្ទ","អង្គារ","ពុធ","ព្រហស្បតិ៍","សុក្រ","សៅរ៍"],daysShort:["អា.ទិ","ចន្ទ","អង្គារ","ពុធ","ព្រ.ហ","សុក្រ","សៅរ៍"],daysMin:["អា.ទិ","ចន្ទ","អង្គារ","ពុធ","ព្រ.ហ","សុក្រ","សៅរ៍"],months:["មករា","កុម្ភះ","មិនា","មេសា","ឧសភា","មិថុនា","កក្កដា","សីហា","កញ្ញា","តុលា","វិច្ឆិកា","ធ្នូ"],monthsShort:["មករា","កុម្ភះ","មិនា","មេសា","ឧសភា","មិថុនា","កក្កដា","សីហា","កញ្ញា","តុលា","វិច្ឆិកា","ធ្នូ"],today:"ថ្ងៃនេះ",clear:"សំអាត"},a.fn.datepicker.deprecated('The language code "kh" is deprecated and will be removed in 2.0. For Khmer support use "km" instead.')}(jQuery);

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

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

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

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.kr={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월"]}}(jQuery);
+!function(a){a.fn.datepicker.dates.kr={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월"]},a.fn.datepicker.deprecated('The language code "kr" is deprecated and will be removed in 2.0. For korean support use "ko" instead.')}(jQuery);

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

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.lv={days:["Svētdiena","Pirmdiena","Otrdiena","Trešdiena","Ceturtdiena","Piektdiena","Sestdiena"],daysShort:["Sv","P","O","T","C","Pk","S"],daysMin:["Sv","Pr","Ot","Tr","Ce","Pk","Se"],months:["Janvāris","Februāris","Marts","Aprīlis","Maijs","Jūnijs","Jūlijs","Augusts","Septembris","Oktobris","Novembris","Decembris"],monthsShort:["Jan","Feb","Mar","Apr","Mai","Jūn","Jūl","Aug","Sep","Okt","Nov","Dec"],today:"Šodien",weekStart:1}}(jQuery);
+!function(a){a.fn.datepicker.dates.lv={days:["Svētdiena","Pirmdiena","Otrdiena","Trešdiena","Ceturtdiena","Piektdiena","Sestdiena"],daysShort:["Sv","P","O","T","C","Pk","S"],daysMin:["Sv","Pr","Ot","Tr","Ce","Pk","Se"],months:["Janvāris","Februāris","Marts","Aprīlis","Maijs","Jūnijs","Jūlijs","Augusts","Septembris","Oktobris","Novembris","Decembris"],monthsShort:["Jan","Feb","Mar","Apr","Mai","Jūn","Jūl","Aug","Sep","Okt","Nov","Dec"],monthsTitle:"Mēneši",today:"Šodien",clear:"Nodzēst",weekStart:1}}(jQuery);

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

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.no={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","mars","april","mai","juni","juli","august","september","oktober","vovember","desember"],monthsShort:["jan","feb","mar","apr","mai","jun","jul","aug","sep","okt","nov","des"],today:"i dag",monthsTitle:"Måneder",clear:"Nullstill",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

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

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.oc={days:["Dimenge","Diluns","Dimars","Dimècres","Dijòus","Divendres","Dissabte"],daysShort:["Dim","Dil","Dmr","Dmc","Dij","Div","Dis"],daysMin:["dg","dl","dr","dc","dj","dv","ds"],months:["Genièr","Febrièr","Març","Abrial","Mai","Junh","Julhet","Agost","Setembre","Octobre","Novembre","Decembre"],monthsShort:["Gen","Feb","Mar","Abr","Mai","Jun","Jul","Ago","Set","Oct","Nov","Dec"],today:"Uèi",monthsTitle:"Meses",clear:"Escafar",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);

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

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.pl={days:["Niedziela","Poniedziałek","Wtorek","Środa","Czwartek","Piątek","Sobota"],daysShort:["Niedz.","Pon.","Wt.","Śr.","Czw.","Piąt.","Sob."],daysMin:["Ndz.","Pn.","Wt.","Śr.","Czw.","Pt.","Sob."],months:["Styczeń","Luty","Marzec","Kwiecień","Maj","Czerwiec","Lipiec","Sierpień","Wrzesień","Październik","Listopad","Grudzień"],monthsShort:["Sty.","Lut.","Mar.","Kwi.","Maj","Cze.","Lip.","Sie.","Wrz.","Paź.","Lis.","Gru."],today:"Dzisiaj",weekStart:1,clear:"Wyczyść",format:"dd.mm.yyyy"}}(jQuery);

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

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.ro={days:["Duminică","Luni","Marţi","Miercuri","Joi","Vineri","Sâmbătă"],daysShort:["Dum","Lun","Mar","Mie","Joi","Vin","Sâm"],daysMin:["Du","Lu","Ma","Mi","Jo","Vi","Sâ"],months:["Ianuarie","Februarie","Martie","Aprilie","Mai","Iunie","Iulie","August","Septembrie","Octombrie","Noiembrie","Decembrie"],monthsShort:["Ian","Feb","Mar","Apr","Mai","Iun","Iul","Aug","Sep","Oct","Nov","Dec"],today:"Astăzi",clear:"Șterge",weekStart:1}}(jQuery);
+!function(a){a.fn.datepicker.dates.ro={days:["Duminică","Luni","Marţi","Miercuri","Joi","Vineri","Sâmbătă"],daysShort:["Dum","Lun","Mar","Mie","Joi","Vin","Sâm"],daysMin:["Du","Lu","Ma","Mi","Jo","Vi","Sâ"],months:["Ianuarie","Februarie","Martie","Aprilie","Mai","Iunie","Iulie","August","Septembrie","Octombrie","Noiembrie","Decembrie"],monthsShort:["Ian","Feb","Mar","Apr","Mai","Iun","Iul","Aug","Sep","Oct","Nov","Dec"],today:"Astăzi",clear:"Șterge",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);

inst/www/shared/datepicker/locales/bootstrap-datepicker.rs-latin.min.js

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates["rs-latin"]={days:["Nedelja","Ponedeljak","Utorak","Sreda","Četvrtak","Petak","Subota"],daysShort:["Ned","Pon","Uto","Sre","Čet","Pet","Sub"],daysMin:["N","Po","U","Sr","Č","Pe","Su"],months:["Januar","Februar","Mart","April","Maj","Jun","Jul","Avgust","Septembar","Oktobar","Novembar","Decembar"],monthsShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Avg","Sep","Okt","Nov","Dec"],today:"Danas",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);
+!function(a){a.fn.datepicker.dates["rs-latin"]={days:["Nedelja","Ponedeljak","Utorak","Sreda","Četvrtak","Petak","Subota"],daysShort:["Ned","Pon","Uto","Sre","Čet","Pet","Sub"],daysMin:["N","Po","U","Sr","Č","Pe","Su"],months:["Januar","Februar","Mart","April","Maj","Jun","Jul","Avgust","Septembar","Oktobar","Novembar","Decembar"],monthsShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Avg","Sep","Okt","Nov","Dec"],today:"Danas",weekStart:1,format:"dd.mm.yyyy"},a.fn.datepicker.deprecated('This language code "rs-latin" is deprecated (invalid serbian language code) and will be removed in 2.0. For Serbian latin support use "sr-latin" instead.')}(jQuery);

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

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.rs={days:["Недеља","Понедељак","Уторак","Среда","Четвртак","Петак","Субота"],daysShort:["Нед","Пон","Уто","Сре","Чет","Пет","Суб"],daysMin:["Н","По","У","Ср","Ч","Пе","Су"],months:["Јануар","Фебруар","Март","Април","Мај","Јун","Јул","Август","Септембар","Октобар","Новембар","Децембар"],monthsShort:["Јан","Феб","Мар","Апр","Мај","Јун","Јул","Авг","Сеп","Окт","Нов","Дец"],today:"Данас",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);
+!function(a){a.fn.datepicker.dates.rs={days:["Недеља","Понедељак","Уторак","Среда","Четвртак","Петак","Субота"],daysShort:["Нед","Пон","Уто","Сре","Чет","Пет","Суб"],daysMin:["Н","По","У","Ср","Ч","Пе","Су"],months:["Јануар","Фебруар","Март","Април","Мај","Јун","Јул","Август","Септембар","Октобар","Новембар","Децембар"],monthsShort:["Јан","Феб","Мар","Апр","Мај","Јун","Јул","Авг","Сеп","Окт","Нов","Дец"],today:"Данас",weekStart:1,format:"dd.mm.yyyy"},a.fn.datepicker.deprecated('This language code "rs" is deprecated (invalid serbian language code) and will be removed in 2.0. For Serbian support use "sr" instead.')}(jQuery);

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

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.ru={days:["Воскресенье","Понедельник","Вторник","Среда","Четверг","Пятница","Суббота"],daysShort:["Вск","Пнд","Втр","Срд","Чтв","Птн","Суб"],daysMin:["Вс","Пн","Вт","Ср","Чт","Пт","Сб"],months:["Январь","Февраль","Март","Апрель","Май","Июнь","Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь"],monthsShort:["Янв","Фев","Мар","Апр","Май","Июн","Июл","Авг","Сен","Окт","Ноя","Дек"],today:"Сегодня",clear:"Очистить",format:"dd.mm.yyyy",weekStart:1}}(jQuery);
+!function(a){a.fn.datepicker.dates.ru={days:["Воскресенье","Понедельник","Вторник","Среда","Четверг","Пятница","Суббота"],daysShort:["Вск","Пнд","Втр","Срд","Чтв","Птн","Суб"],daysMin:["Вс","Пн","Вт","Ср","Чт","Пт","Сб"],months:["Январь","Февраль","Март","Апрель","Май","Июнь","Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь"],monthsShort:["Янв","Фев","Мар","Апр","Май","Июн","Июл","Авг","Сен","Окт","Ноя","Дек"],today:"Сегодня",clear:"Очистить",format:"dd.mm.yyyy",weekStart:1,monthsTitle:"Месяцы"}}(jQuery);

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

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.si={days:["ඉරිදා","සඳුදා","අඟහරුවාදා","බදාදා","බ්‍රහස්පතින්දා","සිකුරාදා","සෙනසුරාදා"],daysShort:["ඉරි","සඳු","අඟ","බදා","බ්‍රහ","සිකු","සෙන"],daysMin:["ඉ","ස","අ","බ","බ්‍ර","සි","සෙ"],months:["ජනවාරි","පෙබරවාරි","මාර්තු","අප්‍රේල්","මැයි","ජුනි","ජූලි","අගෝස්තු","සැප්තැම්බර්","ඔක්තෝබර්","නොවැම්බර්","දෙසැම්බර්"],monthsShort:["ජන","පෙබ","මාර්","අප්‍රේ","මැයි","ජුනි","ජූලි","අගෝ","සැප්","ඔක්","නොවැ","දෙසැ"],today:"අද",monthsTitle:"මාස",clear:"මකන්න",weekStart:0,format:"yyyy-mm-dd"}}(jQuery);

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

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.sl={days:["Nedelja","Ponedeljek","Torek","Sreda","Četrtek","Petek","Sobota"],daysShort:["Ned","Pon","Tor","Sre","Čet","Pet","Sob"],daysMin:["Ne","Po","To","Sr","Če","Pe","So"],months:["Januar","Februar","Marec","April","Maj","Junij","Julij","Avgust","September","Oktober","November","December"],monthsShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Avg","Sep","Okt","Nov","Dec"],today:"Danes"}}(jQuery);
+!function(a){a.fn.datepicker.dates.sl={days:["Nedelja","Ponedeljek","Torek","Sreda","Četrtek","Petek","Sobota"],daysShort:["Ned","Pon","Tor","Sre","Čet","Pet","Sob"],daysMin:["Ne","Po","To","Sr","Če","Pe","So"],months:["Januar","Februar","Marec","April","Maj","Junij","Julij","Avgust","September","Oktober","November","December"],monthsShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Avg","Sep","Okt","Nov","Dec"],today:"Danes",weekStart:1}}(jQuery);