mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-10-03 00:31:55 +02:00
Code Issues Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
fat
2013-05-16 17:44:50 -07:00
parent 19de2e8603
commit a72d0d6e3a
23 changed files with 1534 additions and 1616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/collapse.js
View File

@@ -56,7 +56,7 @@
}
this.$element[dimension](0)
this.transition('addClass', $.Event('bs:collapse:show'), 'shown')
this.transition('addClass', $.Event('bs:collapse:show'), 'bs:collapse:shown')
if ($.support.transition) this.$element[dimension](this.$element[0][scroll])
}
@@ -85,7 +85,7 @@
Collapse.prototype.transition = function (method, startEvent, completeEvent) {
var that = this
var complete = function () {
if (startEvent.type == 'show') that.reset()
if (startEvent.type == 'bs:collapse:show') that.reset()
that.transitioning = 0
that.$element.trigger(completeEvent)
}