mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document

Browse Source 
Conflicts:
	js/bootstrap-carousel.js
This commit is contained in:
Jacob Thornton
2012-10-17 23:05:16 -07:00
parent 280d4aeb30 e1f6458e36
commit 7f3b94c453
18 changed files with 130 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/js/bootstrap-button.js
Vendored
+4 -6
View File
@@ -85,12 +85,10 @@
/* BUTTON DATA-API
* =============== */
$(function () {
$('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
var $btn = $(e.target)
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
$btn.button('toggle')
})
$(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
var $btn = $(e.target)
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
$btn.button('toggle')
})
}(window.jQuery);