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 /app/assets/javascripts/single_file_diff.js | |
| parent | 69c7fc5f723fd96fb382de58ba6fd271a43d335b (diff) | |
| download | gitlab-ce-a3a672095d00e98499153d4dc598f4e1210d65f2.tar.gz | |
Fixed issue with expand diff not initializing resolve buttons
Diffstat (limited to 'app/assets/javascripts/single_file_diff.js')
| -rw-r--r-- | app/assets/javascripts/single_file_diff.js | 9 |
1 files changed, 5 insertions, 4 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)); }; |