fix bad master merge

64549f70 · Simon Knox · ad2d7963 · 64549f70
Commit 64549f70 authored Nov 02, 2017 by Simon Knox
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

app/assets/javascripts/labels_select.js app/assets/javascripts/labels_select.js +4 -4

No files found.
--- a/app/assets/javascripts/labels_select.js
+++ b/app/assets/javascripts/labels_select.js
@@ -391,13 +391,13 @@ export default class LabelsSelect {
              .then(fadeOutLoader)
              .catch(fadeOutLoader);
          }
+          else if (handleClick) {
+            e.preventDefault();
+            handleClick(label);
+          }
          else {
            if ($dropdown.hasClass('js-multiselect')) {

-            }
-            else if (handleClick) {
-              e.preventDefault();
-              handleClick(label);
            }
            else {
              return saveLabelData();