mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-17 09:52:29 +01:00
Fix Toggle buttons don't honor [disabled] or .disabled
This commit is contained in:
parent
ab39defe74
commit
33715a73d2
@ -90,6 +90,12 @@ const Button = (($) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (triggerChangeEvent) {
|
if (triggerChangeEvent) {
|
||||||
|
if (input.hasAttribute('disabled') ||
|
||||||
|
rootElement.hasAttribute('disabled') ||
|
||||||
|
input.classList.contains('disabled') ||
|
||||||
|
rootElement.classList.contains('disabled')) {
|
||||||
|
return
|
||||||
|
}
|
||||||
input.checked = !$(this._element).hasClass(ClassName.ACTIVE)
|
input.checked = !$(this._element).hasClass(ClassName.ACTIVE)
|
||||||
$(input).trigger('change')
|
$(input).trigger('change')
|
||||||
}
|
}
|
||||||
|
@ -156,4 +156,21 @@ $(function () {
|
|||||||
assert.ok($btn2.is(':not([aria-pressed])'), 'label for nested radio input has not been given an aria-pressed attribute')
|
assert.ok($btn2.is(':not([aria-pressed])'), 'label for nested radio input has not been given an aria-pressed attribute')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
QUnit.test('should handle disabled attribute on non-button elements', function (assert) {
|
||||||
|
assert.expect(2)
|
||||||
|
var groupHTML = ' <div class="btn-group disabled" data-toggle="buttons" aria-disabled="true" disabled>'
|
||||||
|
+ '<label class="btn btn-danger disabled" aria-disabled="true" disabled>'
|
||||||
|
+ '<input type="checkbox" aria-disabled="true" autocomplete="off" disabled class="disabled"/>'
|
||||||
|
+ '</label>'
|
||||||
|
+ '</div>'
|
||||||
|
var $group = $(groupHTML).appendTo('#qunit-fixture')
|
||||||
|
|
||||||
|
var $btn = $group.children().eq(0)
|
||||||
|
var $input = $btn.children().eq(0)
|
||||||
|
|
||||||
|
$btn.trigger('click')
|
||||||
|
assert.ok($btn.is(':not(.active)'), 'button did not become active')
|
||||||
|
assert.ok(!$input.is(':checked'), 'checkbox did not get checked')
|
||||||
|
})
|
||||||
|
|
||||||
})
|
})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user