quine-global/hyper
1
0
Fork 0
mirror of https://github.com/quine-global/hyper.git synced 2026-01-12 20:18:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ctrl+c to close WebView 🍾 (#1287)

Browse source 
* rm hyperCaretFocus => prevent callstask

* keep caret component
This commit is contained in:
Philippe Potvin 2016-12-21 10:19:41 -05:00 committed by Guillermo Rauch
parent ef5caeeb09
commit c7f195ba01
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/actions/sessions.js
View file

@ -57,7 +57,6 @@ export function addSessionData(uid, data) {
const enterKey = Boolean(data.match(/\n/));
const url = enterKey ? isUrl(shell, data) : null;
if (url) {
dispatch({
type: SESSION_URL_SET,

49
lib/components/term.js
View file

@ -16,8 +16,9 @@ export default class Term extends Component {
this.handleMouseUp = this.handleMouseUp.bind(this);
this.handleScrollEnter = this.handleScrollEnter.bind(this);
this.handleScrollLeave = this.handleScrollLeave.bind(this);
this.handleFocus = this.handleFocus.bind(this);
this.onHyperCaret = this.onHyperCaret.bind(this);
this.handleKeyDown = this.handleKeyDown.bind(this);
this.handleFocus = this.handleFocus.bind(this);
props.ref_(this);
}
@ -121,14 +122,6 @@ export default class Term extends Component {
this.scrollMouseEnter = false;
}
handleFocus() {
// This will in turn result in `this.focus()` being
// called, which is unecessary.
// Should investigate if it matters.
this.props.onActive();
this.term.focusHyperCaret();
}
handleMouseUp() {
this.props.onActive();
// this makes sure that we focus the hyper caret only
@ -139,6 +132,18 @@ export default class Term extends Component {
this.term.focusHyperCaret();
}
}
handleFocus() {
// This will in turn result in `this.focus()` being
// called, which is unecessary.
// Should investigate if it matters.
this.props.onActive();
}
handleKeyDown(e) {
if (e.ctrlKey && e.key === 'c') {
this.props.onURLAbort();
}
}
onHyperCaret(caret) {
this.hyperCaret = caret;
@ -262,13 +267,10 @@ export default class Term extends Component {
// key input so that it doesn't conflict
// with the <webview>
if (nextProps.url) {
const io = this.term.io.push();
io.onVTKeystroke = io.sendString = str => {
if (str.length === 1 && str.charCodeAt(0) === 3 /* Ctrl + C */) {
this.props.onURLAbort();
}
};
this.term.io.push();
window.addEventListener('keydown', this.handleKeyDown);
} else {
window.removeEventListener('keydown', this.handleKeyDown);
this.term.io.pop();
}
}
@ -349,6 +351,7 @@ export default class Term extends Component {
/>
{ this.props.url ?
<webview
key="hyper-webview"
src={this.props.url}
onFocus={this.handleFocus}
style={{
@ -361,16 +364,14 @@ export default class Term extends Component {
height: '100%'
}}
/> :
[
<div key="hyper-caret" contentEditable className="hyper-caret" ref={this.onHyperCaret}/>,
<div // eslint-disable-line react/jsx-indent
key="scrollbar"
className={css('scrollbarShim')}
onMouseEnter={this.handleScrollEnter}
onMouseLeave={this.handleScrollLeave}
/>
]
<div // eslint-disable-line react/jsx-indent
key="scrollbar"
className={css('scrollbarShim')}
onMouseEnter={this.handleScrollEnter}
onMouseLeave={this.handleScrollLeave}
/>
}
<div key="hyper-caret" contentEditable className="hyper-caret" ref={this.onHyperCaret}/>
{ this.props.customChildren }
</div>);
}