Merge branch 'master' into 2.0.2-wip

Conflicts: docs/assets/bootstrap.zip
2026-06-08 17:22:31 +03:00 · 2012-02-18 23:31:37 -08:00
parent 1948e985a3 3d58b46226
commit ac6e667ad9
4 changed files with 30 additions and 3 deletions
@@ -91,7 +91,9 @@

  $(function () {
    $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
-      $(e.currentTarget).button('toggle')
+      var $btn = $(e.target)
+      if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+      $btn.button('toggle')
    })
  })