diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-11-02 12:09:20 +0200 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-11-02 12:09:20 +0200 |
| commit | 64549f7025dd405cbc08d85b514808c28e4685e3 (patch) | |
| tree | 9b791f7fbffaf482adfefa516bb7e7d21f8020cd /app | |
| parent | ad2d796353d8ba434810694bf11daf867489cbb6 (diff) | |
| download | gitlab-ce-64549f7025dd405cbc08d85b514808c28e4685e3.tar.gz | |
fix bad master merge
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/labels_select.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index c1a01164559..f7a1c9f1e40 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -391,14 +391,14 @@ 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(); } |