diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-10 13:42:10 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-10 13:42:10 -0200 |
| commit | 0c54c9a8a3cb025d7a7aec7aaf8ab17f61bb6ed6 (patch) | |
| tree | 19b11b6e5b0d4c3f9a5bc9f65f2c17a695229d44 | |
| parent | 4a29669dec880a030c9c9d5cebf99ad58781cf9f (diff) | |
| download | gitlab-ce-fix-edit-notes-on-merge-request-diff.tar.gz | |
USe innerHtml to avoid slow performance on a MR with very large difffix-edit-notes-on-merge-request-diff
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 1f0b6d9ced0..e4fa03c0ac5 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -144,9 +144,8 @@ class @MergeRequestTabs @_get url: "#{source}.json" + @_location.search success: (data) => - html = $(data.html) - html.syntaxHighlight() - $('#diffs').html(html) + document.getElementById('diffs').innerHTML = data.html + $('div#diffs .js-syntax-highlight').syntaxHighlight() @diffsLoaded = true @scrollToElement("#diffs") |