From 3d01c076f7af041d7391ea54f8c8e6b1aab685f1 Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Fri, 15 May 2015 17:54:41 -0400
Subject: [PATCH] Checkbox does not need to blur input on check #2254

---
 src/definitions/modules/checkbox.js   | 19 +++++++------------
 src/definitions/modules/checkbox.less |  1 -
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/definitions/modules/checkbox.js b/src/definitions/modules/checkbox.js
index f84a60494..d3858a362 100644
--- a/src/definitions/modules/checkbox.js
+++ b/src/definitions/modules/checkbox.js
@@ -59,6 +59,7 @@ $.fn.checkbox = function(parameters) {
           module.create.label();
           module.add.events();
 
+          module.set.tabbable();
           module.setup();
           module.observeChanges();
 
@@ -146,15 +147,14 @@ $.fn.checkbox = function(parameters) {
                 escape : 27
               }
             ;
-            if( key == keyCode.escape) {
+            if(key == keyCode.escape) {
               module.verbose('Escape key pressed blurring field');
-              $module
-                .blur()
-              ;
+              $input.blur();
+              event.preventDefault();
             }
             if(!event.ctrlKey && (key == keyCode.enter || key == keyCode.space)) {
               module.verbose('Enter key pressed, toggling checkbox');
-              module.toggle.call(this);
+              module.toggle();
               event.preventDefault();
             }
           }
@@ -205,7 +205,7 @@ $.fn.checkbox = function(parameters) {
             }
             $module.addClass(className.checked);
           },
-          tab: function() {
+          tabbable: function() {
             if( $input.attr('tabindex') === undefined) {
               $input
                 .attr('tabindex', 0)
@@ -253,9 +253,6 @@ $.fn.checkbox = function(parameters) {
               .off(eventNamespace)
               .removeData(moduleNamespace)
             ;
-            $input
-              .off(eventNamespace, module.event.keydown)
-            ;
             $label
               .off(eventNamespace)
             ;
@@ -283,7 +280,6 @@ $.fn.checkbox = function(parameters) {
             .trigger('change')
           ;
           module.set.checked();
-          $input.trigger('blur');
           settings.onChange.call($input[0]);
           settings.onChecked.call($input[0]);
         },
@@ -295,12 +291,11 @@ $.fn.checkbox = function(parameters) {
             .trigger('change')
           ;
           module.remove.checked();
-          $input.trigger('blur');
           settings.onChange.call($input[0]);
           settings.onUnchecked.call($input[0]);
         },
 
-        toggle: function(event) {
+        toggle: function() {
           if( !module.can.change() ) {
             if(!module.is.radio()) {
               module.debug('Checkbox is read-only or disabled, ignoring toggle');
diff --git a/src/definitions/modules/checkbox.less b/src/definitions/modules/checkbox.less
index dace5a29d..480a91075 100755
--- a/src/definitions/modules/checkbox.less
+++ b/src/definitions/modules/checkbox.less
@@ -176,7 +176,6 @@
 .ui.checkbox input[type="checkbox"]:focus ~ label:after,
 .ui.checkbox input[type="radio"]:focus ~ .box:after,
 .ui.checkbox input[type="radio"]:focus ~ label:after {
-  opacity: 1;
   color: @checkboxFocusedColor;
 }
 .ui.checkbox input[type="checkbox"]:focus ~ label,