Skip to content
This repository has been archived by the owner on Dec 13, 2020. It is now read-only.

Commit

Permalink
Merge pull request #731 from metasfresh/dev-725
Browse files Browse the repository at this point in the history
Sidelist closes when doubleclick #725
  • Loading branch information
damianprzygodzki authored May 11, 2017
2 parents 8277471 + 1f63040 commit 1dd8642
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
6 changes: 2 additions & 4 deletions src/components/app/DocumentList.js
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ class DocumentList extends Component {

redirectToDocument = (id) => {
const {
dispatch, isModal, windowType, isSideListShow, closeSideList
dispatch, isModal, windowType, isSideListShow
} = this.props;
const {page, viewId, sort} = this.state;

Expand All @@ -406,9 +406,7 @@ class DocumentList extends Component {

dispatch(push('/window/' + windowType + '/' + id));

if(isSideListShow) {
closeSideList();
}else{
if(!isSideListShow){
// Caching last settings
dispatch(setPagination(page, windowType));
dispatch(setSorting(sort, windowType));
Expand Down
10 changes: 3 additions & 7 deletions src/components/table/Table.js
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ class Table extends Component {
const {selected, rows} = this.state;

const {
onDoubleClick, closeOverlays, open
onDoubleClick, closeOverlays
} = this.props;

const selectRange = e.shiftKey;
Expand Down Expand Up @@ -377,14 +377,10 @@ class Table extends Component {
onDoubleClick(selected[selected.length-1]);
}

if(open) {
closeOverlays();
}
break;
case 'Escape':
if(open){
closeOverlays();
}
closeOverlays();

break;
case 'Tab': {
e.preventDefault();
Expand Down

0 comments on commit 1dd8642

Please sign in to comment.