From: Mike Vastola Date: Mon, 10 Dec 2018 08:40:08 +0000 (-0500) Subject: Change button checkbox/radios to ignore hidden input fields (#27802) X-Git-Tag: v4.2.0~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc15c4c4ce132e70eb67335dfe840c3f0a80dae4;p=thirdparty%2Fbootstrap.git Change button checkbox/radios to ignore hidden input fields (#27802) --- diff --git a/js/src/button.js b/js/src/button.js index 75b21d94d1..53ae16955c 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -29,7 +29,7 @@ const ClassName = { const Selector = { DATA_TOGGLE_CARROT : '[data-toggle^="button"]', DATA_TOGGLE : '[data-toggle="buttons"]', - INPUT : 'input', + INPUT : 'input:not([type="hidden"])', ACTIVE : '.active', BUTTON : '.btn' } diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js index 9576dd256f..724545a532 100644 --- a/js/tests/unit/button.js +++ b/js/tests/unit/button.js @@ -139,6 +139,29 @@ $(function () { assert.ok($btn2.find('input').prop('checked'), 'btn2 is checked') }) + QUnit.test('should only toggle selectable inputs', function (assert) { + assert.expect(6) + var groupHTML = '
' + + '' + + '
' + var $group = $(groupHTML).appendTo('#qunit-fixture') + + var $btn = $group.children().eq(0) + var $hidden = $btn.find('input#option1-default') + var $cb = $btn.find('input#option1') + + assert.ok($btn.hasClass('active'), 'btn has active class') + assert.ok($cb.prop('checked'), 'btn is checked') + assert.ok(!$hidden.prop('checked'), 'hidden is not checked') + $btn.trigger('click') + assert.ok(!$btn.hasClass('active'), 'btn does not have active class') + assert.ok(!$cb.prop('checked'), 'btn is not checked') + assert.ok(!$hidden.prop('checked'), 'hidden is not checked') // should not be changed + }) + QUnit.test('should not add aria-pressed on labels for radio/checkbox inputs in a data-toggle="buttons" group', function (assert) { assert.expect(2) var groupHTML = '
' +