From 4b40ee692dc066f2ad3c4dd96af67a83475f5cbe Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Thu, 18 Jul 2013 01:07:11 -0700
Subject: cleaner way of preventing double click events + clean up tests for
 jshint

---
 js/button.js            |  2 +-
 js/tests/unit/button.js | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'js')

diff --git a/js/button.js b/js/button.js
index c0127cc5f..b4d66b68b 100644
--- a/js/button.js
+++ b/js/button.js
@@ -99,9 +99,9 @@
 
   $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) {
     var $btn = $(e.target)
-    if ($btn.has('input').length) return // throw away double event for inputs
     if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
     $btn.button('toggle')
+    e.preventDefault()
   })
 
 }(window.jQuery);
diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 06ef36fc1..0f8988a7d 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -81,19 +81,19 @@ $(function () {
       })
 
       test("should check for closest matching toggle", function () {
-        var group = '<div class="btn-group" data-toggle="buttons"> \
-          <label class="btn btn-primary active"> \
-            <input type="radio" name="options" id="option1" checked="true"> Option 1 \
-          </label> \
-          <label class="btn btn-primary"> \
-            <input type="radio" name="options" id="option2"> Option 2 \
-          </label> \
-          <label class="btn btn-primary"> \
-            <input type="radio" name="options" id="option3"> Option 3 \
-          </label> \
-        </div>'
+        var group = '<div class="btn-group" data-toggle="buttons">' +
+          '<label class="btn btn-primary active">' +
+            '<input type="radio" name="options" id="option1" checked="true"> Option 1' +
+          '</label>' +
+          '<label class="btn btn-primary">' +
+            '<input type="radio" name="options" id="option2"> Option 2' +
+          '</label>' +
+          '<label class="btn btn-primary">' +
+            '<input type="radio" name="options" id="option3"> Option 3' +
+          '</label>' +
+        '</div>'
 
-        var group = $(group)
+        group = $(group)
 
         var btn1 = $(group.children()[0])
         var btn2 = $(group.children()[1])
-- 
cgit v1.2.3