Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ede9ee416a | ||
|
|
53f5672524 | ||
|
|
9d00eec6c4 |
+3
-3
@@ -17,7 +17,6 @@ Terminal.prototype.fit = function () {
|
|||||||
rows,
|
rows,
|
||||||
contentBuffer,
|
contentBuffer,
|
||||||
characterWidth,
|
characterWidth,
|
||||||
characterHeight,
|
|
||||||
cols;
|
cols;
|
||||||
|
|
||||||
subjectRow.style.display = 'inline';
|
subjectRow.style.display = 'inline';
|
||||||
@@ -37,9 +36,10 @@ Terminal.prototype.fit = function () {
|
|||||||
parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height')),
|
parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height')),
|
||||||
elementStyle = window.getComputedStyle(this.element),
|
elementStyle = window.getComputedStyle(this.element),
|
||||||
elementPadding = parseInt(elementStyle.getPropertyValue('padding-top')) + parseInt(elementStyle.getPropertyValue('padding-bottom')),
|
elementPadding = parseInt(elementStyle.getPropertyValue('padding-top')) + parseInt(elementStyle.getPropertyValue('padding-bottom')),
|
||||||
availableHeight = parentElementHeight - elementPadding;
|
availableHeight = parentElementHeight - elementPadding,
|
||||||
|
rowHeight = this.rowContainer.firstElementChild.offsetHeight;
|
||||||
|
|
||||||
rows = parseInt(availableHeight / characterHeight);
|
rows = parseInt(availableHeight / rowHeight);
|
||||||
|
|
||||||
this.resize(cols, rows);
|
this.resize(cols, rows);
|
||||||
};
|
};
|
||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "xterm.js",
|
"name": "xterm.js",
|
||||||
"version": "0.15",
|
"version": "0.16",
|
||||||
"ignore": ["demo", "docs", "test", ".gitignore"]
|
"ignore": ["demo", "docs", "test", ".gitignore"]
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -51,9 +51,9 @@ copyright = u'2014, SourceLair Limited'
|
|||||||
# built documents.
|
# built documents.
|
||||||
#
|
#
|
||||||
# The short X.Y version.
|
# The short X.Y version.
|
||||||
version = '0.15'
|
version = '0.16'
|
||||||
# The full version, including alpha/beta/rc tags.
|
# The full version, including alpha/beta/rc tags.
|
||||||
release = '0.15 Alpha'
|
release = '0.16 Alpha'
|
||||||
|
|
||||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||||
# for a list of supported languages.
|
# for a list of supported languages.
|
||||||
|
|||||||
+2
-2
@@ -916,9 +916,9 @@ Terminal.prototype.bindMouse = function() {
|
|||||||
if (self.mouseEvents) return;
|
if (self.mouseEvents) return;
|
||||||
if (self.applicationKeypad) return;
|
if (self.applicationKeypad) return;
|
||||||
if (ev.type === 'DOMMouseScroll') {
|
if (ev.type === 'DOMMouseScroll') {
|
||||||
self.scrollDisp(ev.detail < 0 ? -5 : 5);
|
self.scrollDisp(ev.detail < 0 ? -1 : 1);
|
||||||
} else {
|
} else {
|
||||||
self.scrollDisp(ev.wheelDeltaY > 0 ? -5 : 5);
|
self.scrollDisp(ev.wheelDeltaY > 0 ? -1 : 1);
|
||||||
}
|
}
|
||||||
return self.cancel(ev);
|
return self.cancel(ev);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user