From 5a81033b1523c291e36ecc1b85f94bac926a9307 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Mon, 27 May 2019 20:44:32 +0100
Subject: [PATCH 01/30] Fix keyboard behaviour for button plugin checkbox/radio
 buttons

- remove `preventDefault()` which stopped regular keyboard behaviour (as currently using keyboard only changes styling on the `.btn`)
- special-case checkbox input check in `toggle()` function, to avoid double-triggering (leaving checkbox back in its original state) when using mouse
---
 js/src/button.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/js/src/button.js b/js/src/button.js
index fcf805502a33..25e4b3d68684 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -81,6 +81,10 @@ class Button {
               $(activeElement).removeClass(ClassName.ACTIVE)
             }
           }
+        } else if (input.type === 'checkbox') {
+          if (input.checked === this._element.classList.contains(ClassName.ACTIVE)) {
+            triggerChangeEvent = false
+          }
         }
 
         if (triggerChangeEvent) {
@@ -140,8 +144,6 @@ class Button {
 
 $(document)
   .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, (event) => {
-    event.preventDefault()
-
     let button = event.target
 
     if (!$(button).hasClass(ClassName.BUTTON)) {

From 639a2a23f225bdbfea3286da673b8018363a85b8 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Mon, 27 May 2019 22:21:29 +0100
Subject: [PATCH 02/30] Make additional checkbox handling only apply when click
 happened on a label

- while the ideal pattern for authors to use is `<label><input...></label>`, they MAY stray from it. in those cases, the extra check (which avoids the double-triggering, since we don't prevent
default anymore) should not happen, as otherwise the checkbox would never get triggered
---
 js/src/button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/button.js b/js/src/button.js
index 25e4b3d68684..075fbd69087c 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -82,7 +82,7 @@ class Button {
             }
           }
         } else if (input.type === 'checkbox') {
-          if (input.checked === this._element.classList.contains(ClassName.ACTIVE)) {
+          if (this._element.tagName === 'LABEL' && input.checked === this._element.classList.contains(ClassName.ACTIVE)) {
             triggerChangeEvent = false
           }
         }

From 847cd68fc1e49e00075fe70382b6751964e0ac49 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Mon, 27 May 2019 22:53:17 +0100
Subject: [PATCH 03/30] Change toggle selectable inputs unit test

an admittedly jury-rigged tweak, but as running `trigger('click')` in qunit/headless chrome does not fire the same default behaviour as a real click on a `<label>` (which the changed button.js now
relies on), and the point of the test is not related to that aspect, this should be acceptable.

otherwise, this needs to be tested not with `trigger('click')`, but with a fully fledged async event dispatch of synthetic click event.
---
 js/tests/unit/button.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 724545a532e6..0ad691d6167a 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -142,11 +142,11 @@ $(function () {
   QUnit.test('should only toggle selectable inputs', function (assert) {
     assert.expect(6)
     var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
-      '<label class="btn btn-primary active">' +
+      '<div class="btn btn-primary active">' +
       '<input type="hidden" name="option1" id="option1-default" value="false">' +
       '<input type="checkbox" name="option1" id="option1" checked="true"> Option 1' +
-      '</label>' +
-      '</div>'
+      '</div>' +
+      '</div>' // use <div> rather than <label>, as not easy to trigger a proper click on a label (short of setting up async event dispatching to the headless browser)
     var $group = $(groupHTML).appendTo('#qunit-fixture')
 
     var $btn = $group.children().eq(0)

From 1206b75924274a50bc3fe142cb63f88e442ea1b7 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 09:32:54 +0100
Subject: [PATCH 04/30] Split out check for disabled input and disabled root
 element and do it much earlier

bail a lot sooner and avoid extra contortions...
---
 js/src/button.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/js/src/button.js b/js/src/button.js
index 075fbd69087c..9892e7c22c2e 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -67,9 +67,17 @@ class Button {
     )[0]
 
     if (rootElement) {
+      if (rootElement.hasAttribute('disabled') || rootElement.classList.contains('disabled')) {
+        return
+      }
+
       const input = this._element.querySelector(Selector.INPUT)
 
       if (input) {
+        if (input.hasAttribute('disabled') || input.classList.contains('disabled')) {
+          return
+        }
+
         if (input.type === 'radio') {
           if (input.checked &&
             this._element.classList.contains(ClassName.ACTIVE)) {
@@ -88,12 +96,6 @@ class Button {
         }
 
         if (triggerChangeEvent) {
-          if (input.hasAttribute('disabled') ||
-            rootElement.hasAttribute('disabled') ||
-            input.classList.contains('disabled') ||
-            rootElement.classList.contains('disabled')) {
-            return
-          }
           input.checked = !this._element.classList.contains(ClassName.ACTIVE)
           $(input).trigger('change')
         }

From 8fb8b9afebf6e635e7e7ca288c2ba0217824860e Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 10:16:54 +0100
Subject: [PATCH 05/30] Tweak test to avoid reliance on browser default
 behaviour which currently our qunit tests don't do

---
 js/tests/unit/button.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 0ad691d6167a..e828e152d84f 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -183,10 +183,10 @@ $(function () {
   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>' +
+      '<div class="btn btn-danger disabled">' +
       '<input type="checkbox" aria-disabled="true" autocomplete="off" disabled class="disabled"/>' +
-      '</label>' +
-      '</div>'
+      '</div>' +
+      '</div>' // use <div> rather than <label>, as not easy to trigger a proper click on a label (short of setting up async event dispatching to the headless browser)
     var $group = $(groupHTML).appendTo('#qunit-fixture')
 
     var $btn = $group.children().eq(0)

From caf7353c8240394987976345c99f790dcb076f7d Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 10:40:30 +0100
Subject: [PATCH 06/30] Further tweak to qunit test

See if using `click()` fixes the problem/triggers default browser behaviour without the need for replacing `<label>` with `<div>`
---
 js/tests/unit/button.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index e828e152d84f..7c373049be15 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -183,16 +183,16 @@ $(function () {
   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>' +
-      '<div class="btn btn-danger disabled">' +
+      '<label class="btn btn-danger disabled">' +
       '<input type="checkbox" aria-disabled="true" autocomplete="off" disabled class="disabled"/>' +
-      '</div>' +
-      '</div>' // use <div> rather than <label>, as not easy to trigger a proper click on a label (short of setting up async event dispatching to the headless browser)
+      '</label>' +
+      '</div>'
     var $group = $(groupHTML).appendTo('#qunit-fixture')
 
     var $btn = $group.children().eq(0)
     var $input = $btn.children().eq(0)
 
-    $btn.trigger('click')
+    $btn.click()
     assert.ok($btn.is(':not(.active)'), 'button did not become active')
     assert.ok(!$input.is(':checked'), 'checkbox did not get checked')
   })

From b8f0a3b166dd8f43b3f21f27b10015b3e8e631a9 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 10:57:23 +0100
Subject: [PATCH 07/30] Test checked state of input using prop() rather than
 :checked

---
 js/tests/unit/button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 7c373049be15..97524a2769a4 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -194,7 +194,7 @@ $(function () {
 
     $btn.click()
     assert.ok($btn.is(':not(.active)'), 'button did not become active')
-    assert.ok(!$input.is(':checked'), 'checkbox did not get checked')
+    assert.ok(!$input.prop('checked'), 'checkbox did not get checked')
   })
 
   QUnit.test('dispose should remove data and the element', function (assert) {

From d35e5def7548c3dfd7c2a4234cca25ae40e18461 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 11:18:52 +0100
Subject: [PATCH 08/30] Expand test to more explicitly check preconditions

---
 js/tests/unit/button.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 97524a2769a4..70ac2ac47d48 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -181,7 +181,7 @@ $(function () {
   })
 
   QUnit.test('should handle disabled attribute on non-button elements', function (assert) {
-    assert.expect(2)
+    assert.expect(4)
     var groupHTML = '<div class="btn-group disabled" data-toggle="buttons" aria-disabled="true" disabled>' +
       '<label class="btn btn-danger disabled">' +
       '<input type="checkbox" aria-disabled="true" autocomplete="off" disabled class="disabled"/>' +
@@ -192,6 +192,8 @@ $(function () {
     var $btn = $group.children().eq(0)
     var $input = $btn.children().eq(0)
 
+    assert.ok($btn.is(':not(.active)'), 'button is initially not active')
+    assert.ok(!$input.prop('checked'), 'checkbox is initially not checked')
     $btn.click()
     assert.ok($btn.is(':not(.active)'), 'button did not become active')
     assert.ok(!$input.prop('checked'), 'checkbox did not get checked')

From 515a47862a882dd4b7c662189628a2cd437a9c84 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 11:53:39 +0100
Subject: [PATCH 09/30] Change === to == comparison

---
 js/src/button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/button.js b/js/src/button.js
index 9892e7c22c2e..16f6dd5a5591 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -90,7 +90,7 @@ class Button {
             }
           }
         } else if (input.type === 'checkbox') {
-          if (this._element.tagName === 'LABEL' && input.checked === this._element.classList.contains(ClassName.ACTIVE)) {
+          if (this._element.tagName === 'LABEL' && input.checked == this._element.classList.contains(ClassName.ACTIVE)) {
             triggerChangeEvent = false
           }
         }

From c926bc4f72595056a98e583622544fc0c70c923a Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 12:37:58 +0100
Subject: [PATCH 10/30] Undo last change of === to ==

---
 js/src/button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/button.js b/js/src/button.js
index 16f6dd5a5591..9892e7c22c2e 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -90,7 +90,7 @@ class Button {
             }
           }
         } else if (input.type === 'checkbox') {
-          if (this._element.tagName === 'LABEL' && input.checked == this._element.classList.contains(ClassName.ACTIVE)) {
+          if (this._element.tagName === 'LABEL' && input.checked === this._element.classList.contains(ClassName.ACTIVE)) {
             triggerChangeEvent = false
           }
         }

From 088f14413700a24c79a098db7c739b1feb5ecb92 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 13:10:13 +0100
Subject: [PATCH 11/30] Revert hacky tweak to "toggle selectable inputs" test
 but use proper click on DOM node instead

the original problem (which the hack to replace `<label>` with `<div>` circumvented) was that `click()` on a jQuery object is simply an alias for `trigger('click')`. adding the `[0]` instead lets
us trigger the proper `click()` method on the actual DOM node, which then does the correct browser behaviour.
---
 js/tests/unit/button.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 70ac2ac47d48..1ebf79fac8af 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -142,11 +142,11 @@ $(function () {
   QUnit.test('should only toggle selectable inputs', function (assert) {
     assert.expect(6)
     var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
-      '<div class="btn btn-primary active">' +
+      '<label class="btn btn-primary active">' +
       '<input type="hidden" name="option1" id="option1-default" value="false">' +
       '<input type="checkbox" name="option1" id="option1" checked="true"> Option 1' +
-      '</div>' +
-      '</div>' // use <div> rather than <label>, as not easy to trigger a proper click on a label (short of setting up async event dispatching to the headless browser)
+      '</label>' +
+      '</div>'
     var $group = $(groupHTML).appendTo('#qunit-fixture')
 
     var $btn = $group.children().eq(0)
@@ -156,7 +156,7 @@ $(function () {
     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')
+    $btn[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to 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
@@ -184,7 +184,7 @@ $(function () {
     assert.expect(4)
     var groupHTML = '<div class="btn-group disabled" data-toggle="buttons" aria-disabled="true" disabled>' +
       '<label class="btn btn-danger disabled">' +
-      '<input type="checkbox" aria-disabled="true" autocomplete="off" disabled class="disabled"/>' +
+      '<input type="checkbox" aria-disabled="true" autocomplete="off" disabled>' +
       '</label>' +
       '</div>'
     var $group = $(groupHTML).appendTo('#qunit-fixture')
@@ -194,7 +194,7 @@ $(function () {
 
     assert.ok($btn.is(':not(.active)'), 'button is initially not active')
     assert.ok(!$input.prop('checked'), 'checkbox is initially not checked')
-    $btn.click()
+    $btn[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
     assert.ok($btn.is(':not(.active)'), 'button did not become active')
     assert.ok(!$input.prop('checked'), 'checkbox did not get checked')
   })

From 0f3818f35ec265ab054aa60b25045e253a777119 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 13:37:00 +0100
Subject: [PATCH 12/30] Changing toggle selectable inputs test

It's contrived (you wouldn't have a label around a hidden and a real input - this may have been more relevant back when these custom checkboxes used something other than `<label>`). It also seems
to cause a bug in IE10/11 otherwise (even just in vanilla HTML, no BS or jQuery involved) where clicking on the label with the mouse doesn't trigger checkbox. As this is contrived, opting to
jury-rig this.
---
 js/tests/unit/button.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 1ebf79fac8af..6792e8913c70 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -142,11 +142,11 @@ $(function () {
   QUnit.test('should only toggle selectable inputs', function (assert) {
     assert.expect(6)
     var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
-      '<label class="btn btn-primary active">' +
+      '<div class="btn btn-primary active">' +
       '<input type="hidden" name="option1" id="option1-default" value="false">' +
       '<input type="checkbox" name="option1" id="option1" checked="true"> Option 1' +
-      '</label>' +
-      '</div>'
+      '</div>' +
+      '</div>' // using a <div> rather than <label> to work around an IE10/11 bug with labels around multiple inputs not correctly triggering checkboxes
     var $group = $(groupHTML).appendTo('#qunit-fixture')
 
     var $btn = $group.children().eq(0)

From 6b5588a552994fb7384a80b151be3fa0b79b8bda Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 13:42:10 +0100
Subject: [PATCH 13/30] Removing contrived/non-real world test

Since moving to proper nested `<label> <input> </label>` syntax, the test for having an extra hidden input inside there is irrelevant. Likely left over from a time before the correct label element
was used as a wrapper for these faked checkboxes.

Opting to remove this.
---
 js/tests/unit/button.js | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 6792e8913c70..2411a057f5f0 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -139,29 +139,6 @@ $(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 = '<div class="btn-group" data-toggle="buttons">' +
-      '<div class="btn btn-primary active">' +
-      '<input type="hidden" name="option1" id="option1-default" value="false">' +
-      '<input type="checkbox" name="option1" id="option1" checked="true"> Option 1' +
-      '</div>' +
-      '</div>' // using a <div> rather than <label> to work around an IE10/11 bug with labels around multiple inputs not correctly triggering checkboxes
-    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[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to 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 = '<div class="btn-group" data-toggle="buttons">' +

From 5311b8cbd962fdebe8ff416778570e7bf865d67d Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 14:03:22 +0100
Subject: [PATCH 14/30] Add missing handling for aria-pressed toggle buttons
 with disabled class

This handling and test were missing...
---
 js/src/button.js        | 14 ++++++++------
 js/tests/unit/button.js | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/js/src/button.js b/js/src/button.js
index 9892e7c22c2e..f9232488e7cb 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -105,13 +105,15 @@ class Button {
       }
     }
 
-    if (addAriaPressed) {
-      this._element.setAttribute('aria-pressed',
-        !this._element.classList.contains(ClassName.ACTIVE))
-    }
+    if (!(this._element.hasAttribute('disabled') || this._element.classList.contains('disabled'))) {
+      if (addAriaPressed) {
+        this._element.setAttribute('aria-pressed',
+          !this._element.classList.contains(ClassName.ACTIVE))
+      }
 
-    if (triggerChangeEvent) {
-      $(this._element).toggleClass(ClassName.ACTIVE)
+      if (triggerChangeEvent) {
+        $(this._element).toggleClass(ClassName.ACTIVE)
+      }
     }
   }
 
diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 2411a057f5f0..1398b749f2ea 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -61,6 +61,22 @@ $(function () {
     assert.strictEqual($btn.attr('aria-pressed'), 'true', 'btn aria-pressed state is true')
   })
 
+  QUnit.test('should not toggle aria-pressed on buttons with disabled class', function (assert) {
+    assert.expect(2)
+    var $btn = $('<button class="btn disabled" data-toggle="button" aria-pressed="false">redux</button>')
+    assert.strictEqual($btn.attr('aria-pressed'), 'false', 'btn aria-pressed state is false')
+    $btn.bootstrapButton('toggle')
+    assert.strictEqual($btn.attr('aria-pressed'), 'false', 'btn aria-pressed state is still false')
+  })
+
+  QUnit.test('should not toggle aria-pressed on buttons that are disabled', function (assert) {
+    assert.expect(2)
+    var $btn = $('<button class="btn" data-toggle="button" aria-pressed="false" disabled>redux</button>')
+    assert.strictEqual($btn.attr('aria-pressed'), 'false', 'btn aria-pressed state is false')
+    $btn.bootstrapButton('toggle')
+    assert.strictEqual($btn.attr('aria-pressed'), 'false', 'btn aria-pressed state is still false')
+  })
+
   QUnit.test('should toggle aria-pressed on buttons with container', function (assert) {
     assert.expect(1)
     var groupHTML = '<div class="btn-group" data-toggle="buttons">' +

From 94237188c257a32b34be64e8517c64df5a74fb86 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 17:31:04 +0100
Subject: [PATCH 15/30] Fix Firefox issue

turns out this was all due to a fundamental bug in Firefox's native handling of checkboxes/labels https://bugzilla.mozilla.org/show_bug.cgi?id=1540995
As this whole PR essentially removes the `preventDefault` we used to do (as THAT was preventing correct keyboard behavior), we started hitting these cases where default handling in Firefox is
borked and needed lots of extra defensive coding around it.
---
 js/src/button.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/js/src/button.js b/js/src/button.js
index f9232488e7cb..4156b27fd7d3 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -65,6 +65,9 @@ class Button {
     const rootElement = $(this._element).closest(
       Selector.DATA_TOGGLE
     )[0]
+    if (this._element.hasAttribute('disabled') || this._element.classList.contains('disabled')) {
+      return
+    }
 
     if (rootElement) {
       if (rootElement.hasAttribute('disabled') || rootElement.classList.contains('disabled')) {
@@ -151,10 +154,17 @@ $(document)
     let button = event.target
 
     if (!$(button).hasClass(ClassName.BUTTON)) {
-      button = $(button).closest(Selector.BUTTON)
+      button = $(button).closest(Selector.BUTTON)[0]
     }
 
-    Button._jQueryInterface.call($(button), 'toggle')
+    if (button) {
+      if (button.hasAttribute('disabled') || button.classList.contains('disabled')) {
+        // work around Firefox bug #1540995
+        event.preventDefault()
+      } else {
+        Button._jQueryInterface.call($(button), 'toggle')
+      }
+    }
   })
   .on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, (event) => {
     const button = $(event.target).closest(Selector.BUTTON)[0]

From eb025e144fd1f05b5dc6b9eb178ca4a8ce0a1c95 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 17:38:16 +0100
Subject: [PATCH 16/30] Increase allowed complexity in eslint

Bump complexity, as it's needed for the extra defensive button plugin stuff with all the additional checks to avoid the Firefox bug.
Can be turned back to default 20 once we stop overloading the button plugin to do fake checkboxes, fake radio buttons, AND aria-pressed toggles all at the same time...
---
 .eslintrc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index bfd2d333ae60..4589fffa7456 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -19,7 +19,7 @@
     "array-callback-return": "error",
     "block-scoped-var": "error",
     "class-methods-use-this": "off",
-    "complexity": "error",
+    "complexity": ["error", 22],
     "consistent-return": "error",
     "curly": "error",
     "default-case": "error",

From 762d24f99185588344be77b1306493dea4f9b9f2 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 17:42:38 +0100
Subject: [PATCH 17/30] reset eslintrc

---
 .eslintrc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 4589fffa7456..bfd2d333ae60 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -19,7 +19,7 @@
     "array-callback-return": "error",
     "block-scoped-var": "error",
     "class-methods-use-this": "off",
-    "complexity": ["error", 22],
+    "complexity": "error",
     "consistent-return": "error",
     "curly": "error",
     "default-case": "error",

From 9993680cb53f2abbe776bb62d03166fa5ba20652 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 29 May 2019 17:43:37 +0100
Subject: [PATCH 18/30] Remove now unnecessary extra defensive check

Since this was moved to the actual `on(Event...)` part
---
 js/src/button.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/js/src/button.js b/js/src/button.js
index 4156b27fd7d3..d1d85c02db13 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -65,9 +65,6 @@ class Button {
     const rootElement = $(this._element).closest(
       Selector.DATA_TOGGLE
     )[0]
-    if (this._element.hasAttribute('disabled') || this._element.classList.contains('disabled')) {
-      return
-    }
 
     if (rootElement) {
       if (rootElement.hasAttribute('disabled') || rootElement.classList.contains('disabled')) {

From b4e9349cedf3595a485f4b986e3112e90845fb5c Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Tue, 4 Jun 2019 19:33:49 +0100
Subject: [PATCH 19/30] Add basic unit test for <label><input></label>
 behaviour

---
 js/tests/unit/button.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 1398b749f2ea..a295d19a7099 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -192,6 +192,25 @@ $(function () {
     assert.ok(!$input.prop('checked'), 'checkbox did not get checked')
   })
 
+  QUnit.test('should correctly set checked state on input and active class on label when using <label><input></label> structure', function (assert) {
+    assert.expect(4)
+    var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
+      '<label class="btn">' +
+      '<input type="checkbox" autocomplete="off">' +
+      '</label>' +
+      '</div>'
+    var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+    var $label = $group.children().eq(0)
+    var $input = $label.children().eq(0)
+
+    assert.ok($label.is(':not(.active)'), 'label is initially not active')
+    assert.ok(!$input.prop('checked'), 'checkbox is initially not checked')
+    $label[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+    assert.ok($label.is('.active'), 'label is active after click')
+    assert.ok($input.prop('checked'), 'checkbox is checked after click')
+  })
+
   QUnit.test('dispose should remove data and the element', function (assert) {
     assert.expect(2)
 

From 43770d91f83c0a32d5faaaa7936228a6ea2ae065 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Tue, 4 Jun 2019 20:20:41 +0100
Subject: [PATCH 20/30] Remove potentially unnecessary check

---
 js/src/button.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/js/src/button.js b/js/src/button.js
index d1d85c02db13..9edec5bf3fcc 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -67,10 +67,6 @@ class Button {
     )[0]
 
     if (rootElement) {
-      if (rootElement.hasAttribute('disabled') || rootElement.classList.contains('disabled')) {
-        return
-      }
-
       const input = this._element.querySelector(Selector.INPUT)
 
       if (input) {

From 29ba162f25c057809a8c945b96616f8a837cd878 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Tue, 4 Jun 2019 20:39:10 +0100
Subject: [PATCH 21/30] Add check for button without disabled class but
 actually disabled inner checkbox

---
 js/tests/unit/button.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index a295d19a7099..619ee738fa03 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -192,6 +192,25 @@ $(function () {
     assert.ok(!$input.prop('checked'), 'checkbox did not get checked')
   })
 
+  QUnit.test('should not set active class if inner hidden checkbox is disabled but author forgot to set disabled class on outer button', function (assert) {
+    assert.expect(4)
+    var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
+      '<label class="btn btn-danger">' +
+      '<input type="checkbox" autocomplete="off" disabled>' +
+      '</label>' +
+      '</div>'
+    var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+    var $btn = $group.children().eq(0)
+    var $input = $btn.children().eq(0)
+
+    assert.ok($btn.is(':not(.active)'), 'button is initially not active')
+    assert.ok(!$input.prop('checked'), 'checkbox is initially not checked')
+    $btn[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+    assert.ok($btn.is(':not(.active)'), 'button did not become active')
+    assert.ok(!$input.prop('checked'), 'checkbox did not get checked')
+  })
+
   QUnit.test('should correctly set checked state on input and active class on label when using <label><input></label> structure', function (assert) {
     assert.expect(4)
     var groupHTML = '<div class="btn-group" data-toggle="buttons">' +

From 46259f26a240c5d99960109f85f5cf685a2aae5d Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Tue, 4 Jun 2019 21:10:23 +0100
Subject: [PATCH 22/30] Revert "Add check for button without disabled class but
 actually disabled inner checkbox"

This reverts commit 29ba162f25c057809a8c945b96616f8a837cd878.
---
 js/tests/unit/button.js | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 619ee738fa03..a295d19a7099 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -192,25 +192,6 @@ $(function () {
     assert.ok(!$input.prop('checked'), 'checkbox did not get checked')
   })
 
-  QUnit.test('should not set active class if inner hidden checkbox is disabled but author forgot to set disabled class on outer button', function (assert) {
-    assert.expect(4)
-    var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
-      '<label class="btn btn-danger">' +
-      '<input type="checkbox" autocomplete="off" disabled>' +
-      '</label>' +
-      '</div>'
-    var $group = $(groupHTML).appendTo('#qunit-fixture')
-
-    var $btn = $group.children().eq(0)
-    var $input = $btn.children().eq(0)
-
-    assert.ok($btn.is(':not(.active)'), 'button is initially not active')
-    assert.ok(!$input.prop('checked'), 'checkbox is initially not checked')
-    $btn[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
-    assert.ok($btn.is(':not(.active)'), 'button did not become active')
-    assert.ok(!$input.prop('checked'), 'checkbox did not get checked')
-  })
-
   QUnit.test('should correctly set checked state on input and active class on label when using <label><input></label> structure', function (assert) {
     assert.expect(4)
     var groupHTML = '<div class="btn-group" data-toggle="buttons">' +

From 06ea53e132fb691eb9168358d354c4a8b466585f Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Tue, 4 Jun 2019 21:46:05 +0100
Subject: [PATCH 23/30] Move disabled input check to work around Firefox bug
 into initial handler code

admittedly quite awkward, but that Firefox bug is tenacious...
---
 js/src/button.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/js/src/button.js b/js/src/button.js
index 9edec5bf3fcc..84bf81f08218 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -70,10 +70,6 @@ class Button {
       const input = this._element.querySelector(Selector.INPUT)
 
       if (input) {
-        if (input.hasAttribute('disabled') || input.classList.contains('disabled')) {
-          return
-        }
-
         if (input.type === 'radio') {
           if (input.checked &&
             this._element.classList.contains(ClassName.ACTIVE)) {
@@ -152,8 +148,9 @@ $(document)
 
     if (button) {
       if (button.hasAttribute('disabled') || button.classList.contains('disabled')) {
-        // work around Firefox bug #1540995
-        event.preventDefault()
+        event.preventDefault() // work around Firefox bug #1540995
+      } else if (button.querySelector(Selector.INPUT) && (button.querySelector(Selector.INPUT).hasAttribute('disabled') || button.querySelector(Selector.INPUT).classList.contains('disabled'))) {
+        event.preventDefault() // work around Firefox bug #1540995
       } else {
         Button._jQueryInterface.call($(button), 'toggle')
       }

From 6d1b78f2b2291dd44e37856579306f03cac3ac2f Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Tue, 4 Jun 2019 20:39:10 +0100
Subject: [PATCH 24/30] Add check for button without disabled class but
 actually disabled inner checkbox

---
 js/tests/unit/button.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index a295d19a7099..619ee738fa03 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -192,6 +192,25 @@ $(function () {
     assert.ok(!$input.prop('checked'), 'checkbox did not get checked')
   })
 
+  QUnit.test('should not set active class if inner hidden checkbox is disabled but author forgot to set disabled class on outer button', function (assert) {
+    assert.expect(4)
+    var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
+      '<label class="btn btn-danger">' +
+      '<input type="checkbox" autocomplete="off" disabled>' +
+      '</label>' +
+      '</div>'
+    var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+    var $btn = $group.children().eq(0)
+    var $input = $btn.children().eq(0)
+
+    assert.ok($btn.is(':not(.active)'), 'button is initially not active')
+    assert.ok(!$input.prop('checked'), 'checkbox is initially not checked')
+    $btn[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+    assert.ok($btn.is(':not(.active)'), 'button did not become active')
+    assert.ok(!$input.prop('checked'), 'checkbox did not get checked')
+  })
+
   QUnit.test('should correctly set checked state on input and active class on label when using <label><input></label> structure', function (assert) {
     assert.expect(4)
     var groupHTML = '<div class="btn-group" data-toggle="buttons">' +

From 44997951875a95c45079837a8eaf89867b544b65 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 5 Jun 2019 09:55:14 +0100
Subject: [PATCH 25/30] More unit tests

- first one checks that we're not encountering weird even bubbling issues that then usually result in errors in the event handler (when `button.hasAttribute('disabled')` then fails as the `button` is und$
- make sure the plugin doesn't try and stupidly set "checked" on input types where it doesn't make sense
---
 js/tests/unit/button.js | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 619ee738fa03..a3284db18155 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -230,6 +230,42 @@ $(function () {
     assert.ok($input.prop('checked'), 'checkbox is checked after click')
   })
 
+  QUnit.test('should not do anything if the click was just sent to the outer container with data-toggle', function (assert) {
+    assert.expect(4)
+    var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
+      '<label class="btn">' +
+      '<input type="checkbox" autocomplete="off">' +
+      '</label>' +
+      '</div>'
+    var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+    var $label = $group.children().eq(0)
+    var $input = $label.children().eq(0)
+
+    assert.ok($label.is(':not(.active)'), 'label is initially not active')
+    assert.ok(!$input.prop('checked'), 'checkbox is initially not checked')
+    $group[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+    assert.ok($label.is(':not(.active)'), 'label is not active after click')
+    assert.ok(!$input.prop('checked'), 'checkbox is not checked after click')
+  })
+
+  QUnit.test('should not try and set checked property on an input that is not a radio button or checkbox', function (assert) {
+    assert.expect(2)
+    var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
+      '<label class="btn">' +
+      '<input type="hidden" autocomplete="off">' +
+      '</label>' +
+      '</div>'
+    var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+    var $label = $group.children().eq(0)
+    var $input = $label.children().eq(0)
+
+    assert.ok(!$input.prop('checked'), 'hidden input initially has no checked property')
+    $label[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+    assert.ok(!$input.prop('checked'), 'hidden input does not have a checked property')
+  })
+
   QUnit.test('dispose should remove data and the element', function (assert) {
     assert.expect(2)
 

From fc41c16cb664e693e157ad514f8c103c54ee0df7 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 5 Jun 2019 09:56:54 +0100
Subject: [PATCH 26/30] Extra check of input type, tighten event handler code

- Prevent checked attribute from being added unnecessarily to inputs that are not radio buttons or checkboxes
- Tighten the nested if statements into a single statement
---
 js/src/button.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/js/src/button.js b/js/src/button.js
index 84bf81f08218..67641fb0409f 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -85,6 +85,9 @@ class Button {
           if (this._element.tagName === 'LABEL' && input.checked === this._element.classList.contains(ClassName.ACTIVE)) {
             triggerChangeEvent = false
           }
+        } else {
+          // if it's not a radio button or checkbox don't add a pointless/invalid checked property to the input
+          triggerChangeEvent = false
         }
 
         if (triggerChangeEvent) {
@@ -146,14 +149,12 @@ $(document)
       button = $(button).closest(Selector.BUTTON)[0]
     }
 
-    if (button) {
-      if (button.hasAttribute('disabled') || button.classList.contains('disabled')) {
-        event.preventDefault() // work around Firefox bug #1540995
-      } else if (button.querySelector(Selector.INPUT) && (button.querySelector(Selector.INPUT).hasAttribute('disabled') || button.querySelector(Selector.INPUT).classList.contains('disabled'))) {
-        event.preventDefault() // work around Firefox bug #1540995
-      } else {
-        Button._jQueryInterface.call($(button), 'toggle')
-      }
+    if (!button || button.hasAttribute('disabled') || button.classList.contains('disabled')) {
+      event.preventDefault() // work around Firefox bug #1540995
+    } else if (button.querySelector(Selector.INPUT) && (button.querySelector(Selector.INPUT).hasAttribute('disabled') || button.querySelector(Selector.INPUT).classList.contains('disabled'))) {
+      event.preventDefault() // work around Firefox bug #1540995
+    } else {
+      Button._jQueryInterface.call($(button), 'toggle')
     }
   })
   .on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, (event) => {

From 1e685b360a704992c209c75d9d6df6cc2f6ccee8 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 5 Jun 2019 10:06:46 +0100
Subject: [PATCH 27/30] More unit tests

- test explicitly the two scenarios of a type="hidden" and completely inappropriate type="text" input
---
 js/tests/unit/button.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index a3284db18155..3c93ee8658d2 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -249,7 +249,7 @@ $(function () {
     assert.ok(!$input.prop('checked'), 'checkbox is not checked after click')
   })
 
-  QUnit.test('should not try and set checked property on an input that is not a radio button or checkbox', function (assert) {
+  QUnit.test('should not try and set checked property on an input of type="hidden"', function (assert) {
     assert.expect(2)
     var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
       '<label class="btn">' +
@@ -266,6 +266,23 @@ $(function () {
     assert.ok(!$input.prop('checked'), 'hidden input does not have a checked property')
   })
 
+  QUnit.test('should not try and set checked property on an input that is not a radio button or checkbox', function (assert) {
+    assert.expect(2)
+    var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
+      '<label class="btn">' +
+      '<input type="text" autocomplete="off">' +
+      '</label>' +
+      '</div>'
+    var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+    var $label = $group.children().eq(0)
+    var $input = $label.children().eq(0)
+
+    assert.ok(!$input.prop('checked'), 'text input initially has no checked property')
+    $label[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+    assert.ok(!$input.prop('checked'), 'text input does not have a checked property')
+  })
+
   QUnit.test('dispose should remove data and the element', function (assert) {
     assert.expect(2)
 

From c4dc4b137ab1f98c2527804e2a9bc6240a72e3ef Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 5 Jun 2019 10:25:07 +0100
Subject: [PATCH 28/30] Add test for less-than-ideal <div><input></div>
 structure

- while not recommended, seen this sort of structure used in the wild; this tests that the plugin code can still handle these cases where the browser DOESN'T do its default checking of the input when clicking on its `<label>` magic and the plugin has to do all the work of setting the checked property itself
---
 js/tests/unit/button.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 3c93ee8658d2..324e940113ef 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -230,6 +230,25 @@ $(function () {
     assert.ok($input.prop('checked'), 'checkbox is checked after click')
   })
 
+  QUnit.test('should correctly set checked state on input and active class on the faked button when using <div><input></div> structure', function (assert) {
+    assert.expect(4)
+    var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
+      '<div class="btn">' +
+      '<input type="checkbox" autocomplete="off" aria-label="Check">' +
+      '</div>' +
+      '</div>'
+    var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+    var $btn = $group.children().eq(0)
+    var $input = $btn.children().eq(0)
+
+    assert.ok($btn.is(':not(.active)'), '<div> is initially not active')
+    assert.ok(!$input.prop('checked'), 'checkbox is initially not checked')
+    $btn[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+    assert.ok($btn.is('.active'), '<div> is active after click')
+    assert.ok($input.prop('checked'), 'checkbox is checked after click')
+  })
+
   QUnit.test('should not do anything if the click was just sent to the outer container with data-toggle', function (assert) {
     assert.expect(4)
     var groupHTML = '<div class="btn-group" data-toggle="buttons">' +

From 9dc27a4859c9a6c8aae7f3e9eec9d30926299284 Mon Sep 17 00:00:00 2001
From: patrickhlauke <redux@splintered.co.uk>
Date: Wed, 5 Jun 2019 13:52:25 +0100
Subject: [PATCH 29/30] Store value for the if

---
 js/src/button.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/js/src/button.js b/js/src/button.js
index 67641fb0409f..46baabdb7177 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -151,9 +151,14 @@ $(document)
 
     if (!button || button.hasAttribute('disabled') || button.classList.contains('disabled')) {
       event.preventDefault() // work around Firefox bug #1540995
-    } else if (button.querySelector(Selector.INPUT) && (button.querySelector(Selector.INPUT).hasAttribute('disabled') || button.querySelector(Selector.INPUT).classList.contains('disabled'))) {
-      event.preventDefault() // work around Firefox bug #1540995
     } else {
+      const inputBtn = button.querySelector(Selector.INPUT)
+
+      if (inputBtn && (inputBtn.hasAttribute('disabled') || inputBtn.classList.contains('disabled'))) {
+        event.preventDefault() // work around Firefox bug #1540995
+        return
+      }
+      
       Button._jQueryInterface.call($(button), 'toggle')
     }
   })

From 30b5f2351fdd64d909b01a449849d5d1f8c40dc3 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Wed, 5 Jun 2019 16:00:35 +0300
Subject: [PATCH 30/30] Update button.js

---
 js/src/button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/button.js b/js/src/button.js
index 46baabdb7177..622513701968 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -158,7 +158,7 @@ $(document)
         event.preventDefault() // work around Firefox bug #1540995
         return
       }
-      
+
       Button._jQueryInterface.call($(button), 'toggle')
     }
   })