From 9d00eec6c495f7497b5c4a2e24ce9966547b12b3 Mon Sep 17 00:00:00 2001 From: paris Date: Wed, 27 Aug 2014 09:50:09 +0000 Subject: [PATCH 1/3] Fix #2 --- src/xterm.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xterm.js b/src/xterm.js index 7c56a60305..44d048536e 100644 --- a/src/xterm.js +++ b/src/xterm.js @@ -916,9 +916,9 @@ Terminal.prototype.bindMouse = function() { if (self.mouseEvents) return; if (self.applicationKeypad) return; if (ev.type === 'DOMMouseScroll') { - self.scrollDisp(ev.detail < 0 ? -5 : 5); + self.scrollDisp(ev.detail < 0 ? -1 : 1); } else { - self.scrollDisp(ev.wheelDeltaY > 0 ? -5 : 5); + self.scrollDisp(ev.wheelDeltaY > 0 ? -1 : 1); } return self.cancel(ev); }); From 53f56725248f5c1322d1452ad443cf8c6b8a9523 Mon Sep 17 00:00:00 2001 From: paris Date: Fri, 29 Aug 2014 09:57:53 +0000 Subject: [PATCH 2/3] Fix #3 --- addons/fit/fit.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/fit/fit.js b/addons/fit/fit.js index 7bc73cd20c..3dc339afb6 100644 --- a/addons/fit/fit.js +++ b/addons/fit/fit.js @@ -17,7 +17,6 @@ Terminal.prototype.fit = function () { rows, contentBuffer, characterWidth, - characterHeight, cols; subjectRow.style.display = 'inline'; @@ -37,9 +36,10 @@ Terminal.prototype.fit = function () { parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height')), elementStyle = window.getComputedStyle(this.element), 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); }; \ No newline at end of file From ede9ee416acf51f853e9235ff0a2f15ed50fa0a9 Mon Sep 17 00:00:00 2001 From: paris Date: Fri, 29 Aug 2014 09:58:27 +0000 Subject: [PATCH 3/3] Bump version to 0.16 --- bower.json | 2 +- docs/conf.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index 04676d9884..fd8f1504c0 100644 --- a/bower.json +++ b/bower.json @@ -1,5 +1,5 @@ { "name": "xterm.js", - "version": "0.15", + "version": "0.16", "ignore": ["demo", "docs", "test", ".gitignore"] } diff --git a/docs/conf.py b/docs/conf.py index 6fb465b091..b510074b3c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,9 +51,9 @@ # built documents. # # The short X.Y version. -version = '0.15' +version = '0.16' # 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 # for a list of supported languages.