mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

change namespace back to dot notation and someother js shizzle

Browse Source
This commit is contained in:
fat
2013-05-16 20:19:51 -07:00
parent 5ab72f7687
commit 140ef2320b
22 changed files with 105 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/collapse.js
+3 -3
View File
@@ -56,7 +56,7 @@
}
this.$element[dimension](0)
this.transition('addClass', $.Event('bs:collapse:show'), 'bs:collapse:shown')
this.transition('addClass', $.Event('show.bs.collapse'), 'shown.bs.collapse')
if ($.support.transition) this.$element[dimension](this.$element[0][scroll])
}
@@ -65,7 +65,7 @@
if (this.transitioning || !this.$element.hasClass('in')) return
var dimension = this.dimension()
this.reset(this.$element[dimension]())
this.transition('removeClass', $.Event('bs:collapse:hide'), 'hidden')
this.transition('removeClass', $.Event('hide.bs.collapse'), 'hidden')
this.$element[dimension](0)
}
@@ -85,7 +85,7 @@
Collapse.prototype.transition = function (method, startEvent, completeEvent) {
var that = this
var complete = function () {
if (startEvent.type == 'bs:collapse:show') that.reset()
if (startEvent.type == 'show') that.reset()
that.transitioning = 0
that.$element.trigger(completeEvent)
}