From c6a7e15b037dd4aab7e12674a77eea8203b63f3a Mon Sep 17 00:00:00 2001 From: paris Date: Mon, 17 Nov 2014 12:36:13 +0200 Subject: [PATCH] [fit addon] Restore row content after proposing geometry - Restore `subjectRow.innerHTML`, using the `contentBuffer` - Bump version to 0.25 --- addons/fit/fit.js | 4 +++- bower.json | 2 +- docs/conf.py | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/fit/fit.js b/addons/fit/fit.js index 0700502f..da57644d 100644 --- a/addons/fit/fit.js +++ b/addons/fit/fit.js @@ -34,7 +34,7 @@ subjectRow.style.display = 'inline'; - contentBuffer = subjectRow.textContent; + contentBuffer = subjectRow.innerHTML; subjectRow.innerHTML = ' '; /* Arbitrary character to calculate its dimensions */ characterWidth = parseInt(subjectRow.offsetWidth); @@ -54,6 +54,8 @@ rows = parseInt(availableHeight / rowHeight); + subjectRow.innerHTML = contentBuffer; /* Replace original content */ + var geometry = { 'cols': cols, 'rows': rows diff --git a/bower.json b/bower.json index 49a4b497..3658d46e 100644 --- a/bower.json +++ b/bower.json @@ -1,5 +1,5 @@ { "name": "xterm.js", - "version": "0.24", + "version": "0.25", "ignore": ["demo", "docs", "test", ".gitignore"] } diff --git a/docs/conf.py b/docs/conf.py index a815d75d..877829c3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,9 +51,9 @@ copyright = u'2014, SourceLair Limited' # built documents. # # The short X.Y version. -version = '0.24' +version = '0.25' # The full version, including alpha/beta/rc tags. -release = '0.24 Alpha' +release = '0.25 Alpha' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.