Skip to content

Commit

Permalink
rake convert[v3.4.1]
Browse files Browse the repository at this point in the history
  • Loading branch information
@glebm
glebm committed Feb 13, 2019
1 parent bb7dbf8 commit 69157ce
Show file tree
Hide file tree
Showing 18 changed files with 443 additions and 99 deletions.
264 changes: 218 additions & 46 deletions assets/javascripts/bootstrap.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions assets/javascripts/bootstrap.min.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions assets/javascripts/bootstrap/affix.js
View file
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: affix.js v3.4.0
* Bootstrap: affix.js v3.4.1
* https://getbootstrap.com/docs/3.4/javascript/#affix
* ========================================================================
* Copyright 2011-2018 Twitter, Inc.
* Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */

Expand Down Expand Up @@ -30,7 +30,7 @@
this.checkPosition()
}

Affix.VERSION = '3.4.0'
Affix.VERSION = '3.4.1'

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

Expand Down
6 changes: 3 additions & 3 deletions assets/javascripts/bootstrap/alert.js
View file
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: alert.js v3.4.0
* Bootstrap: alert.js v3.4.1
* https://getbootstrap.com/docs/3.4/javascript/#alerts
* ========================================================================
* Copyright 2011-2018 Twitter, Inc.
* Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */

Expand All @@ -18,7 +18,7 @@
$(el).on('click', dismiss, this.close)
}

Alert.VERSION = '3.4.0'
Alert.VERSION = '3.4.1'

Alert.TRANSITION_DURATION = 150

Expand Down
6 changes: 3 additions & 3 deletions assets/javascripts/bootstrap/button.js
View file
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: button.js v3.4.0
* Bootstrap: button.js v3.4.1
* https://getbootstrap.com/docs/3.4/javascript/#buttons
* ========================================================================
* Copyright 2011-2018 Twitter, Inc.
* Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */

Expand All @@ -19,7 +19,7 @@
this.isLoading = false
}

Button.VERSION = '3.4.0'
Button.VERSION = '3.4.1'

Button.DEFAULTS = {
loadingText: 'loading...'
Expand Down
6 changes: 3 additions & 3 deletions assets/javascripts/bootstrap/carousel.js
View file
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: carousel.js v3.4.0
* Bootstrap: carousel.js v3.4.1
* https://getbootstrap.com/docs/3.4/javascript/#carousel
* ========================================================================
* Copyright 2011-2018 Twitter, Inc.
* Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */

Expand Down Expand Up @@ -30,7 +30,7 @@
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
}

Carousel.VERSION = '3.4.0'
Carousel.VERSION = '3.4.1'

Carousel.TRANSITION_DURATION = 600

Expand Down
6 changes: 3 additions & 3 deletions assets/javascripts/bootstrap/collapse.js
View file
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: collapse.js v3.4.0
* Bootstrap: collapse.js v3.4.1
* https://getbootstrap.com/docs/3.4/javascript/#collapse
* ========================================================================
* Copyright 2011-2018 Twitter, Inc.
* Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */

Expand Down Expand Up @@ -30,7 +30,7 @@
if (this.options.toggle) this.toggle()
}

Collapse.VERSION = '3.4.0'
Collapse.VERSION = '3.4.1'

Collapse.TRANSITION_DURATION = 350

Expand Down
8 changes: 4 additions & 4 deletions assets/javascripts/bootstrap/dropdown.js
View file
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: dropdown.js v3.4.0
* Bootstrap: dropdown.js v3.4.1
* https://getbootstrap.com/docs/3.4/javascript/#dropdowns
* ========================================================================
* Copyright 2011-2018 Twitter, Inc.
* Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */

Expand All @@ -19,7 +19,7 @@
$(element).on('click.bs.dropdown', this.toggle)
}

Dropdown.VERSION = '3.4.0'
Dropdown.VERSION = '3.4.1'

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

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

return $parent && $parent.length ? $parent : $this.parent()
}
Expand Down
6 changes: 3 additions & 3 deletions assets/javascripts/bootstrap/modal.js
View file
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: modal.js v3.4.0
* Bootstrap: modal.js v3.4.1
* https://getbootstrap.com/docs/3.4/javascript/#modals
* ========================================================================
* Copyright 2011-2018 Twitter, Inc.
* Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */

Expand Down Expand Up @@ -34,7 +34,7 @@
}
}

Modal.VERSION = '3.4.0'
Modal.VERSION = '3.4.1'

Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150
Expand Down
29 changes: 22 additions & 7 deletions assets/javascripts/bootstrap/popover.js
View file
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: popover.js v3.4.0
* Bootstrap: popover.js v3.4.1
* https://getbootstrap.com/docs/3.4/javascript/#popovers
* ========================================================================
* Copyright 2011-2018 Twitter, Inc.
* Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */

Expand All @@ -19,7 +19,7 @@

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

Popover.VERSION = '3.4.0'
Popover.VERSION = '3.4.1'

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

$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
$tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events
this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
](content)
if (this.options.html) {
var typeContent = typeof content

if (this.options.sanitize) {
title = this.sanitizeHtml(title)

if (typeContent === 'string') {
content = this.sanitizeHtml(content)
}
}

$tip.find('.popover-title').html(title)
$tip.find('.popover-content').children().detach().end()[
typeContent === 'string' ? 'html' : 'append'
](content)
} else {
$tip.find('.popover-title').text(title)
$tip.find('.popover-content').children().detach().end().text(content)
}

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

Expand Down
6 changes: 3 additions & 3 deletions assets/javascripts/bootstrap/scrollspy.js
View file
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: scrollspy.js v3.4.0
* Bootstrap: scrollspy.js v3.4.1
* https://getbootstrap.com/docs/3.4/javascript/#scrollspy
* ========================================================================
* Copyright 2011-2018 Twitter, Inc.
* Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */

Expand All @@ -28,7 +28,7 @@
this.process()
}

ScrollSpy.VERSION = '3.4.0'
ScrollSpy.VERSION = '3.4.1'

ScrollSpy.DEFAULTS = {
offset: 10
Expand Down
6 changes: 3 additions & 3 deletions assets/javascripts/bootstrap/tab.js
View file
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: tab.js v3.4.0
* Bootstrap: tab.js v3.4.1
* https://getbootstrap.com/docs/3.4/javascript/#tabs
* ========================================================================
* Copyright 2011-2018 Twitter, Inc.
* Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */

Expand All @@ -19,7 +19,7 @@
// jscs:enable requireDollarBeforejQueryAssignment
}

Tab.VERSION = '3.4.0'
Tab.VERSION = '3.4.1'

Tab.TRANSITION_DURATION = 150

Expand Down

0 comments on commit 69157ce

Please sign in to comment.