stable

Clone or download

Read-only

Refactoring: have two dedicated diff components

Part of story #11667 display diff side by side This refactoring prepares the files by using AngularJS components and having a wrapper for unified and side-by-side diffs. How to test: - Browse a pullrequest's files - When you switch to the side-by-side diff using the button-bar, an empty state is shown with "Not yet implemented" text. - When the file is binary, the binary placeholder is still shown in both modes. - No other functional change expected. Will be done later: - The actual side-by-side diff with two CodeMirrors Change-Id: I3fbe107845dfc863053c448b11407692e2ae485f

Modified Files

Name
M plugins/pullrequest/www/scripts/src/app/app.js +10 −4 Go to diff View file
A plugins/pullrequest/www/scripts/src/app/file-diff/codemirror-helper-service.js +78 −0 Go to diff View file
A plugins/pullrequest/www/scripts/src/app/file-diff/diff-mode-state.js +37 −0 Go to diff View file
A plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/side-by-side-diff-component.js +39 −0 Go to diff View file
A plugins/pullrequest/www/scripts/src/app/file-diff/diff-modes/unidiff-component.js +117 −0 Go to diff View file
A plugins/pullrequest/www/scripts/src/app/file-diff/file-diff-component.js +61 −0 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/file-diff/file-diff-config.js +1 −1 Go to diff View file
D plugins/pullrequest/www/scripts/src/app/file-diff/file-diff-controller.js +0 −152 Go to diff View file
D plugins/pullrequest/www/scripts/src/app/file-diff/file-diff-directive.js +0 −14 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/file-diff/file-diff.tpl.html +31 −6 Go to diff View file
A plugins/pullrequest/www/scripts/src/app/file-diff/inline-comment-component.js +27 −0 Go to diff View file
A plugins/pullrequest/www/scripts/src/app/file-diff/inline-comment.tpl.html +30 −0 Go to diff View file
D plugins/pullrequest/www/scripts/src/app/file-diff/inline-comment/inline-comment-directive.js +0 −13 Go to diff View file
D plugins/pullrequest/www/scripts/src/app/file-diff/inline-comment/inline-comment.tpl.html +0 −11 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/file-diff/new-inline-comment-component.js +2 −3 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/files/files-controller.js +11 −14 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/files/files.tpl.html +4 −4 Go to diff View file
M plugins/pullrequest/www/themes/BurningParrot/css/includes/_file-diff.scss +7 −11 Go to diff View file