IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure the appropriate entry is focussed when entering the history tab.

Browse Source
This commit is contained in:
Joao Pedro De Almeida Pereira
2017-07-24 11:46:06 +01:00
committed by Dave Page
parent eb5bb5fcc0
commit fe95b7670b
2 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
web/pgadmin/static/jsx/history/query_history.jsx
View File

@@ -57,13 +57,13 @@ export default class QueryHistory extends React.Component {
refocus() {
if (this.state.history.length > 0) {
this.retrieveQueryListPane().focus();
this.retrieveSelectedQuery().parentElement.focus();
}
}
retrieveQueryListPane() {
retrieveSelectedQuery() {
return ReactDOM.findDOMNode(this)
.getElementsByClassName('query-history')[0];
.getElementsByClassName('selected')[0];
}
getCurrentHistoryDetail() {
@@ -115,8 +115,8 @@ export default class QueryHistory extends React.Component {
}
navigateUpAndDown(event) {
let arrowKeys = [ARROWUP, ARROWDOWN];
let key = event.keyCode || event.which;
const arrowKeys = [ARROWUP, ARROWDOWN];
const key = event.keyCode || event.which;
if (arrowKeys.indexOf(key) > -1) {
event.preventDefault();
this.onKeyDownHandler(event);
@@ -169,17 +169,18 @@ export default class QueryHistory extends React.Component {
render() {
return (
<SplitPane defaultSize="50%" split="vertical" pane1Style={queryEntryListDivStyle}
<SplitPane defaultSize='50%' split='vertical' pane1Style={queryEntryListDivStyle}
pane2Style={queryDetailDivStyle}>
<div id='query_list'
className="query-history"
className='query-history'
onKeyDown={this.navigateUpAndDown}
tabIndex='0'>
tabIndex={-1}>
<ul>
{this.retrieveOrderedHistory()
.map((entry, index) =>
<li key={index} className='list-item'
onClick={this.onClickHandler.bind(this, index)}>
onClick={this.onClickHandler.bind(this, index)}
tabIndex={-1}>
<QueryHistoryEntry
historyEntry={entry}
isSelected={index == this.state.selectedEntry}/>