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.

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

Add textarea back and support IMEs #175

Merged
merged 27 commits into from
Jul 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
fc7b22d
Manually revert textarea changes
Tyriar Jul 12, 2016
aaedcfc
Support focus class on the .xterm element
Tyriar Jul 12, 2016
a52b7e7
Add starting point for IME support
Tyriar Jul 12, 2016
7d8e28a
Merge remote-tracking branch 'upstream/master' into 124_add_textarea_…
Tyriar Jul 13, 2016
26af6ff
Get IMEs working
Tyriar Jul 13, 2016
03fa017
Re-hide the textarea
Tyriar Jul 13, 2016
29000fb
Refactor into CompositionHelper object
Tyriar Jul 13, 2016
c656ed0
Use handler not write, fix other edge cases
Tyriar Jul 13, 2016
cab79c4
jsdoc and tidy up
Tyriar Jul 13, 2016
8faea59
Handle non-composition input when IME is active
Tyriar Jul 13, 2016
237e681
Fix tests
Tyriar Jul 13, 2016
8b46e84
Use correct .terminal-cursor for composition view
Tyriar Jul 13, 2016
c18794f
Merge remote-tracking branch 'upstream/master' into 124_add_textarea_…
Tyriar Jul 13, 2016
e1c1b07
Add test cases for Korean
Tyriar Jul 13, 2016
8074d75
Only position composition view if a cursor is visible
Tyriar Jul 14, 2016
38d0887
Don't finalize composition on modifier key presses
Tyriar Jul 14, 2016
4efb8d2
Don't wrap multi-character compositions
Tyriar Jul 14, 2016
0a7c1bf
Position the textarea below the cursor during a composition
Tyriar Jul 14, 2016
ac8db6e
jsdoc handleAnyTextareaChanges
Tyriar Jul 14, 2016
89d29bb
Fix non-composition char input after composition char + test
Tyriar Jul 14, 2016
14a62c0
Add test cases for Japanese
Tyriar Jul 14, 2016
534a9e7
Big clean up
Tyriar Jul 14, 2016
11d5f51
Merge remote-tracking branch 'upstream/master' into 124_add_textarea_…
Tyriar Jul 15, 2016
fedc1fd
Fix keydown conditional
Tyriar Jul 15, 2016
a3a7017
Fix tests
Tyriar Jul 15, 2016
0010a5a
Explicitly return from keydown
Tyriar Jul 15, 2016
4595a18
Tidy up blur/focus handlers
Tyriar Jul 21, 2016
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
36 changes: 33 additions & 3 deletions src/xterm.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,40 @@
position: relative;
}

.terminal:focus {
.terminal.focus {
outline: none;
}

.terminal .xterm-helpers {
position: absolute;
top: 0;
}

.terminal .xterm-helper-textarea {
position: absolute;
/*
* HACK: to fix IE's blinking cursor
* Move textarea out of the screen to the far left, so that the cursor is not visible.
*/
left: -9999em;
opacity: 0;
width: 0;
height: 0;
z-index: -10;
}

.terminal .terminal-cursor {
background-color: #fff;
color: #000;
}

.terminal:not(:focus) .terminal-cursor {
.terminal:not(.focus) .terminal-cursor {
outline: 1px solid #fff;
outline-offset: -1px;
background-color: transparent;
}

.terminal:focus .terminal-cursor.blinking {
.terminal.focus .terminal-cursor.blinking {
animation: blink-cursor 1.2s infinite step-end;
}

Expand All @@ -73,6 +91,18 @@
}
}

.terminal .composition-view {
background: #000;
color: #FFF;
display: none;
position: absolute;
white-space: nowrap;
}

.terminal .composition-view.active {
display: block;
}

/*
* Determine default colors for xterm.js
*/
Expand Down
Loading