aboutsummaryrefslogtreecommitdiff
path: root/docs/dist/js/bootstrap.js
diff options
context:
space:
mode:
authorBootstrap's Grunt bot <[email protected]>2015-04-17 16:20:21 +0000
committerBootstrap's Grunt bot <[email protected]>2015-04-17 16:20:21 +0000
commit483412a7953e859fef0f83ce6062e0e07234dbdb (patch)
treedc6751c5711ec090fe925e6dbb3c48cb23bcb8b6 /docs/dist/js/bootstrap.js
parent8549722846038f2e6e9075bd41831fd0184706c4 (diff)
downloadbootstrap-483412a7953e859fef0f83ce6062e0e07234dbdb.tar.xz
bootstrap-483412a7953e859fef0f83ce6062e0e07234dbdb.zip
automatic `grunt dist`
[ci skip]
Diffstat (limited to 'docs/dist/js/bootstrap.js')
-rw-r--r--docs/dist/js/bootstrap.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js
index 335cc61ab..68a6a5000 100644
--- a/docs/dist/js/bootstrap.js
+++ b/docs/dist/js/bootstrap.js
@@ -229,8 +229,8 @@ if (typeof jQuery === 'undefined') {
if ($parent.length) {
var $input = this.$element.find('input')
if ($input.prop('type') == 'radio') {
- if ($input.prop('checked') && this.$element.hasClass('active')) changed = false
- else $parent.find('.active').removeClass('active')
+ if ($input.prop('checked')) changed = false
+ if (!$input.prop('checked') || !this.$element.hasClass('active')) $parent.find('.active').removeClass('active')
}
if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
} else {
@@ -280,7 +280,7 @@ if (typeof jQuery === 'undefined') {
var $btn = $(e.target)
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
Plugin.call($btn, 'toggle')
- e.preventDefault()
+ if (!$(e.target).is('input[type="radio"]')) e.preventDefault()
})
.on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
$(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))