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

Only provide shortcut for tree search and not for comment search #3407

Merged
merged 3 commits into from
Nov 5, 2018
Merged

Only provide shortcut for tree search and not for comment search #3407

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aedb1f3
only support shortcut for tree search and not for comment search
philippotto Oct 25, 2018
927c024
update changelog
philippotto Oct 25, 2018
5aaac56
Merge branch 'master' into fix-two-search-panels
philippotto Nov 5, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md).

- Fixed a layouting issue which occurred on a fresh page load when the layout was scaled to be bigger than the available space. [#3256](https://github.com/scalableminds/webknossos/pull/3256)
- Fixed overlap in comment tab for long tree names or comments. [#3272](https://github.com/scalableminds/webknossos/pull/3272)
- Fixed that CTRL + Shift + F opens two search popovers in the tracing view. Instead, the shortcut will only open the tree search now. [#3407](https://github.com/scalableminds/webknossos/pull/3407)
- Fixed a bug which caused data to not be displayed correctly if adjacent data does not exist.[#3270](https://github.com/scalableminds/webknossos/pull/3270)
- Fixed a bug which caused initial rendering to sometimes miss some buckets. [#3262](https://github.com/scalableminds/webknossos/pull/3262)
- Fixed a bug which caused the save-button to never show success for volume tracings. [#3267](https://github.com/scalableminds/webknossos/pull/3267)
Expand Down
17 changes: 10 additions & 7 deletions app/assets/javascripts/oxalis/view/right-menu/search_popover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ type Props<S> = {
idKey: $Keys<S>,
onSelect: number => void,
children: *,
provideShortcut?: boolean,
};

type State = {
Expand All @@ -35,13 +36,15 @@ export default class SearchPopover<S: Object> extends React.PureComponent<Props<

return (
<React.Fragment>
<Shortcut
supportInputElements
keys="ctrl + shift + f"
onTrigger={() => {
this.setState({ isVisible: true });
}}
/>
{this.props.provideShortcut ? (
<Shortcut
supportInputElements
keys="ctrl + shift + f"
onTrigger={() => {
this.setState({ isVisible: true });
}}
/>
) : null}
<Popover
title="Search"
trigger="click"
Expand Down
1 change: 1 addition & 0 deletions app/assets/javascripts/oxalis/view/right-menu/trees_tab_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ class TreesTabView extends React.PureComponent<Props, State> {
idKey="treeId"
searchKey="name"
maxSearchResults={10}
provideShortcut
>
<Tooltip title="Open the search via CTRL + Shift + F">
<ButtonComponent>
Expand Down