Skip to content

Commit 69157ce

Browse files
glebmglebm
committed
rake convert[v3.4.1]
1 parent bb7dbf8 commit 69157ce

18 files changed

Lines changed: 443 additions & 99 deletions

File tree

‎assets/javascripts/bootstrap.js‎

Lines changed: 218 additions & 46 deletions
Large diffs are not rendered by default.

‎assets/javascripts/bootstrap.min.js‎

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

‎assets/javascripts/bootstrap/affix.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
2-
* Bootstrap: affix.js v3.4.0
2+
* Bootstrap: affix.js v3.4.1
33
* https://getbootstrap.com/docs/3.4/javascript/#affix
44
* ========================================================================
5-
* Copyright 2011-2018 Twitter, Inc.
5+
* Copyright 2011-2019 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

@@ -30,7 +30,7 @@
3030
this.checkPosition()
3131
}
3232

33-
Affix.VERSION = '3.4.0'
33+
Affix.VERSION = '3.4.1'
3434

3535
Affix.RESET = 'affix affix-top affix-bottom'
3636

‎assets/javascripts/bootstrap/alert.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
2-
* Bootstrap: alert.js v3.4.0
2+
* Bootstrap: alert.js v3.4.1
33
* https://getbootstrap.com/docs/3.4/javascript/#alerts
44
* ========================================================================
5-
* Copyright 2011-2018 Twitter, Inc.
5+
* Copyright 2011-2019 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

@@ -18,7 +18,7 @@
1818
$(el).on('click', dismiss, this.close)
1919
}
2020

21-
Alert.VERSION = '3.4.0'
21+
Alert.VERSION = '3.4.1'
2222

2323
Alert.TRANSITION_DURATION = 150
2424

‎assets/javascripts/bootstrap/button.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
2-
* Bootstrap: button.js v3.4.0
2+
* Bootstrap: button.js v3.4.1
33
* https://getbootstrap.com/docs/3.4/javascript/#buttons
44
* ========================================================================
5-
* Copyright 2011-2018 Twitter, Inc.
5+
* Copyright 2011-2019 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

@@ -19,7 +19,7 @@
1919
this.isLoading = false
2020
}
2121

22-
Button.VERSION = '3.4.0'
22+
Button.VERSION = '3.4.1'
2323

2424
Button.DEFAULTS = {
2525
loadingText: 'loading...'

‎assets/javascripts/bootstrap/carousel.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
2-
* Bootstrap: carousel.js v3.4.0
2+
* Bootstrap: carousel.js v3.4.1
33
* https://getbootstrap.com/docs/3.4/javascript/#carousel
44
* ========================================================================
5-
* Copyright 2011-2018 Twitter, Inc.
5+
* Copyright 2011-2019 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

@@ -30,7 +30,7 @@
3030
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
3131
}
3232

33-
Carousel.VERSION = '3.4.0'
33+
Carousel.VERSION = '3.4.1'
3434

3535
Carousel.TRANSITION_DURATION = 600
3636

‎assets/javascripts/bootstrap/collapse.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
2-
* Bootstrap: collapse.js v3.4.0
2+
* Bootstrap: collapse.js v3.4.1
33
* https://getbootstrap.com/docs/3.4/javascript/#collapse
44
* ========================================================================
5-
* Copyright 2011-2018 Twitter, Inc.
5+
* Copyright 2011-2019 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

@@ -30,7 +30,7 @@
3030
if (this.options.toggle) this.toggle()
3131
}
3232

33-
Collapse.VERSION = '3.4.0'
33+
Collapse.VERSION = '3.4.1'
3434

3535
Collapse.TRANSITION_DURATION = 350
3636

‎assets/javascripts/bootstrap/dropdown.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
2-
* Bootstrap: dropdown.js v3.4.0
2+
* Bootstrap: dropdown.js v3.4.1
33
* https://getbootstrap.com/docs/3.4/javascript/#dropdowns
44
* ========================================================================
5-
* Copyright 2011-2018 Twitter, Inc.
5+
* Copyright 2011-2019 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

@@ -19,7 +19,7 @@
1919
$(element).on('click.bs.dropdown', this.toggle)
2020
}
2121

22-
Dropdown.VERSION = '3.4.0'
22+
Dropdown.VERSION = '3.4.1'
2323

2424
function getParent($this) {
2525
var selector = $this.attr('data-target')
@@ -29,7 +29,7 @@
2929
selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
3030
}
3131

32-
var $parent = selector && $(document).find(selector)
32+
var $parent = selector !== '#' ? $(document).find(selector) : null
3333

3434
return $parent && $parent.length ? $parent : $this.parent()
3535
}

‎assets/javascripts/bootstrap/modal.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
2-
* Bootstrap: modal.js v3.4.0
2+
* Bootstrap: modal.js v3.4.1
33
* https://getbootstrap.com/docs/3.4/javascript/#modals
44
* ========================================================================
5-
* Copyright 2011-2018 Twitter, Inc.
5+
* Copyright 2011-2019 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

@@ -34,7 +34,7 @@
3434
}
3535
}
3636

37-
Modal.VERSION = '3.4.0'
37+
Modal.VERSION = '3.4.1'
3838

3939
Modal.TRANSITION_DURATION = 300
4040
Modal.BACKDROP_TRANSITION_DURATION = 150

‎assets/javascripts/bootstrap/popover.js‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
2-
* Bootstrap: popover.js v3.4.0
2+
* Bootstrap: popover.js v3.4.1
33
* https://getbootstrap.com/docs/3.4/javascript/#popovers
44
* ========================================================================
5-
* Copyright 2011-2018 Twitter, Inc.
5+
* Copyright 2011-2019 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

@@ -19,7 +19,7 @@
1919

2020
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
2121

22-
Popover.VERSION = '3.4.0'
22+
Popover.VERSION = '3.4.1'
2323

2424
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
2525
placement: 'right',
@@ -45,10 +45,25 @@
4545
var title = this.getTitle()
4646
var content = this.getContent()
4747

48-
$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
49-
$tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events
50-
this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
51-
](content)
48+
if (this.options.html) {
49+
var typeContent = typeof content
50+
51+
if (this.options.sanitize) {
52+
title = this.sanitizeHtml(title)
53+
54+
if (typeContent === 'string') {
55+
content = this.sanitizeHtml(content)
56+
}
57+
}
58+
59+
$tip.find('.popover-title').html(title)
60+
$tip.find('.popover-content').children().detach().end()[
61+
typeContent === 'string' ? 'html' : 'append'
62+
](content)
63+
} else {
64+
$tip.find('.popover-title').text(title)
65+
$tip.find('.popover-content').children().detach().end().text(content)
66+
}
5267

5368
$tip.removeClass('fade top bottom left right in')
5469

0 commit comments

Comments
 (0)