aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2019-03-09 20:57:34 +0100
committerGitHub <noreply@github.com>2019-03-09 20:57:34 +0100
commitf6ad0d85b16abd99f7e4aa2d8dbf3a7348cd8f72 (patch)
treee12f1ee695f38fb7a715c3d9fc9c7bff1cf99132
parent62105f0aed847f0ab4012e1b91e094e218aa9e08 (diff)
parenta90593273caed4609d95603103f8992487144d81 (diff)
downloadrails-f6ad0d85b16abd99f7e4aa2d8dbf3a7348cd8f72.tar.gz
rails-f6ad0d85b16abd99f7e4aa2d8dbf3a7348cd8f72.tar.bz2
rails-f6ad0d85b16abd99f7e4aa2d8dbf3a7348cd8f72.zip
Merge pull request #35557 from sharang-d/revert-jquery-change
Revert an incorrect change in jquery-2.2.0.js
-rw-r--r--actionview/test/ujs/public/vendor/jquery-2.2.0.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/test/ujs/public/vendor/jquery-2.2.0.js b/actionview/test/ujs/public/vendor/jquery-2.2.0.js
index a83c4faa16..1e0ba99740 100644
--- a/actionview/test/ujs/public/vendor/jquery-2.2.0.js
+++ b/actionview/test/ujs/public/vendor/jquery-2.2.0.js
@@ -5578,7 +5578,7 @@ var iframe,
};
/**
- * Retrieve the actual display of an element
+ * Retrieve the actual display of a element
* @param {String} name nodeName of the element
* @param {Object} doc Document object
*/
@@ -9639,7 +9639,7 @@ jQuery.fn.extend( {
// 2) For the hidden or detached element
// 3) For body or html element, i.e. in case of the html node - it will return itself
//
- // but those exceptions were never presented as a real life use cases
+ // but those exceptions were never presented as a real life use-cases
// and might be considered as more preferable results.
//
// This logic, however, is not guaranteed and can change at any point in the future