Skip to content

Commit e8c5de3

Browse files
committed
grunt dist
1 parent c391850 commit e8c5de3

File tree

8 files changed

+13
-12
lines changed

8 files changed

+13
-12
lines changed

dist/css/bootstrap-theme.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-theme.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.css

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/bootstrap.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ if (typeof jQuery === 'undefined') {
1111
+function ($) {
1212
'use strict';
1313
var version = $.fn.jquery.split(' ')[0].split('.')
14-
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 2)) {
15-
throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3')
14+
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 3)) {
15+
throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4')
1616
}
1717
}(jQuery);
1818

@@ -1620,7 +1620,10 @@ if (typeof jQuery === 'undefined') {
16201620
// width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
16211621
elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
16221622
}
1623-
var elOffset = isBody ? { top: 0, left: 0 } : $element.offset()
1623+
var isSvg = window.SVGElement && el instanceof window.SVGElement
1624+
// Avoid using $.offset() on SVGs since it gives incorrect results in jQuery 3.
1625+
// See https://github.com/twbs/bootstrap/issues/20280
1626+
var elOffset = isBody ? { top: 0, left: 0 } : (isSvg ? null : $element.offset())
16241627
var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
16251628
var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
16261629

dist/js/bootstrap.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)