Support hiding base editor #705
Conversation
|
bot please update playwright snapshots |
|
Playwright ubuntu-22.04 snapshots updated. |
|
Playwright windows-latest snapshots updated. |
…to the current 4 panels views Fixes jupyter#682
fcollonval
force-pushed
the
fix/682-Support-merge-view-with-3-panels-theirs-final-ours-in-addition-to-the-current-4-panels-views
branch
from
666e6c6 to
d93460a
Compare
fcollonval
deleted the
fix/682-Support-merge-view-with-3-panels-theirs-final-ours-in-addition-to-the-current-4-panels-views
branch
| dest='show_base', | ||
| action="store_false", | ||
| default=True, | ||
| help="Don't display the base version.") |
There was a problem hiding this comment.
Please add this in nbdime/webapp/nbmergeweb instead. It makes no sense for this argument to show up in the CLI command nbmerge
| @@ -532,6 +538,7 @@ def args_for_server(arguments): | |||
| workdirectory='cwd', | |||
| base_url='base_url', | |||
| hide_unchanged='hide_unchanged', | |||
| show_base='show_base', | |||
There was a problem hiding this comment.
This is mainly a convenience for shared args. For a one-off like show_base, it is probably better to add it manually in nbdime/webapp/nbmergeweb.
| show_base = Bool( | ||
| True, | ||
| help="Whether to show the base version (4-panels) or not (3-panels).", | ||
| ).tag(config=True) |
There was a problem hiding this comment.
Same here, only needed for web merge.
| const showBase = getConfigOption('showBase', true); | ||
|
|
||
| if (!showBase) { | ||
| document.querySelector('#nbdime-header-base')!.textContent = 'Merged'; |
There was a problem hiding this comment.
Just FYI: this header doesn't seem to be included in UI tests, I assume bc of which node is selected for screenshotting?
|
@fcollonval Thanks for all the work here and elsewhere! I left some stray comments on a few merged PRs like this. Let me know if you want me to open up issues for them instead, or PRs (might take longer). Thanks again 😃 |
Fixes #682
It adds a new CLI option
--no-baseto switch from a 4-panels to a 3-panels merge view.Identical with #699 but required after branch rename as it was impossible to check it out on windows