diff options
author | Phil Hughes <me@iamphill.com> | 2016-07-29 13:19:56 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-07-29 13:19:56 +0300 |
commit | efb74875cfe1a1e2b3696f0129b819fc8e204876 (patch) | |
tree | 53bc2e8a9e45f6c31dcc729bf4646532c1e6b41a /app/assets/javascripts/merge_request_tabs.js | |
parent | d9a949c17c29c8531b2b0a1c227ab0b3341f0ba3 (diff) |
Moved most of the data handling into discussion & notes models
Reduced some duplicated code with compiling components
Fixed bug with resolve button tooltip not updating after resolving discussion
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
-rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 2343ace3b68..8574a4e3370 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -120,10 +120,8 @@ return function(data) { $('#diffs').html(data.html); - if ($('resolve-btn, resolve-all-btn, jump-to-discussion').length && (typeof DiffNotesApp !== "undefined" && DiffNotesApp !== null)) { - $('resolve-btn, resolve-all-btn, jump-to-discussion').each(function () { - DiffNotesApp.$compile($(this).get(0)) - }); + if (compileVueComponentsForDiffNotes) { + compileVueComponentsForDiffNotes(); } gl.utils.localTimeAgo($('.js-timeago', 'div#diffs')); |