Skip to content

Commit d2f8f9d

Browse files
committed
Bump version to 2.5.0
Signed-off-by: Paris Kasidiaris <[email protected]>
1 parent df13469 commit d2f8f9d

File tree

7 files changed

+167
-101
lines changed

7 files changed

+167
-101
lines changed

AUTHORS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,20 @@ Daniel Imms <[email protected]>
2222
Daniel Risacher <[email protected]>
2323
Dan Kaplun <[email protected]>
2424
Darin Morrison <[email protected]>
25+
Edgar Andrés Margffoy Tuay <[email protected]>
2526
Elliot Saba <[email protected]>
2627
2728
Ian Lewis <[email protected]>
2829
30+
InDieTasten <[email protected]>
2931
Jean Bruenn <[email protected]>
3032
Jörg Breitbart <[email protected]>
3133
Lucian Buzzo <[email protected]>
3234
Maël Nison <[email protected]>
3335
Martin Wang <[email protected]>
36+
Michael Irwin <[email protected]>
3437
Mikko Karvonen <[email protected]>
38+
Nicolas Ramz <[email protected]>
3539
Paris Kasidiaris <[email protected]>
3640
Paris Kasidiaris <[email protected]>
3741
runarberg <[email protected]>
@@ -42,4 +46,5 @@ Thanasis Daglis <[email protected]>
4246
Tine Jozelj <[email protected]>
4347
Tyler Jewell <[email protected]>
4448
Vincent Woo <[email protected]>
49+
4550
YuviPanda <[email protected]>

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "xterm.js",
3-
"version": "2.4.0",
3+
"version": "2.5.0",
44
"ignore": ["demo", "test", ".gitignore"],
55
"main": [
66
"dist/xterm.js",

dist/addons/fit/fit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
subjectRow.innerHTML = 'W'; // Common character for measuring width, although on monospace
5757
characterWidth = subjectRow.getBoundingClientRect().width;
5858
subjectRow.style.display = ''; // Revert style before calculating height, since they differ.
59-
characterHeight = parseInt(subjectRow.offsetHeight);
59+
characterHeight = subjectRow.getBoundingClientRect().height;
6060
subjectRow.innerHTML = contentBuffer;
6161

6262
rows = parseInt(availableHeight / characterHeight);

dist/xterm.css

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
text-decoration: none;
8787
}
8888

89-
.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
89+
.terminal.focus:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
9090
background-color: #fff;
9191
color: #000;
9292
}
@@ -97,16 +97,9 @@
9797
background-color: transparent;
9898
}
9999

100-
.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar).focus.xterm-cursor-blink .terminal-cursor {
101-
animation: xterm-cursor-blink 1.2s infinite step-end;
102-
}
103-
104-
@keyframes xterm-cursor-blink {
105-
0% { }
106-
50% {
107-
background-color: transparent;
108-
color: inherit;
109-
}
100+
.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar).focus.xterm-cursor-blink-on .terminal-cursor {
101+
background-color: transparent;
102+
color: inherit;
110103
}
111104

112105
.terminal.xterm-cursor-style-bar .terminal-cursor,
@@ -132,13 +125,13 @@
132125
right: 0;
133126
height: 1px;
134127
}
128+
.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink.xterm-cursor-blink-on .terminal-cursor::before,
129+
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink.xterm-cursor-blink-on .terminal-cursor::before {
130+
background-color: transparent;
131+
}
135132
.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink .terminal-cursor::before,
136133
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink .terminal-cursor::before {
137-
animation: xterm-cursor-non-bar-blink 1.2s infinite step-end;
138-
}
139-
@keyframes xterm-cursor-non-bar-blink {
140-
0% { background-color: #fff; }
141-
50% { background-color: transparent; }
134+
background-color: #fff;
142135
}
143136

144137
.terminal .composition-view {

0 commit comments

Comments
 (0)