vendor/assets/javascripts/bootstrap/bootstrap-collapse.js in jombo-1.0.4 vs vendor/assets/javascripts/bootstrap/bootstrap-collapse.js in jombo-1.0.5
- old
+ new
@@ -1,7 +1,7 @@
/* =============================================================
- * bootstrap-collapse.js v2.0.2
+ * bootstrap-collapse.js v2.0.3
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -93,10 +93,10 @@
}
, transition: function (method, startEvent, completeEvent) {
var that = this
, complete = function () {
- if (startEvent == 'show') that.reset()
+ if (startEvent.type == 'show') that.reset()
that.transitioning = 0
that.$element.trigger(completeEvent)
}
this.$element.trigger(startEvent)
\ No newline at end of file