Skip to content
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.

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

Do not collapse editor lines in single editor #719

Merged
merged 4 commits into from
Oct 20, 2023

Conversation

fcollonval
Copy link
Collaborator

@fcollonval fcollonval commented Oct 17, 2023

  • Don't collapsed lines in editor for single pane merge view.
  • Correctly bind label and inputs

Fix partly #718 (it does not solve the notebook metadata unchanged case).

@fcollonval fcollonval added the bug label Oct 17, 2023
@fcollonval
Copy link
Collaborator Author

bot please update playwright snapshots

@github-actions
Copy link
Contributor

Playwright windows-latest snapshots updated.

@github-actions
Copy link
Contributor

Playwright ubuntu-22.04 snapshots updated.

@fcollonval fcollonval closed this Oct 18, 2023
@fcollonval fcollonval reopened this Oct 18, 2023
@krassowski krassowski changed the title Don't collapsed editor lines in single editor Do not collapse editor lines in single editor Oct 20, 2023
Copy link
Member

@krassowski krassowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested locally, confirmed that it fixes the issue and other changes are an improvement too although the same bits may need changes for translation work later.

<input id="compare-base" type="text" name="base" value="{{ config_data['base']|e }}" />
<label>Remote:</label>
<input id="compare-remote" type="text" name="remote" value="{{ config_data['remote']|e }}" />
<label>Local:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keeping atomic labels with for="id" might make it easier to translate in the #709 but for the sake of this one it does not matter much.

// no collapse
this._collapseIdentical >= 0 &&
// not displaying a single editor
!singlePane
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: tested locally to confirm that it also works for diff view.

@krassowski krassowski merged commit d39f45a into jupyter:master Oct 20, 2023
13 checks passed
@fcollonval fcollonval deleted the fix/collapse-unchanged-lines branch October 25, 2023 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants