mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-12 16:44:17 +02:00
Code Issues Releases Wiki Activity

remove flaky pos bottom test which is effect by unit scroll pos

Browse Source
This commit is contained in:
fat
2014-01-16 13:44:08 -08:00
parent 2f76821a4d
commit 3b2418e688
8 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dist/js/bootstrap.js vendored
View File

@@ -322,7 +322,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
Carousel.prototype.pause = function (e) {
e || (this.paused = true)
if (this.$element.find('.next, .prev').length && $.support.transition.end) {
if (this.$element.find('.next, .prev').length && $.support.transition) {
this.$element.trigger($.support.transition.end)
this.cycle(true)
}
@@ -587,6 +587,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
var data = $this.data('bs.collapse')
var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
if (!data && options.toggle && option == 'show') option = !option
if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
if (typeof option == 'string') data[option]()
})

2
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long