diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-18 17:56:05 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-07-20 10:48:02 +0100 |
| commit | 44cf9e4cdf53402ee583c46a478c7fbcd551a97f (patch) | |
| tree | 625855876c431f09f550d285207cd15e1f33d1be /app/assets/javascripts | |
| parent | 1920cf2d161534ae7d8fca8ba6ade50d56d0b391 (diff) | |
| download | gitlab-ce-44cf9e4cdf53402ee583c46a478c7fbcd551a97f.tar.gz | |
Fixed issuable sidebar label toggle not working
Removed un-used JS var
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/labels_select.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/users_select.js.coffee | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee index ab1384c1bf9..8e7dee46fa6 100644 --- a/app/assets/javascripts/labels_select.js.coffee +++ b/app/assets/javascripts/labels_select.js.coffee @@ -26,7 +26,7 @@ class @LabelsSelect $colorPreview = $('.js-dropdown-label-color-preview') $newLabelCreateButton = $('.js-new-label-btn') fieldName = $dropdown.data('field-name') - useId = $dropdown.hasClass('js-issuable-form-dropdown') or $dropdown.hasClass('js-filter-bulk-update') + useId = $dropdown.is('.js-issuable-form-dropdown, .js-filter-bulk-update, .js-label-sidebar-dropdown') propertyName = if useId then "id" else "title" $newLabelError.hide() diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee index 1c5a0dc108f..cb1bf2c8154 100644 --- a/app/assets/javascripts/users_select.js.coffee +++ b/app/assets/javascripts/users_select.js.coffee @@ -142,7 +142,7 @@ class @UsersSelect selectable: true fieldName: $dropdown.data('field-name') - toggleLabel: (selected, el, e) -> + toggleLabel: (selected, el) -> if selected and 'id' of selected and $(el).hasClass('is-active') if selected.text then selected.text else selected.name else |