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.

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

Don't provide shortcut for comment search #4291

Merged
merged 4 commits into from
Oct 4, 2019
Merged

Don't provide shortcut for comment search #4291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
219e6a9
don't provide shortcut for comment search to avoid clash with tree-se…
philippotto Sep 24, 2019
0153f87
adapt tooltip
philippotto Sep 24, 2019
de828f0
update changelog
philippotto Oct 4, 2019
d04fb8e
Merge branch 'master' of github.com:scalableminds/webknossos into avo…
philippotto Oct 4, 2019
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md).
### Fixed
- When creating tasks from zip, the individual nml names are used again, rather than the zip name. [#4277](https://github.com/scalableminds/webknossos/pull/4277)

### Removed
- Removed the Search shortcut (Ctrl+Shift+F) for comments in the tracing view, since that shortcut collides with the tree search. [#4291](https://github.com/scalableminds/webknossos/pull/4291)

## [19.09.0](https://github.com/scalableminds/webknossos/releases/tag/19.09.0) - 2019-08-28
[Commits](https://github.com/scalableminds/webknossos/compare/19.08.0...19.09.0)
Expand Down
3 changes: 1 addition & 2 deletions frontend/javascripts/oxalis/view/right-menu/comment_tab/comment_tab_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,9 @@ class CommentTabView extends React.PureComponent<PropsWithSkeleton, CommentTabSt
onSelect={comment => this.props.setActiveNode(comment.nodeId)}
data={_.flatMap(this.props.skeletonTracing.trees, tree => tree.comments)}
searchKey="content"
provideShortcut
targetId={commentListId}
>
<ButtonComponent icon="search" title="Open the search via CTRL + Shift + F" />
<ButtonComponent icon="search" title="Search through comments" />
</AdvancedSearchPopover>
<ButtonComponent
title="Jump to previous comment"
Expand Down