Skip to content

Minimal change to permit non-interactive html diff generation (#468) #744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Minimal change to permit non-interactive html diff generation (#468) #744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions packages/webapp/src/app/diff.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,23 @@ function attachToForm() {
*
*/
export function initializeDiff() {
attachToForm();
// If arguments supplied in config, run diff directly:
let base = getConfigOption('base');
let remote = getConfigOption('remote');
if (base && (remote || hasPrefix(base))) {
compare(base, remote, 'replace');
let diff_data = getConfigOption('diff_data');
if (diff_data === undefined) {
// This is the normal case.
attachToForm();
// If arguments supplied in config, run diff directly:
let base = getConfigOption('base');
let remote = getConfigOption('remote');
if (base && (remote || hasPrefix(base))) {
compare(base, remote, 'replace');
}
} else {
// Then the diff was pre-generated and included in the config data,
// e.g. for non-interactive generation of html diffs.
// The diff data should have "base" and "diff" keys for showDiff().
// showDiff() requires the data to be mutable, so make a mutable copy.
const cloned_diff_data = JSON.parse(JSON.stringify(diff_data))
onDiffRequestCompleted(cloned_diff_data);
}

let exportBtn = document.getElementById('nbdime-export') as HTMLButtonElement;
Expand Down