vendor/assets/javascripts/bootstrap/bootstrap-collapse.js in jombo-0.0.1.beta23 vs vendor/assets/javascripts/bootstrap/bootstrap-collapse.js in jombo-0.0.1.beta24
- old
+ new
@@ -1,10 +1,10 @@
/* =============================================================
* bootstrap-collapsible.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#collapsible
* =============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
@@ -123,12 +123,11 @@
* ==================== */
$(function () {
$('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
var $this = $(this)
- , target = $this.attr('data-target') || $this.attr('href')
+ , target = $this.attr('data-target') || e.preventDefault() || $this.attr('href')
, option = $(target).data('collapse') ? 'toggle' : $this.data()
- e.preventDefault()
$(target).collapse(option)
})
})
}( window.jQuery )
\ No newline at end of file