Fixes webcompat#1489 - Gets everything working in different browsers …

…and a little bit of code clean up.
brizental · May 4, 2017 · 0846425 · 0846425
1 parent a7b1dfe
commit 0846425
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/webcompat/static/js/lib/labels.js b/webcompat/static/js/lib/labels.js
@@ -95,7 +95,7 @@ issues.LabelEditorView = Backbone.View.extend({
     "keyup": "closeEditor",    
     "keyup .wc-LabelEditor-search": "filterLabels",
     "keyup .wc-LabelEditor-list-item": "checkUncheckLabels",
-    "keydown .wc-LabelEditor-list-item:visible:first input": "removeFocus",
+    "keydown .wc-LabelEditor-list-item": "removeFocus",
     "keydown .wc-LabelEditor-list-item:visible:last": "backToTop"
   },
   keyboardEvents: {
@@ -199,7 +199,7 @@ issues.LabelEditorView = Backbone.View.extend({
       if (e.keyCode === 13) {
         $(".wc-LabelEditor-list-item:visible:first").focus();
         // if you call the focus() function in a label element,'
-        // the focues automatically goes ato the input.
+        // the focus automatically goes to the input.
         // that's why we need to add the focused class.
         $(".wc-LabelEditor-list-item:visible:first").addClass("focused");
       }
@@ -226,13 +226,12 @@ issues.LabelEditorView = Backbone.View.extend({
   checkUncheckLabels: _.debounce(function(e) {
     if (e.keyCode === 13) {
       $(e.target).click();
+      $(e.target).addClass("focused");
     }
   }, 100),
   removeFocus: _.debounce(function(e) {
-    console.log(e.keyCode);
     if (e.keyCode === 9) {
-      console.log($(".wc-LabelEditor-list-item:visible:first").hasClass("focused"));
-      $(".wc-LabelEditor-list-item:visible:first").removeClass("focused");
+      $(e.target).closest("label").removeClass("focused");
     }
   }, 100),
   backToTop: _.debounce(function(e) {