Merge branch '5.2RC'5.2

3 files changed, 13 insertions, 8 deletions

diff --git a/vendor/twbs/bootstrap/site/docs/4.5/assets/js/src/application.js b/vendor/twbs/bootstrap/site/docs/4.5/assets/js/src/application.js
index 0a870261a..a3032173b 100644
--- a/vendor/twbs/bootstrap/site/docs/4.5/assets/js/src/application.js
+++ b/vendor/twbs/bootstrap/site/docs/4.5/assets/js/src/application.js
@@ -44,8 +44,8 @@
 
     // Modal relatedTarget demo
     $('#exampleModal').on('show.bs.modal', function (event) {
-      var $button = $(event.relatedTarget)      // Button that triggered the modal
-      var recipient = $button.data('whatever')  // Extract info from data-* attributes
+      var $button = $(event.relatedTarget) // Button that triggered the modal
+      var recipient = $button.data('whatever') // Extract info from data-* attributes
       // If necessary, you could initiate an AJAX request here (and then do the updating in a callback).
       // Update the modal's content. We'll use jQuery here, but you could use a data binding library or other methods instead.
       var $modal = $(this)
@@ -109,4 +109,4 @@
 
     bsCustomFileInput.init()
   })
-}(jQuery))
+})(jQuery)
diff --git a/vendor/twbs/bootstrap/site/docs/4.5/assets/js/src/ie-emulation-modes-warning.js b/vendor/twbs/bootstrap/site/docs/4.5/assets/js/src/ie-emulation-modes-warning.js
index 6e6ed9c27..d11ec1c5a 100644
--- a/vendor/twbs/bootstrap/site/docs/4.5/assets/js/src/ie-emulation-modes-warning.js
+++ b/vendor/twbs/bootstrap/site/docs/4.5/assets/js/src/ie-emulation-modes-warning.js
@@ -11,6 +11,7 @@
     if (groups === null) {
       return null
     }
+
     var ieVersionNum = parseInt(groups[1], 10)
     var ieMajorVersion = Math.floor(ieVersionNum)
     return ieMajorVersion
@@ -24,9 +25,11 @@
     if (typeof jscriptVersion === 'undefined') {
       return 11 // IE11+ not in emulation mode
     }
+
     if (jscriptVersion < 9) {
       return 8 // IE8 (or lower; haven't tested on IE<8)
     }
+
     return jscriptVersion // IE9 or IE10 in any mode, or IE11 in non-IE11 mode
   }
 
@@ -34,14 +37,16 @@
   if (ua.indexOf('Opera') > -1 || ua.indexOf('Presto') > -1) {
     return // Opera, which might pretend to be IE
   }
+
   var emulated = emulatedIEMajorVersion()
   if (emulated === null) {
     return // Not IE
   }
+
   var nonEmulated = actualNonEmulatedIEMajorVersion()
 
   if (emulated !== nonEmulated) {
     // eslint-disable-next-line no-alert
     window.alert('WARNING: You appear to be using IE' + nonEmulated + ' in IE' + emulated + ' emulation mode.\nIE emulation modes can behave significantly differently from ACTUAL older versions of IE.\nPLEASE DON\'T FILE BOOTSTRAP BUGS based on testing in IE emulation modes!')
   }
-}())
+})()
diff --git a/vendor/twbs/bootstrap/site/docs/4.5/assets/js/src/search.js b/vendor/twbs/bootstrap/site/docs/4.5/assets/js/src/search.js
index e372d1553..bb97c5cf8 100644
--- a/vendor/twbs/bootstrap/site/docs/4.5/assets/js/src/search.js
+++ b/vendor/twbs/bootstrap/site/docs/4.5/assets/js/src/search.js
@@ -37,12 +37,12 @@
         var currentUrl = getOrigin()
         var liveUrl = 'https://getbootstrap.com/'
 
-        hit.url = currentUrl.lastIndexOf(liveUrl, 0) === 0
+        hit.url = currentUrl.lastIndexOf(liveUrl, 0) === 0 ?
           // On production, return the result as is
-          ? hit.url
+          hit.url :
           // On development or Netlify, replace `hit.url` with a trailing slash,
           // so that the result link is relative to the server root
-          : hit.url.replace(liveUrl, '/')
+          hit.url.replace(liveUrl, '/')
 
         // Prevent jumping to first header
         if (hit.anchor === 'content') {
@@ -56,4 +56,4 @@
     // Set debug to `true` if you want to inspect the dropdown
     debug: false
   })
-}())
+})()