Merge pull request #14160 from hnrch02/simplify-button-focus-logic

Follow-up to #13907: simplify JS logic for focus shim
twbs · Jul 17, 2014 · 541a75f · 541a75f
2 parents dd22f59 + cc7fab8
commit 541a75f
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/js/button.js b/js/button.js
@@ -97,15 +97,6 @@
   }
 
 
-  // FOCUS SHIM (FOR BUTTON GROUPS)
-  // ==============================
-
-  function getBtnTarget(target) {
-    var $target = $(target)
-    return $target.hasClass('btn') ? $target : $target.parent('.btn')
-  }
-
-
   // BUTTON DATA-API
   // ===============
 
@@ -116,11 +107,8 @@
       Plugin.call($btn, 'toggle')
       e.preventDefault()
     })
-    .on('focus.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      getBtnTarget(e.target).addClass('focus')
-    })
-    .on('blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      getBtnTarget(e.target).removeClass('focus')
+    .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
+      $(e.target).closest('.btn').toggleClass('focus', e.type == 'focus')
     })
 
 }(jQuery);