Compare commits

...
2 Commits
Author SHA1 Message Date
paris 615f633f25 [fit addon] Introduce proposeGeometry method
- Introduce new method to propose optimal geometry for the current terminal
- Bump version to 0.23
2014-11-17 12:21:05 +02:00
paris 567b39dc98 Fix #6 2014-09-22 05:48:05 +00:00
4 changed files with 53 additions and 36 deletions
+13 -2
View File
@@ -24,7 +24,7 @@
fit(this.Xterm); fit(this.Xterm);
} }
})(function (Xterm) { })(function (Xterm) {
Xterm.prototype.fit = function () { Xterm.prototype.proposeGeometry = function () {
var container = this.rowContainer, var container = this.rowContainer,
subjectRow = this.rowContainer.firstElementChild, subjectRow = this.rowContainer.firstElementChild,
rows, rows,
@@ -54,6 +54,17 @@
rows = parseInt(availableHeight / rowHeight); rows = parseInt(availableHeight / rowHeight);
this.resize(cols, rows); var geometry = {
'cols': cols,
'rows': rowss
};
return geometry;
};
Xterm.prototype.fit = function () {
var geometry = this.proposeGeometry();
this.resize(geometry.cols, geometry.rows);
}; };
}); });
+1 -1
View File
@@ -1,5 +1,5 @@
{ {
"name": "xterm.js", "name": "xterm.js",
"version": "0.22", "version": "0.23",
"ignore": ["demo", "docs", "test", ".gitignore"] "ignore": ["demo", "docs", "test", ".gitignore"]
} }
+9 -3
View File
@@ -1,12 +1,13 @@
var terminalContainer = document.getElementById('terminal-container'), var terminalContainer = document.getElementById('terminal-container'),
term = new Terminal(); term = new Terminal(),
prompt = '> ';
term.open(terminalContainer); term.open(terminalContainer);
term.fit(); term.fit();
term.prompt = function () { term.prompt = function () {
term.write('\r\n> '); term.write('\r\n' + prompt);
} };
term.writeln('Welcome to xterm.js'); term.writeln('Welcome to xterm.js');
term.writeln('Just type some keys in the prompt below.'); term.writeln('Just type some keys in the prompt below.');
@@ -19,7 +20,12 @@ term.on('key', function (key, ev) {
if (ev.keyIdentifier == 'Enter') { if (ev.keyIdentifier == 'Enter') {
term.prompt(); term.prompt();
} else if (ev.keyCode == 8) { } else if (ev.keyCode == 8) {
/*
* Do not delete the prompt
*/
if (term.x > 2) {
term.write('\b \b'); term.write('\b \b');
}
} else if (printable) { } else if (printable) {
term.write(key); term.write(key);
} }
+2 -2
View File
@@ -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.22' version = '0.23'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '0.22 Alpha' release = '0.23 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.