Merge pull request #1698 from /issues/1696/1

Issue #1696. Unbreak Save & close label editor button.
webcompat · Aug 3, 2017 · 5e8337c · 5e8337c
2 parents b5c0547 + 8236a9d
commit 5e8337c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/tests/functional/labels-auth.js b/tests/functional/labels-auth.js
@@ -93,6 +93,27 @@ define(
               assert.notInclude("is-active", className);
             })
             .end();
+        },
+
+        "Clicking close button actually closes it?": function() {
+          return FunctionalHelpers.openPage(
+            this,
+            url("/issues/2"),
+            ".js-LabelEditorLauncher",
+            true /* longerTimeout */
+          )
+            .findByCssSelector(".js-LabelEditorLauncher")
+            .click()
+            .end()
+            .findByCssSelector(".js-LabelEditor-close")
+            .click()
+            .end()
+            .findByCssSelector(".js-LabelEditorLauncher")
+            .getAttribute("class")
+            .then(function(className) {
+              assert.notInclude("is-active", className);
+            })
+            .end();
         }
       };
     });

diff --git a/webcompat/static/js/lib/labels.js b/webcompat/static/js/lib/labels.js
@@ -175,7 +175,7 @@ issues.LabelEditorView = Backbone.View.extend({
     this.reRender({ labels: _.uniq(modelUpdate) });
   },
   closeEditor: function(e) {
-    if (!e || (e && e.keyCode === 27)) {
+    if (!e || (e && (e.keyCode === 27 || !e.keyCode))) {
       var checked = $("input[type=checkbox]:checked");
       var labelsArray = _.pluck(checked, "name");
       this.issueView.editorButton.removeClass("is-active");

diff --git a/webcompat/static/js/templates.js b/webcompat/static/js/templates.js
diff --git a/webcompat/templates/web_modules/label-editor.jst b/webcompat/templates/web_modules/label-editor.jst
@@ -1,7 +1,8 @@
 <script type="text/template">
   <div class="wc-LabelEditor-header">
     <input class="form-control wc-LabelEditor-search" placeholder="filter label">
-    <button class="wc-LabelEditor-button r-ResetButton" tabindex="0">
+    <button class="wc-LabelEditor-button r-ResetButton js-LabelEditor-close"
+            tabindex="0">
       Save &amp; Close
     </button>
   </div>