grunt dist

twbs · Jul 25, 2016 · e8c5de3 · e8c5de3
1 parent c391850
commit e8c5de3
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/dist/css/bootstrap-theme.css.map b/dist/css/bootstrap-theme.css.map
diff --git a/dist/css/bootstrap-theme.min.css.map b/dist/css/bootstrap-theme.min.css.map
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map
diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/dist/css/bootstrap.min.css.map b/dist/css/bootstrap.min.css.map
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
@@ -11,8 +11,8 @@ if (typeof jQuery === 'undefined') {
 +function ($) {
   'use strict';
   var version = $.fn.jquery.split(' ')[0].split('.')
-  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 2)) {
-    throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3')
+  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 3)) {
+    throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4')
   }
 }(jQuery);
 
@@ -1620,7 +1620,10 @@ if (typeof jQuery === 'undefined') {
       // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
       elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
     }
-    var elOffset  = isBody ? { top: 0, left: 0 } : $element.offset()
+    var isSvg = window.SVGElement && el instanceof window.SVGElement
+    // Avoid using $.offset() on SVGs since it gives incorrect results in jQuery 3.
+    // See https://github.com/twbs/bootstrap/issues/20280
+    var elOffset  = isBody ? { top: 0, left: 0 } : (isSvg ? null : $element.offset())
     var scroll    = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
     var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
 

diff --git a/dist/js/bootstrap.min.js b/dist/js/bootstrap.min.js