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

Take wrapped lines into account for placeholders

Download Browse

Part of story #11667 display diff side by side How to test: - Browse a pull request with long lines that need to be wrapped (for example text document) in side-by-side diff - Scrolling stays generally aligned - Given the first line of a file is modified, then a placeholder widget will be added above the "Added line" (instead of below on the previous line) so that scrolling stays aligned Change-Id: I8cdce64daf1ed13518ab0d026263f95e5a6b0a60

+956 −96
Joris MASSON (jmasson) 2018-09-06 18:08
Joris MASSON (jmasson) 2018-09-11 14:14
28a3d79db042735024e27a5916332dca0f7a1c8d
4a745639ad1bbe4ad020fc6a1a1aff1f0770a7ee
git #tuleap/stable/28a3d79db042735024e27a5916332dca0f7a1c8d

Modified Files

Side by side diff
Inline diff
Name
M plugins/pullrequest/www/scripts/src/app/app.spec.js +5 −3 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/code-collapse/code-collapse-service.spec.js +0 −2 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/file-diff/codemirror-helper-service.js +4 −3 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/side-by-side-diff-component.js +28 −88 Go to diff View file
R plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/side-by-side-data-builder.js Go to diff View file
R plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/side-by-side-data-builder.spec.js Go to diff View file
A plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/side-by-side-line-mapper.js +61 −0 Go to diff View file
A plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/side-by-side-line-mapper.spec.js +246 −0 Go to diff View file
A plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/side-by-side-lines-state.js +90 −0 Go to diff View file
A plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/side-by-side-lines-state.spec.js +103 −0 Go to diff View file
A plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/side-by-side-widget-builder.js +130 −0 Go to diff View file
A plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/side-by-side-widget-builder.spec.js +289 −0 Go to diff View file