From 934d1bcae588a278900018abb648242eb05328b3 Mon Sep 17 00:00:00 2001
From: Nathan Muir <ndmuir@gmail.com>
Date: Tue, 3 Sep 2013 12:23:51 +1000
Subject: Add unit test for #9920

Merges #10385
---
 js/tests/unit/button.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'js')

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 16284e0ce..115edefaf 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -111,6 +111,12 @@ $(function () {
         ok(!btn1.find('input').prop('checked'), 'btn1 is checked')
         ok(btn2.hasClass('active'), 'btn2 has active class')
         ok(btn2.find('input').prop('checked'), 'btn2 is checked')
+
+        btn2.find('input').click() /* clicking an already checked radio should not un-check it */
+        ok(!btn1.hasClass('active'), 'btn1 does not have active class')
+        ok(!btn1.find('input').prop('checked'), 'btn1 is checked')
+        ok(btn2.hasClass('active'), 'btn2 has active class')
+        ok(btn2.find('input').prop('checked'), 'btn2 is checked')
       })
 
 })
-- 
cgit v1.2.3


From 5d6e9212a642430719702ead322103e19c6aa782 Mon Sep 17 00:00:00 2001
From: Brian Leonard <brian@bleonard.com>
Date: Sun, 1 Sep 2013 22:23:31 -0700
Subject: Don't deselect radio buttons in data-toggle; fixes #9920

Merges #10787
---
 js/button.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'js')

diff --git a/js/button.js b/js/button.js
index 0145689dd..3c1613506 100644
--- a/js/button.js
+++ b/js/button.js
@@ -54,15 +54,21 @@
 
   Button.prototype.toggle = function () {
     var $parent = this.$element.closest('[data-toggle="buttons"]')
+    var changed = true
 
     if ($parent.length) {
       var $input = this.$element.find('input')
-        .prop('checked', !this.$element.hasClass('active'))
-        .trigger('change')
-      if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
+      if ($input.prop('type') === 'radio') {
+        // see if clicking on current one
+        if ($input.prop('checked') && this.$element.hasClass('active'))
+          changed = false
+        else
+          $parent.find('.active').removeClass('active')
+      }
+      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
     }
 
-    this.$element.toggleClass('active')
+    if (changed) this.$element.toggleClass('active')
   }
 
 
-- 
cgit v1.2.3