[ARVADOS-WORKBENCH2] updated: 1.3.0-136-g506c5d3
Git user
git at public.curoverse.com
Thu Dec 13 09:26:13 EST 2018
Summary of changes:
src/components/context-menu/context-menu.tsx | 6 +++++-
.../context-menu/actions/file-viewer-actions.tsx | 20 ++++++++++----------
2 files changed, 15 insertions(+), 11 deletions(-)
via 506c5d3104812647a34c93690d6d04726edc09d9 (commit)
via 58e8b67f33be8d000b8ad4f24ee70acbea752e75 (commit)
from 54b2272cee641887e00c1cc04fd44121048e36b4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 506c5d3104812647a34c93690d6d04726edc09d9
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Dec 13 15:25:56 2018 +0100
Prevent going through file viewer action twice when navigationg using tab
Feature #13540
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/views-components/context-menu/actions/file-viewer-actions.tsx b/src/views-components/context-menu/actions/file-viewer-actions.tsx
index b2ce556..f1a4695 100644
--- a/src/views-components/context-menu/actions/file-viewer-actions.tsx
+++ b/src/views-components/context-menu/actions/file-viewer-actions.tsx
@@ -56,20 +56,20 @@ export const FileViewerActions = connect(mapStateToProps)(
({ fileUrl, viewers, onClick }: FileViewerActionProps & { onClick: () => void }) =>
<>
{viewers.map(viewer =>
- <a
+ <ListItem
+ button
+ component='a'
key={viewer.name}
style={{ textDecoration: 'none' }}
href={fillViewerUrl(fileUrl, viewer)}
onClick={onClick}
target='_blank'>
- <ListItem button>
- <ListItemIcon>
- <OpenIcon />
- </ListItemIcon>
- <ListItemText>
- {viewer.name}
- </ListItemText>
- </ListItem>
- </a>
+ <ListItemIcon>
+ <OpenIcon />
+ </ListItemIcon>
+ <ListItemText>
+ {viewer.name}
+ </ListItemText>
+ </ListItem>
)}
</>);
commit 58e8b67f33be8d000b8ad4f24ee70acbea752e75
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Dec 13 15:22:07 2018 +0100
Hide context menu separator if next items group is empty
Feature #13540
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/components/context-menu/context-menu.tsx b/src/components/context-menu/context-menu.tsx
index 4068251..98456da 100644
--- a/src/components/context-menu/context-menu.tsx
+++ b/src/components/context-menu/context-menu.tsx
@@ -53,7 +53,11 @@ export class ContextMenu extends React.PureComponent<ContextMenuProps> {
{item.name}
</ListItemText>}
</ListItem>)}
- {groupIndex < items.length - 1 && <Divider />}
+ {
+ items[groupIndex + 1] &&
+ items[groupIndex + 1].length > 0 &&
+ <Divider />
+ }
</React.Fragment>)}
</List>
</Popover>;
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list