diff options
| author | Phil Hughes <me@iamphill.com> | 2016-11-09 08:54:48 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-10 17:53:34 +0300 |
| commit | a9349f5734410b57cf5434262727d2df3aa11fa4 (patch) | |
| tree | 38d5f6ad6d5310cd547390c37ae7f0d0c50fda10 | |
| parent | c8133c53b2d68acab23c11977ee88530d4880a3c (diff) | |
| download | gitlab-ce-a9349f5734410b57cf5434262727d2df3aa11fa4.tar.gz | |
Fixed jump to discussion button not showing
| -rw-r--r-- | app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6 b/app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6 index 275668f2252..bd4c20aed8b 100644 --- a/app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6 +++ b/app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6 @@ -8,11 +8,15 @@ //= require_directory ./components $(() => { + const COMPONENT_SELECTOR = 'resolve-btn, resolve-discussion-btn, jump-to-discussion, comment-and-resolve-btn'; + window.gl = window.gl || {}; window.gl.diffNoteApps = {}; gl.diffNotesCompileComponents = () => { - const $components = $('resolve-btn, resolve-discussion-btn, jump-to-discussion, comment-and-resolve-btn'); + const $components = $(COMPONENT_SELECTOR).filter(function () { + return $(this).closest('resolve-count').length !== 1; + }); if ($components) { $components.each(function () { |