From a8b003d726522cf663611c114d8f0e79abf8d200 Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva
Date: Fri, 8 May 2020 11:54:58 -0300
Subject: [PATCH 01/13] Release v4.4.0
---
CHANGELOG.md | 6 ++++++
VERSIONS.md | 1 +
lib/jquery/rails/version.rb | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6de41bd..ba6e6ad3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 4.4.0
+
+- update jquery to 3.5.1 (note: [3.5.0 contains important security updates](https://github.com/advisories/GHSA-jpcq-cgw6-v4j6))
+- unescape dollar signs and backticks in `assert_select_jquery` to match
+ Rails updated behavior.
+
## 4.3.5
- update jquery to 3.4.1
diff --git a/VERSIONS.md b/VERSIONS.md
index 7768a85f..73303590 100644
--- a/VERSIONS.md
+++ b/VERSIONS.md
@@ -2,6 +2,7 @@
| Gem | jQuery | jQuery UJS | jQuery UI |
|--------|--------|------------| ----------|
+| 4.4.0 | 1.12.4 & 2.2.4 & 3.5.1 | 1.2.2 | - |
| 4.3.5 | 1.12.4 & 2.2.4 & 3.4.1 | 1.2.2 | - |
| 4.3.4 | 1.12.4 & 2.2.4 & 3.4.0 | 1.2.2 | - |
| 4.3.3 | 1.12.4 & 2.2.4 & 3.3.1 | 1.2.2 | - |
diff --git a/lib/jquery/rails/version.rb b/lib/jquery/rails/version.rb
index 1c36c819..39868e51 100644
--- a/lib/jquery/rails/version.rb
+++ b/lib/jquery/rails/version.rb
@@ -1,6 +1,6 @@
module Jquery
module Rails
- VERSION = "4.3.5"
+ VERSION = "4.4.0"
JQUERY_VERSION = "1.12.4"
JQUERY_2_VERSION = "2.2.4"
JQUERY_3_VERSION = "3.5.1"
From 8cd051ac93b0f445b127c9313c8c46282e4e45bc Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva
Date: Mon, 23 May 2022 18:17:10 -0300
Subject: [PATCH 02/13] Update jQuery to 3.6.0
Closes #280
Closes #285
---
lib/jquery/rails/version.rb | 2 +-
vendor/assets/javascripts/jquery3.js | 227 +++++++++++-----------
vendor/assets/javascripts/jquery3.min.js | 4 +-
vendor/assets/javascripts/jquery3.min.map | 2 +-
4 files changed, 122 insertions(+), 113 deletions(-)
diff --git a/lib/jquery/rails/version.rb b/lib/jquery/rails/version.rb
index 39868e51..13587a40 100644
--- a/lib/jquery/rails/version.rb
+++ b/lib/jquery/rails/version.rb
@@ -3,7 +3,7 @@ module Rails
VERSION = "4.4.0"
JQUERY_VERSION = "1.12.4"
JQUERY_2_VERSION = "2.2.4"
- JQUERY_3_VERSION = "3.5.1"
+ JQUERY_3_VERSION = "3.6.0"
JQUERY_UJS_VERSION = "1.2.2"
end
end
diff --git a/vendor/assets/javascripts/jquery3.js b/vendor/assets/javascripts/jquery3.js
index 50937333..fc6c299b 100644
--- a/vendor/assets/javascripts/jquery3.js
+++ b/vendor/assets/javascripts/jquery3.js
@@ -1,15 +1,15 @@
/*!
- * jQuery JavaScript Library v3.5.1
+ * jQuery JavaScript Library v3.6.0
* https://jquery.com/
*
* Includes Sizzle.js
* https://sizzlejs.com/
*
- * Copyright JS Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
- * Date: 2020-05-04T22:49Z
+ * Date: 2021-03-02T17:08Z
*/
( function( global, factory ) {
@@ -76,12 +76,16 @@ var support = {};
var isFunction = function isFunction( obj ) {
- // Support: Chrome <=57, Firefox <=52
- // In some browsers, typeof returns "function" for HTML