diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-14 15:37:16 -0400 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-25 08:07:57 -0400 |
| commit | fdb703d790e1eb8e91bed1ffb2bba202d80708d3 (patch) | |
| tree | bcd905dbca8e2611fe7d7f3e9c92ab2bbc29f3b3 | |
| parent | 3753ace9bacb5036d7fe9b3a647f5f92d53a51be (diff) | |
| download | gitlab-ce-fdb703d790e1eb8e91bed1ffb2bba202d80708d3.tar.gz | |
Fix up commit message
| -rw-r--r-- | app/assets/javascripts/labels_select.js.coffee | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee index 59496043eed..4e1718c32e4 100644 --- a/app/assets/javascripts/labels_select.js.coffee +++ b/app/assets/javascripts/labels_select.js.coffee @@ -41,6 +41,7 @@ class @LabelsSelect '</span>'+ '</a>'+ '<% }); %>'); + labelNoneHTMLTemplate = _.template('<div class="light">None</div>') if newLabelField.length and $dropdown.hasClass 'js-extra-options' $('.suggest-colors-dropdown a').on "click", (e) -> @@ -176,6 +177,8 @@ class @LabelsSelect $selectbox.hide() $value.show() + multiSelect: $dropdown.hasClass 'js-multiselect' + clicked: -> page = $('body').data 'page' isIssueIndex = page is 'projects:issues:index' @@ -190,11 +193,9 @@ class @LabelsSelect .closest('.selectbox') .find('input[type="hidden"]') .val() - console.log 'selected', selected # need inline-block here instead of show, # which will default to the element's style in this case inline. - selected = if selected? then [ selected ] else [''] - console.log 'selected', selected + selected = if selected? then selected.split(',') else [''] $loading .fadeIn() $.ajax( @@ -206,7 +207,11 @@ class @LabelsSelect ).done (data) -> $loading.fadeOut() $selectbox.hide() + if not data.labels.length + template = labelNoneHTMLTemplate() + else + template = labelHTMLTemplate(data) href = $value .show() - .html(labelHTMLTemplate(data)) + .html(template) ) |