Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

stable

Clone or download

Read-only

Display comments in side-by-side diff

Download Browse

Part of story #11667 display diff side by side How to test: - Browse a pullrequest - In the side-by-side diff, the comments are shown. - Comments on deleted code are on the left-hand side. - Comments on added and unchanged code are on the right-hand side. - A placeholder with the same height is added on unchanged lines with comments. - The "existing" placeholders for added/deleted lines are adjusted with the height of comments. - References and tooltips on comments are shown - Scrolling in files with comments stays generally aligned. Will be done later: - Adding comments in side-by-side diff Change-Id: Ibf6dd1d4b94f825d6c6b0db7e2507c93c471c506

+268 −107
Joris MASSON (jmasson) 2018-09-04 16:22
Joris MASSON (jmasson) 2018-09-05 17:09
11a5eaccd23707e65db02047cf1a9e86f84c0ac9
fde69b240f377c992cfe51c0f9591b31444b97e8
git #tuleap/stable/11a5eaccd23707e65db02047cf1a9e86f84c0ac9

Modified Files

Side by side diff
Inline diff
Name
M plugins/pullrequest/www/scripts/src/app/file-diff/codemirror-helper-service.js +28 −4 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/side-by-side-data-builder.js +22 −10 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/side-by-side-data-builder.spec.js +106 −65 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/side-by-side-diff-component.js +112 −28 Go to diff View file