diff options
author | Phil Hughes <me@iamphill.com> | 2016-08-04 11:27:11 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-08-04 11:27:11 +0100 |
commit | a3a672095d00e98499153d4dc598f4e1210d65f2 (patch) | |
tree | 21dc5327bbe9c0e72d68e4d081bc06b085a82146 | |
parent | 69c7fc5f723fd96fb382de58ba6fd271a43d335b (diff) | |
download | gitlab-ce-a3a672095d00e98499153d4dc598f4e1210d65f2.tar.gz |
Fixed issue with expand diff not initializing resolve buttons
-rw-r--r-- | app/assets/javascripts/single_file_diff.js | 9 | ||||
-rw-r--r-- | spec/javascripts/diff_comments_store_spec.js.es6 | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/single_file_diff.js b/app/assets/javascripts/single_file_diff.js index b9adc5f3728..156b9b8abec 100644 --- a/app/assets/javascripts/single_file_diff.js +++ b/app/assets/javascripts/single_file_diff.js @@ -59,14 +59,15 @@ if (data.html) { _this.content = $(data.html); _this.content.syntaxHighlight(); - if (typeof DiffNotesApp !== 'undefined') { - DiffNotesApp.compileComponents(); - } } else { _this.hasError = true; _this.content = $(ERROR_HTML); } - return _this.collapsedContent.after(_this.content); + _this.collapsedContent.after(_this.content); + + if (typeof DiffNotesApp !== 'undefined') { + DiffNotesApp.compileComponents(); + } }; })(this)); }; diff --git a/spec/javascripts/diff_comments_store_spec.js.es6 b/spec/javascripts/diff_comments_store_spec.js.es6 index a82a4cd9df9..22293d4de87 100644 --- a/spec/javascripts/diff_comments_store_spec.js.es6 +++ b/spec/javascripts/diff_comments_store_spec.js.es6 @@ -4,7 +4,7 @@ //= require diff_notes/stores/comments (() => { function createDiscussion(noteId = 1, resolved = true) { - CommentsStore.create('a', noteId, resolved, 'test'); + CommentsStore.create('a', noteId, true, resolved, 'test'); }; beforeEach(() => { @@ -91,6 +91,7 @@ it('is unresolved with 2 notes', () => { const discussion = CommentsStore.state['a']; createDiscussion(2, false); + console.log(discussion.isResolved()); expect(discussion.isResolved()).toBe(false); }); |