Skip to content

Commit b5181d6

Browse files
author
David Miller
committed
Bootstrap 3.3.2 Update
1 parent 453f1b5 commit b5181d6

9 files changed

+592
-313
lines changed

css/bootstrap.css

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

css/bootstrap.min.css

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-208 Bytes
Binary file not shown.

fonts/glyphicons-halflings-regular.svg

Lines changed: 273 additions & 214 deletions
Loading
4.03 KB
Binary file not shown.
104 Bytes
Binary file not shown.
17.6 KB
Binary file not shown.

js/bootstrap.js

Lines changed: 55 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
2-
* Bootstrap v3.3.1 (http://getbootstrap.com)
3-
* Copyright 2011-2014 Twitter, Inc.
2+
* Bootstrap v3.3.2 (http://getbootstrap.com)
3+
* Copyright 2011-2015 Twitter, Inc.
44
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
55
*/
66

@@ -9,17 +9,18 @@ if (typeof jQuery === 'undefined') {
99
}
1010

1111
+function ($) {
12+
'use strict';
1213
var version = $.fn.jquery.split(' ')[0].split('.')
1314
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {
1415
throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher')
1516
}
1617
}(jQuery);
1718

1819
/* ========================================================================
19-
* Bootstrap: transition.js v3.3.1
20+
* Bootstrap: transition.js v3.3.2
2021
* http://getbootstrap.com/javascript/#transitions
2122
* ========================================================================
22-
* Copyright 2011-2014 Twitter, Inc.
23+
* Copyright 2011-2015 Twitter, Inc.
2324
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
2425
* ======================================================================== */
2526

@@ -76,10 +77,10 @@ if (typeof jQuery === 'undefined') {
7677
}(jQuery);
7778

7879
/* ========================================================================
79-
* Bootstrap: alert.js v3.3.1
80+
* Bootstrap: alert.js v3.3.2
8081
* http://getbootstrap.com/javascript/#alerts
8182
* ========================================================================
82-
* Copyright 2011-2014 Twitter, Inc.
83+
* Copyright 2011-2015 Twitter, Inc.
8384
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
8485
* ======================================================================== */
8586

@@ -95,7 +96,7 @@ if (typeof jQuery === 'undefined') {
9596
$(el).on('click', dismiss, this.close)
9697
}
9798

98-
Alert.VERSION = '3.3.1'
99+
Alert.VERSION = '3.3.2'
99100

100101
Alert.TRANSITION_DURATION = 150
101102

@@ -171,10 +172,10 @@ if (typeof jQuery === 'undefined') {
171172
}(jQuery);
172173

173174
/* ========================================================================
174-
* Bootstrap: button.js v3.3.1
175+
* Bootstrap: button.js v3.3.2
175176
* http://getbootstrap.com/javascript/#buttons
176177
* ========================================================================
177-
* Copyright 2011-2014 Twitter, Inc.
178+
* Copyright 2011-2015 Twitter, Inc.
178179
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
179180
* ======================================================================== */
180181

@@ -191,7 +192,7 @@ if (typeof jQuery === 'undefined') {
191192
this.isLoading = false
192193
}
193194

194-
Button.VERSION = '3.3.1'
195+
Button.VERSION = '3.3.2'
195196

196197
Button.DEFAULTS = {
197198
loadingText: 'loading...'
@@ -288,10 +289,10 @@ if (typeof jQuery === 'undefined') {
288289
}(jQuery);
289290

290291
/* ========================================================================
291-
* Bootstrap: carousel.js v3.3.1
292+
* Bootstrap: carousel.js v3.3.2
292293
* http://getbootstrap.com/javascript/#carousel
293294
* ========================================================================
294-
* Copyright 2011-2014 Twitter, Inc.
295+
* Copyright 2011-2015 Twitter, Inc.
295296
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
296297
* ======================================================================== */
297298

@@ -319,7 +320,7 @@ if (typeof jQuery === 'undefined') {
319320
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
320321
}
321322

322-
Carousel.VERSION = '3.3.1'
323+
Carousel.VERSION = '3.3.2'
323324

324325
Carousel.TRANSITION_DURATION = 600
325326

@@ -359,8 +360,11 @@ if (typeof jQuery === 'undefined') {
359360
}
360361

361362
Carousel.prototype.getItemForDirection = function (direction, active) {
362-
var delta = direction == 'prev' ? -1 : 1
363363
var activeIndex = this.getItemIndex(active)
364+
var willWrap = (direction == 'prev' && activeIndex === 0)
365+
|| (direction == 'next' && activeIndex == (this.$items.length - 1))
366+
if (willWrap && !this.options.wrap) return active
367+
var delta = direction == 'prev' ? -1 : 1
364368
var itemIndex = (activeIndex + delta) % this.$items.length
365369
return this.$items.eq(itemIndex)
366370
}
@@ -405,14 +409,8 @@ if (typeof jQuery === 'undefined') {
405409
var $next = next || this.getItemForDirection(type, $active)
406410
var isCycling = this.interval
407411
var direction = type == 'next' ? 'left' : 'right'
408-
var fallback = type == 'next' ? 'first' : 'last'
409412
var that = this
410413

411-
if (!$next.length) {
412-
if (!this.options.wrap) return
413-
$next = this.$element.find('.item')[fallback]()
414-
}
415-
416414
if ($next.hasClass('active')) return (this.sliding = false)
417415

418416
var relatedTarget = $next[0]
@@ -529,10 +527,10 @@ if (typeof jQuery === 'undefined') {
529527
}(jQuery);
530528

531529
/* ========================================================================
532-
* Bootstrap: collapse.js v3.3.1
530+
* Bootstrap: collapse.js v3.3.2
533531
* http://getbootstrap.com/javascript/#collapse
534532
* ========================================================================
535-
* Copyright 2011-2014 Twitter, Inc.
533+
* Copyright 2011-2015 Twitter, Inc.
536534
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
537535
* ======================================================================== */
538536

@@ -558,7 +556,7 @@ if (typeof jQuery === 'undefined') {
558556
if (this.options.toggle) this.toggle()
559557
}
560558

561-
Collapse.VERSION = '3.3.1'
559+
Collapse.VERSION = '3.3.2'
562560

563561
Collapse.TRANSITION_DURATION = 350
564562

@@ -576,7 +574,7 @@ if (typeof jQuery === 'undefined') {
576574
if (this.transitioning || this.$element.hasClass('in')) return
577575

578576
var activesData
579-
var actives = this.$parent && this.$parent.find('> .panel').children('.in, .collapsing')
577+
var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing')
580578

581579
if (actives && actives.length) {
582580
activesData = actives.data('bs.collapse')
@@ -741,10 +739,10 @@ if (typeof jQuery === 'undefined') {
741739
}(jQuery);
742740

743741
/* ========================================================================
744-
* Bootstrap: dropdown.js v3.3.1
742+
* Bootstrap: dropdown.js v3.3.2
745743
* http://getbootstrap.com/javascript/#dropdowns
746744
* ========================================================================
747-
* Copyright 2011-2014 Twitter, Inc.
745+
* Copyright 2011-2015 Twitter, Inc.
748746
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
749747
* ======================================================================== */
750748

@@ -761,7 +759,7 @@ if (typeof jQuery === 'undefined') {
761759
$(element).on('click.bs.dropdown', this.toggle)
762760
}
763761

764-
Dropdown.VERSION = '3.3.1'
762+
Dropdown.VERSION = '3.3.2'
765763

766764
Dropdown.prototype.toggle = function (e) {
767765
var $this = $(this)
@@ -903,10 +901,10 @@ if (typeof jQuery === 'undefined') {
903901
}(jQuery);
904902

905903
/* ========================================================================
906-
* Bootstrap: modal.js v3.3.1
904+
* Bootstrap: modal.js v3.3.2
907905
* http://getbootstrap.com/javascript/#modals
908906
* ========================================================================
909-
* Copyright 2011-2014 Twitter, Inc.
907+
* Copyright 2011-2015 Twitter, Inc.
910908
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
911909
* ======================================================================== */
912910

@@ -934,7 +932,7 @@ if (typeof jQuery === 'undefined') {
934932
}
935933
}
936934

937-
Modal.VERSION = '3.3.1'
935+
Modal.VERSION = '3.3.2'
938936

939937
Modal.TRANSITION_DURATION = 300
940938
Modal.BACKDROP_TRANSITION_DURATION = 150
@@ -1228,11 +1226,11 @@ if (typeof jQuery === 'undefined') {
12281226
}(jQuery);
12291227

12301228
/* ========================================================================
1231-
* Bootstrap: tooltip.js v3.3.1
1229+
* Bootstrap: tooltip.js v3.3.2
12321230
* http://getbootstrap.com/javascript/#tooltip
12331231
* Inspired by the original jQuery.tipsy by Jason Frame
12341232
* ========================================================================
1235-
* Copyright 2011-2014 Twitter, Inc.
1233+
* Copyright 2011-2015 Twitter, Inc.
12361234
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
12371235
* ======================================================================== */
12381236

@@ -1254,7 +1252,7 @@ if (typeof jQuery === 'undefined') {
12541252
this.init('tooltip', element, options)
12551253
}
12561254

1257-
Tooltip.VERSION = '3.3.1'
1255+
Tooltip.VERSION = '3.3.2'
12581256

12591257
Tooltip.TRANSITION_DURATION = 150
12601258

@@ -1575,10 +1573,10 @@ if (typeof jQuery === 'undefined') {
15751573
}
15761574

15771575
Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
1578-
return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } :
1579-
placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
1576+
return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } :
1577+
placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
15801578
placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
1581-
/* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
1579+
/* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
15821580

15831581
}
15841582

@@ -1674,18 +1672,12 @@ if (typeof jQuery === 'undefined') {
16741672

16751673
function Plugin(option) {
16761674
return this.each(function () {
1677-
var $this = $(this)
1678-
var data = $this.data('bs.tooltip')
1679-
var options = typeof option == 'object' && option
1680-
var selector = options && options.selector
1675+
var $this = $(this)
1676+
var data = $this.data('bs.tooltip')
1677+
var options = typeof option == 'object' && option
16811678

16821679
if (!data && option == 'destroy') return
1683-
if (selector) {
1684-
if (!data) $this.data('bs.tooltip', (data = {}))
1685-
if (!data[selector]) data[selector] = new Tooltip(this, options)
1686-
} else {
1687-
if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
1688-
}
1680+
if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
16891681
if (typeof option == 'string') data[option]()
16901682
})
16911683
}
@@ -1707,10 +1699,10 @@ if (typeof jQuery === 'undefined') {
17071699
}(jQuery);
17081700

17091701
/* ========================================================================
1710-
* Bootstrap: popover.js v3.3.1
1702+
* Bootstrap: popover.js v3.3.2
17111703
* http://getbootstrap.com/javascript/#popovers
17121704
* ========================================================================
1713-
* Copyright 2011-2014 Twitter, Inc.
1705+
* Copyright 2011-2015 Twitter, Inc.
17141706
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
17151707
* ======================================================================== */
17161708

@@ -1727,7 +1719,7 @@ if (typeof jQuery === 'undefined') {
17271719

17281720
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
17291721

1730-
Popover.VERSION = '3.3.1'
1722+
Popover.VERSION = '3.3.2'
17311723

17321724
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
17331725
placement: 'right',
@@ -1794,18 +1786,12 @@ if (typeof jQuery === 'undefined') {
17941786

17951787
function Plugin(option) {
17961788
return this.each(function () {
1797-
var $this = $(this)
1798-
var data = $this.data('bs.popover')
1799-
var options = typeof option == 'object' && option
1800-
var selector = options && options.selector
1789+
var $this = $(this)
1790+
var data = $this.data('bs.popover')
1791+
var options = typeof option == 'object' && option
18011792

18021793
if (!data && option == 'destroy') return
1803-
if (selector) {
1804-
if (!data) $this.data('bs.popover', (data = {}))
1805-
if (!data[selector]) data[selector] = new Popover(this, options)
1806-
} else {
1807-
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
1808-
}
1794+
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
18091795
if (typeof option == 'string') data[option]()
18101796
})
18111797
}
@@ -1827,10 +1813,10 @@ if (typeof jQuery === 'undefined') {
18271813
}(jQuery);
18281814

18291815
/* ========================================================================
1830-
* Bootstrap: scrollspy.js v3.3.1
1816+
* Bootstrap: scrollspy.js v3.3.2
18311817
* http://getbootstrap.com/javascript/#scrollspy
18321818
* ========================================================================
1833-
* Copyright 2011-2014 Twitter, Inc.
1819+
* Copyright 2011-2015 Twitter, Inc.
18341820
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
18351821
* ======================================================================== */
18361822

@@ -1858,7 +1844,7 @@ if (typeof jQuery === 'undefined') {
18581844
this.process()
18591845
}
18601846

1861-
ScrollSpy.VERSION = '3.3.1'
1847+
ScrollSpy.VERSION = '3.3.2'
18621848

18631849
ScrollSpy.DEFAULTS = {
18641850
offset: 10
@@ -2003,10 +1989,10 @@ if (typeof jQuery === 'undefined') {
20031989
}(jQuery);
20041990

20051991
/* ========================================================================
2006-
* Bootstrap: tab.js v3.3.1
1992+
* Bootstrap: tab.js v3.3.2
20071993
* http://getbootstrap.com/javascript/#tabs
20081994
* ========================================================================
2009-
* Copyright 2011-2014 Twitter, Inc.
1995+
* Copyright 2011-2015 Twitter, Inc.
20101996
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
20111997
* ======================================================================== */
20121998

@@ -2021,7 +2007,7 @@ if (typeof jQuery === 'undefined') {
20212007
this.element = $(element)
20222008
}
20232009

2024-
Tab.VERSION = '3.3.1'
2010+
Tab.VERSION = '3.3.2'
20252011

20262012
Tab.TRANSITION_DURATION = 150
20272013

@@ -2157,10 +2143,10 @@ if (typeof jQuery === 'undefined') {
21572143
}(jQuery);
21582144

21592145
/* ========================================================================
2160-
* Bootstrap: affix.js v3.3.1
2146+
* Bootstrap: affix.js v3.3.2
21612147
* http://getbootstrap.com/javascript/#affix
21622148
* ========================================================================
2163-
* Copyright 2011-2014 Twitter, Inc.
2149+
* Copyright 2011-2015 Twitter, Inc.
21642150
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
21652151
* ======================================================================== */
21662152

@@ -2186,7 +2172,7 @@ if (typeof jQuery === 'undefined') {
21862172
this.checkPosition()
21872173
}
21882174

2189-
Affix.VERSION = '3.3.1'
2175+
Affix.VERSION = '3.3.2'
21902176

21912177
Affix.RESET = 'affix affix-top affix-bottom'
21922178

@@ -2211,7 +2197,7 @@ if (typeof jQuery === 'undefined') {
22112197
var colliderTop = initializing ? scrollTop : position.top
22122198
var colliderHeight = initializing ? targetHeight : height
22132199

2214-
if (offsetTop != null && colliderTop <= offsetTop) return 'top'
2200+
if (offsetTop != null && scrollTop <= offsetTop) return 'top'
22152201
if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom'
22162202

22172203
return false

js/bootstrap.min.js

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

0 commit comments

Comments
 (0)