Merge pull request rstudio#3311 from rstudio/update-jquery-3.6.0

Co-authored-by: Barret Schloerke <[email protected]> Co-authored-by: Barret Schloerke <[email protected]>
BahgatN · Mar 3, 2021 · d582e53 · d582e53
2 parents 4ce1058 + 52ad7d1
commit d582e53
Show file tree

Hide file tree

Showing 12 changed files with 165 additions and 127 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -197,6 +197,7 @@ Collate:
     'test.R'
     'update-input.R'
     'utils-lang.R'
+    'version_jquery.R'
     'viewer.R'
 RoxygenNote: 7.1.1
 Encoding: UTF-8

diff --git a/NEWS.md b/NEWS.md
@@ -21,6 +21,7 @@ shiny 1.6.0.9000
 
 * Closed #3286: Updated to Font-Awesome 5.15.2. (#3288)
 
+* Updated to jQuery 3.6.0. (#3311)
 
 shiny 1.6.0
 ===========

diff --git a/R/shiny-options.R b/R/shiny-options.R
@@ -88,8 +88,8 @@ getShinyOption <- function(name, default = NULL) {
 #' \item{shiny.host (defaults to `"127.0.0.1"`)}{The IP address that Shiny should listen on. See
 #'   [runApp()] for more information.}
 #' \item{shiny.jquery.version (defaults to `3`)}{The major version of jQuery to use.
-#' Currently only values of `3` or `1` are supported. If `1`, then jQuery 1.12.4 is used. If `3`,
-#' then jQuery 3.5.1 is used.}
+#'   Currently only values of `3` or `1` are supported. If `1`, then jQuery 1.12.4 is used. If `3`,
+#'   then jQuery `r version_jquery` is used.}
 #' \item{shiny.json.digits (defaults to `16`)}{The number of digits to use when converting
 #'   numbers to JSON format to send to the client web browser.}
 #' \item{shiny.launch.browser (defaults to `interactive()`)}{A boolean which controls the default behavior

diff --git a/R/shinyui.R b/R/shinyui.R
@@ -51,7 +51,7 @@ renderPage <- function(ui, showcase=0, testMode=FALSE) {
     version <- getOption("shiny.jquery.version", 3)
     if (version == 3) {
       return(htmlDependency(
-        "jquery", "3.5.1",
+        "jquery", version_jquery,
         c(href = "shared"),
         script = "jquery.min.js"
       ))

diff --git a/R/version_jquery.R b/R/version_jquery.R
@@ -0,0 +1,2 @@
+# Generated by tools/updatejQuery.R; do not edit by hand
+version_jquery <- "3.6.0"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Generated by tools/updatejQuery.R; do not edit by hand
		version_jquery <- "3.6.0"