diff options
author | Mike Greiling <mike@pixelcog.com> | 2016-09-19 18:02:52 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2016-09-20 00:51:00 -0500 |
commit | 76ae5af8ce9d88cb1da4f8b9836fe78b7c2ad30e (patch) | |
tree | a2806e88efa0a00a1b912b1f8ba61581ee613449 /app/assets/javascripts/diff.js | |
parent | 791079e2abeef1d3ebeecc8157bfb02cfdf9b36d (diff) | |
download | gitlab-ce-76ae5af8ce9d88cb1da4f8b9836fe78b7c2ad30e.tar.gz |
ensure the 'fixed layout' preference is honored whenever possible
see #22343 for issue description
Diffstat (limited to 'app/assets/javascripts/diff.js')
-rw-r--r-- | app/assets/javascripts/diff.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js index c8634b78f2b..8086c10ad6b 100644 --- a/app/assets/javascripts/diff.js +++ b/app/assets/javascripts/diff.js @@ -7,6 +7,9 @@ function Diff() { $('.files .diff-file').singleFileDiff(); this.filesCommentButton = $('.files .diff-file').filesCommentButton(); + if (this.diffViewType() === 'parallel') { + $('.content-wrapper .container-fluid').removeClass('container-limited'); + } $(document).off('click', '.js-unfold'); $(document).on('click', '.js-unfold', (function(_this) { return function(event) { @@ -52,6 +55,10 @@ })(this)); } + Diff.prototype.diffViewType = function() { + return $('.inline-parallel-buttons a.active').data('view-type'); + } + Diff.prototype.lineNumbers = function(line) { if (!line.children().length) { return [0, 0]; |