|
60 | 60 | $(el).on('click', dismiss, this.close) |
61 | 61 | } |
62 | 62 |
|
63 | | - Alert.VERSION = '3.3.1' |
| 63 | + Alert.VERSION = '3.3.2' |
64 | 64 |
|
65 | 65 | Alert.TRANSITION_DURATION = 150 |
66 | 66 |
|
|
147 | 147 | this.isLoading = false |
148 | 148 | } |
149 | 149 |
|
150 | | - Button.VERSION = '3.3.1' |
| 150 | + Button.VERSION = '3.3.2' |
151 | 151 |
|
152 | 152 | Button.DEFAULTS = { |
153 | 153 | loadingText: 'loading...' |
|
266 | 266 | .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) |
267 | 267 | } |
268 | 268 |
|
269 | | - Carousel.VERSION = '3.3.1' |
| 269 | + Carousel.VERSION = '3.3.2' |
270 | 270 |
|
271 | 271 | Carousel.TRANSITION_DURATION = 600 |
272 | 272 |
|
|
306 | 306 | } |
307 | 307 |
|
308 | 308 | Carousel.prototype.getItemForDirection = function (direction, active) { |
309 | | - var delta = direction == 'prev' ? -1 : 1 |
310 | 309 | var activeIndex = this.getItemIndex(active) |
| 310 | + var willWrap = (direction == 'prev' && activeIndex === 0) |
| 311 | + || (direction == 'next' && activeIndex == (this.$items.length - 1)) |
| 312 | + if (willWrap && !this.options.wrap) return active |
| 313 | + var delta = direction == 'prev' ? -1 : 1 |
311 | 314 | var itemIndex = (activeIndex + delta) % this.$items.length |
312 | 315 | return this.$items.eq(itemIndex) |
313 | 316 | } |
|
352 | 355 | var $next = next || this.getItemForDirection(type, $active) |
353 | 356 | var isCycling = this.interval |
354 | 357 | var direction = type == 'next' ? 'left' : 'right' |
355 | | - var fallback = type == 'next' ? 'first' : 'last' |
356 | 358 | var that = this |
357 | 359 |
|
358 | | - if (!$next.length) { |
359 | | - if (!this.options.wrap) return |
360 | | - $next = this.$element.find('.item')[fallback]() |
361 | | - } |
362 | | - |
363 | 360 | if ($next.hasClass('active')) return (this.sliding = false) |
364 | 361 |
|
365 | 362 | var relatedTarget = $next[0] |
|
496 | 493 | if (this.options.toggle) this.toggle() |
497 | 494 | } |
498 | 495 |
|
499 | | - Collapse.VERSION = '3.3.1' |
| 496 | + Collapse.VERSION = '3.3.2' |
500 | 497 |
|
501 | 498 | Collapse.TRANSITION_DURATION = 350 |
502 | 499 |
|
|
514 | 511 | if (this.transitioning || this.$element.hasClass('in')) return |
515 | 512 |
|
516 | 513 | var activesData |
517 | | - var actives = this.$parent && this.$parent.find('> .panel').children('.in, .collapsing') |
| 514 | + var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing') |
518 | 515 |
|
519 | 516 | if (actives && actives.length) { |
520 | 517 | activesData = actives.data('bs.collapse') |
|
690 | 687 | $(element).on('click.bs.dropdown', this.toggle) |
691 | 688 | } |
692 | 689 |
|
693 | | - Dropdown.VERSION = '3.3.1' |
| 690 | + Dropdown.VERSION = '3.3.2' |
694 | 691 |
|
695 | 692 | Dropdown.prototype.toggle = function (e) { |
696 | 693 | var $this = $(this) |
|
854 | 851 | } |
855 | 852 | } |
856 | 853 |
|
857 | | - Modal.VERSION = '3.3.1' |
| 854 | + Modal.VERSION = '3.3.2' |
858 | 855 |
|
859 | 856 | Modal.TRANSITION_DURATION = 300 |
860 | 857 | Modal.BACKDROP_TRANSITION_DURATION = 150 |
|
1164 | 1161 | this.init('tooltip', element, options) |
1165 | 1162 | } |
1166 | 1163 |
|
1167 | | - Tooltip.VERSION = '3.3.1' |
| 1164 | + Tooltip.VERSION = '3.3.2' |
1168 | 1165 |
|
1169 | 1166 | Tooltip.TRANSITION_DURATION = 150 |
1170 | 1167 |
|
|
1485 | 1482 | } |
1486 | 1483 |
|
1487 | 1484 | Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { |
1488 | | - return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : |
1489 | | - placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : |
| 1485 | + return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : |
| 1486 | + placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : |
1490 | 1487 | placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : |
1491 | | - /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } |
| 1488 | + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } |
1492 | 1489 |
|
1493 | 1490 | } |
1494 | 1491 |
|
|
1584 | 1581 |
|
1585 | 1582 | function Plugin(option) { |
1586 | 1583 | return this.each(function () { |
1587 | | - var $this = $(this) |
1588 | | - var data = $this.data('bs.tooltip') |
1589 | | - var options = typeof option == 'object' && option |
1590 | | - var selector = options && options.selector |
| 1584 | + var $this = $(this) |
| 1585 | + var data = $this.data('bs.tooltip') |
| 1586 | + var options = typeof option == 'object' && option |
1591 | 1587 |
|
1592 | 1588 | if (!data && option == 'destroy') return |
1593 | | - if (selector) { |
1594 | | - if (!data) $this.data('bs.tooltip', (data = {})) |
1595 | | - if (!data[selector]) data[selector] = new Tooltip(this, options) |
1596 | | - } else { |
1597 | | - if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) |
1598 | | - } |
| 1589 | + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) |
1599 | 1590 | if (typeof option == 'string') data[option]() |
1600 | 1591 | }) |
1601 | 1592 | } |
|
1628 | 1619 |
|
1629 | 1620 | if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') |
1630 | 1621 |
|
1631 | | - Popover.VERSION = '3.3.1' |
| 1622 | + Popover.VERSION = '3.3.2' |
1632 | 1623 |
|
1633 | 1624 | Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { |
1634 | 1625 | placement: 'right', |
|
1695 | 1686 |
|
1696 | 1687 | function Plugin(option) { |
1697 | 1688 | return this.each(function () { |
1698 | | - var $this = $(this) |
1699 | | - var data = $this.data('bs.popover') |
1700 | | - var options = typeof option == 'object' && option |
1701 | | - var selector = options && options.selector |
| 1689 | + var $this = $(this) |
| 1690 | + var data = $this.data('bs.popover') |
| 1691 | + var options = typeof option == 'object' && option |
1702 | 1692 |
|
1703 | 1693 | if (!data && option == 'destroy') return |
1704 | | - if (selector) { |
1705 | | - if (!data) $this.data('bs.popover', (data = {})) |
1706 | | - if (!data[selector]) data[selector] = new Popover(this, options) |
1707 | | - } else { |
1708 | | - if (!data) $this.data('bs.popover', (data = new Popover(this, options))) |
1709 | | - } |
| 1694 | + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) |
1710 | 1695 | if (typeof option == 'string') data[option]() |
1711 | 1696 | }) |
1712 | 1697 | } |
|
1750 | 1735 | this.process() |
1751 | 1736 | } |
1752 | 1737 |
|
1753 | | - ScrollSpy.VERSION = '3.3.1' |
| 1738 | + ScrollSpy.VERSION = '3.3.2' |
1754 | 1739 |
|
1755 | 1740 | ScrollSpy.DEFAULTS = { |
1756 | 1741 | offset: 10 |
|
1904 | 1889 | this.element = $(element) |
1905 | 1890 | } |
1906 | 1891 |
|
1907 | | - Tab.VERSION = '3.3.1' |
| 1892 | + Tab.VERSION = '3.3.2' |
1908 | 1893 |
|
1909 | 1894 | Tab.TRANSITION_DURATION = 150 |
1910 | 1895 |
|
|
2060 | 2045 | this.checkPosition() |
2061 | 2046 | } |
2062 | 2047 |
|
2063 | | - Affix.VERSION = '3.3.1' |
| 2048 | + Affix.VERSION = '3.3.2' |
2064 | 2049 |
|
2065 | 2050 | Affix.RESET = 'affix affix-top affix-bottom' |
2066 | 2051 |
|
|
2085 | 2070 | var colliderTop = initializing ? scrollTop : position.top |
2086 | 2071 | var colliderHeight = initializing ? targetHeight : height |
2087 | 2072 |
|
2088 | | - if (offsetTop != null && colliderTop <= offsetTop) return 'top' |
| 2073 | + if (offsetTop != null && scrollTop <= offsetTop) return 'top' |
2089 | 2074 | if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom' |
2090 | 2075 |
|
2091 | 2076 | return false |
|
0 commit comments