1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-01 01:21:49 +02:00

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

This commit is contained in:
Mark Otto
2013-07-25 21:49:50 -07:00
5 changed files with 8 additions and 6 deletions

View File

@@ -1,3 +1,5 @@
if (!jQuery) throw new Error("Bootstrap requires jQuery")
/* ========================================================================
* Bootstrap: transition.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#transitions
@@ -547,7 +549,7 @@
var dimension = this.dimension()
this.reset(this.$element[dimension]())
this.transition('removeClass', 'shown.bs.hidden')
this.transition('removeClass', 'hidden.bs.collapse')
this.$element[dimension](0)
}
@@ -1573,7 +1575,7 @@
return ($href
&& $href.length
&& [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
&& [[ $href.offset().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
})
.sort(function (a, b) { return a[0] - b[0] })
.each(function () {

File diff suppressed because one or more lines are too long