From 0463b0128286a2882f97aff34ac40298e04707bd Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Sun, 6 Nov 2016 14:48:55 +0100
Subject: Close #21090 - Fix aria-pressed attribute for buttons in container
 with data-toggle='buttons'

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

(limited to 'js/src/button.js')

diff --git a/js/src/button.js b/js/src/button.js
index 45e1424ff..97ccd4bf0 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -96,11 +96,11 @@ const Button = (($) => {
           input.focus()
         }
 
-      } else {
-        this._element.setAttribute('aria-pressed',
-          !$(this._element).hasClass(ClassName.ACTIVE))
       }
 
+      this._element.setAttribute('aria-pressed',
+        !$(this._element).hasClass(ClassName.ACTIVE))
+
       if (triggerChangeEvent) {
         $(this._element).toggleClass(ClassName.ACTIVE)
       }
-- 
cgit v1.2.3


From 045888fa3887f5e65658499da11c8ad737222759 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Fri, 6 Jan 2017 08:38:04 -0800
Subject: version bump

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

(limited to 'js/src/button.js')

diff --git a/js/src/button.js b/js/src/button.js
index 97ccd4bf0..76c5cdd15 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -1,6 +1,6 @@
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-alpha.5): button.js
+ * Bootstrap (v4.0.0-alpha.6): button.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
@@ -15,7 +15,7 @@ const Button = (($) => {
    */
 
   const NAME                = 'button'
-  const VERSION             = '4.0.0-alpha.5'
+  const VERSION             = '4.0.0-alpha.6'
   const DATA_KEY            = 'bs.button'
   const EVENT_KEY           = `.${DATA_KEY}`
   const DATA_API_KEY        = '.data-api'
-- 
cgit v1.2.3


From 3f6e1faf45d503d670e01b600a0455e2da0fe660 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Mon, 10 Apr 2017 14:43:54 +0100
Subject: Only change aria-pressed if it's not an input-based radio or checkbox
 group

* Only change aria-pressed if it's not an input-based radio or checkbox group

aria-pressed="true"/aria-pressed="false" is really only useful for
making on/off toggles out of, say, `<button>` elements. the attribute is
useless (and potentially confusing/conflicting) on, say, `<label>`
elements for an existing `<input type="radio">` or similar.

* Add unit test for buttons.js and radio/checkbox inputs in button groups
---
 js/src/button.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'js/src/button.js')

diff --git a/js/src/button.js b/js/src/button.js
index 76c5cdd15..6295d0db0 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -66,6 +66,7 @@ const Button = (($) => {
 
     toggle() {
       let triggerChangeEvent = true
+      let addAriaPressed = true
       const rootElement      = $(this._element).closest(
         Selector.DATA_TOGGLE
       )[0]
@@ -94,12 +95,15 @@ const Button = (($) => {
           }
 
           input.focus()
+          addAriaPressed = false
         }
 
       }
 
-      this._element.setAttribute('aria-pressed',
-        !$(this._element).hasClass(ClassName.ACTIVE))
+      if (addAriaPressed) {
+        this._element.setAttribute('aria-pressed',
+          !$(this._element).hasClass(ClassName.ACTIVE))
+      }
 
       if (triggerChangeEvent) {
         $(this._element).toggleClass(ClassName.ACTIVE)
-- 
cgit v1.2.3


From 33715a73d2eae3865cb4c1e0a13d1da4b6aeb278 Mon Sep 17 00:00:00 2001
From: Anna <fpm.pankova@bsu.by>
Date: Wed, 26 Apr 2017 19:46:05 +0300
Subject: Fix Toggle buttons don't honor [disabled] or .disabled

---
 js/src/button.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'js/src/button.js')

diff --git a/js/src/button.js b/js/src/button.js
index 6295d0db0..722fd489d 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -90,6 +90,12 @@ const Button = (($) => {
           }
 
           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).trigger('change')
           }
-- 
cgit v1.2.3