diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-07-25 18:38:23 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-07-25 18:38:23 +0300 |
| commit | 4a76cbe21907b92e53b168f3085c19d00be11f0b (patch) | |
| tree | 9ce5f110b75dc84c9ef689302a7fa3bdd3d7b2b8 /app/assets | |
| parent | fffbc3693123c8d6e40b4378d5a69c4646c322ac (diff) | |
| parent | ae3f869fd1f4326e26805606197dea4ea15c67bb (diff) | |
Merge branch 'fix-reload-with-full-diff-url' into 'master'
Fix the "Reload with full diff" URL button
On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to `diff.json`. Instead, generate the path in HTML mode.
Closes #2041
See merge request !1019
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index a132a0a9dcc..19a07b6a033 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -49,12 +49,6 @@ class @MergeRequestTabs # Store the `location` object, allowing for easier stubbing in tests @_location = location - switch @opts.action - when 'commits' - @commitsLoaded = true - when 'diffs' - @diffsLoaded = true - @bindEvents() @activateTab(@opts.action) @@ -102,7 +96,7 @@ class @MergeRequestTabs action = 'notes' if action == 'show' # Remove a trailing '/commits' or '/diffs' - new_state = @_location.pathname.replace(/\/(commits|diffs)\/?$/, '') + new_state = @_location.pathname.replace(/\/(commits|diffs)(\.html)?\/?$/, '') # Append the new action if we're on a tab other than 'notes' unless action == 'notes' @@ -133,7 +127,7 @@ class @MergeRequestTabs return if @diffsLoaded @_get - url: "#{source}.json" + url: "#{source}.json" + @_location.search success: (data) => document.getElementById('diffs').innerHTML = data.html @diffsLoaded = true |