Bump version to 2.3.0

Signed-off-by: Paris Kasidiaris <paris@sourcelair.com>
This commit is contained in:
Paris Kasidiaris 2017-02-08 22:24:56 +00:00
parent 795cdb52dc
commit 8dd11f5587
No known key found for this signature in database
GPG Key ID: BF6B0B0F80EDDDBB
11 changed files with 4335 additions and 5493 deletions

View File

@ -7,7 +7,10 @@ Anton Skshidlevsky <meefik@gmail.com>
Anton Yurovskykh <anton.yurovskykh@gmail.com> Anton Yurovskykh <anton.yurovskykh@gmail.com>
Austin Robertson <austinrobertson@gmail.com> Austin Robertson <austinrobertson@gmail.com>
ayapi <colors.aya@gmail.com> ayapi <colors.aya@gmail.com>
Ben Hall <ben@benhall.me.uk>
Benjamin Fischer <benjamin.fischer@rwth-aachen.de> Benjamin Fischer <benjamin.fischer@rwth-aachen.de>
Bill Church <billchurch@users.noreply.github.com>
Bob Reid <bobreid@Bobs-MacBook-Pro.local>
bottleofwater <nison.mael+bottleofwater@gmail.com> bottleofwater <nison.mael+bottleofwater@gmail.com>
Carson Anderson <carson@betterservers.com> Carson Anderson <carson@betterservers.com>
Christian Budde Christensen <budde377@gmail.com> Christian Budde Christensen <budde377@gmail.com>
@ -22,13 +25,17 @@ Ian Lewis <ianlewis@google.com>
imoses <ido@twiggle.com> imoses <ido@twiggle.com>
Jean Bruenn <himself@jeanbruenn.info> Jean Bruenn <himself@jeanbruenn.info>
Jörg Breitbart <jerch@rockborn.de> Jörg Breitbart <jerch@rockborn.de>
Lucian Buzzo <lucian.buzzo@gmail.com>
Maël Nison <nison.mael@gmail.com> Maël Nison <nison.mael@gmail.com>
Mikko Karvonen <mikko.karvonen@arm.com> Mikko Karvonen <mikko.karvonen@arm.com>
Paris Kasidiaris <pariskasidiaris@gmail.com> Paris Kasidiaris <pariskasidiaris@gmail.com>
Paris Kasidiaris <paris@sourcelair.com> Paris Kasidiaris <paris@sourcelair.com>
runarberg <runar@greenqloud.com> runarberg <runar@greenqloud.com>
Saswat Das <saswatds@users.noreply.github.com>
Shuanglei Tao <tsl0922@gmail.com> Shuanglei Tao <tsl0922@gmail.com>
Steven Silvester <steven.silvester@ieee.org> Steven Silvester <steven.silvester@ieee.org>
Thanasis Daglis <thanasis@sourcelair.com> Thanasis Daglis <thanasis@sourcelair.com>
Tine Jozelj <tine.jozelj@outlook.com> Tine Jozelj <tine.jozelj@outlook.com>
Tyler Jewell <tjewell@codenvy.com>
Vincent Woo <me@vincentwoo.com>
YuviPanda <yuvipanda@gmail.com> YuviPanda <yuvipanda@gmail.com>

View File

@ -1,6 +1,6 @@
{ {
"name": "xterm.js", "name": "xterm.js",
"version": "2.2.3", "version": "2.3.0",
"ignore": ["demo", "test", ".gitignore"], "ignore": ["demo", "test", ".gitignore"],
"main": [ "main": [
"dist/xterm.js", "dist/xterm.js",

View File

@ -3,112 +3,124 @@
* @module xterm/addons/attach/attach * @module xterm/addons/attach/attach
* @license MIT * @license MIT
*/ */
(function (attach) { (function (attach) {
if (typeof exports === 'object' && typeof module === 'object') { if (typeof exports === 'object' && typeof module === 'object') {
/* /*
* CommonJS environment * CommonJS environment
*/ */
module.exports = attach(require('../../xterm')); module.exports = attach(require('../../xterm'));
} } else if (typeof define == 'function') {
else if (typeof define == 'function') { /*
/* * Require.js is available
* Require.js is available */
*/ define(['../../xterm'], attach);
define(['../../xterm'], attach); } else {
} /*
else { * Plain browser environment
/* */
* Plain browser environment attach(window.Terminal);
*/ }
attach(window.Terminal);
}
})(function (Xterm) { })(function (Xterm) {
'use strict'; 'use strict';
var exports = {};
/** var exports = {};
* Attaches the given terminal to the given socket.
* /**
* @param {Xterm} term - The terminal to be attached to the given socket. * Attaches the given terminal to the given socket.
* @param {WebSocket} socket - The socket to attach the current terminal. *
* @param {boolean} bidirectional - Whether the terminal should send data * @param {Xterm} term - The terminal to be attached to the given socket.
* to the socket as well. * @param {WebSocket} socket - The socket to attach the current terminal.
* @param {boolean} buffered - Whether the rendering of incoming data * @param {boolean} bidirectional - Whether the terminal should send data
* should happen instantly or at a maximum * to the socket as well.
* frequency of 1 rendering per 10ms. * @param {boolean} buffered - Whether the rendering of incoming data
*/ * should happen instantly or at a maximum
exports.attach = function (term, socket, bidirectional, buffered) { * frequency of 1 rendering per 10ms.
bidirectional = (typeof bidirectional == 'undefined') ? true : bidirectional; */
term.socket = socket; exports.attach = function (term, socket, bidirectional, buffered) {
term._flushBuffer = function () { bidirectional = (typeof bidirectional == 'undefined') ? true : bidirectional;
term.write(term._attachSocketBuffer); term.socket = socket;
term._attachSocketBuffer = null;
clearTimeout(term._attachSocketBufferTimer); term._flushBuffer = function () {
term._attachSocketBufferTimer = null; term.write(term._attachSocketBuffer);
}; term._attachSocketBuffer = null;
term._pushToBuffer = function (data) { clearTimeout(term._attachSocketBufferTimer);
if (term._attachSocketBuffer) { term._attachSocketBufferTimer = null;
term._attachSocketBuffer += data;
}
else {
term._attachSocketBuffer = data;
setTimeout(term._flushBuffer, 10);
}
};
term._getMessage = function (ev) {
if (buffered) {
term._pushToBuffer(ev.data);
}
else {
term.write(ev.data);
}
};
term._sendData = function (data) {
socket.send(data);
};
socket.addEventListener('message', term._getMessage);
if (bidirectional) {
term.on('data', term._sendData);
}
socket.addEventListener('close', term.detach.bind(term, socket));
socket.addEventListener('error', term.detach.bind(term, socket));
}; };
/**
* Detaches the given terminal from the given socket term._pushToBuffer = function (data) {
* if (term._attachSocketBuffer) {
* @param {Xterm} term - The terminal to be detached from the given socket. term._attachSocketBuffer += data;
* @param {WebSocket} socket - The socket from which to detach the current } else {
* terminal. term._attachSocketBuffer = data;
*/ setTimeout(term._flushBuffer, 10);
exports.detach = function (term, socket) { }
term.off('data', term._sendData);
socket = (typeof socket == 'undefined') ? term.socket : socket;
if (socket) {
socket.removeEventListener('message', term._getMessage);
}
delete term.socket;
}; };
/**
* Attaches the current terminal to the given socket term._getMessage = function (ev) {
* if (buffered) {
* @param {WebSocket} socket - The socket to attach the current terminal. term._pushToBuffer(ev.data);
* @param {boolean} bidirectional - Whether the terminal should send data } else {
* to the socket as well. term.write(ev.data);
* @param {boolean} buffered - Whether the rendering of incoming data }
* should happen instantly or at a maximum
* frequency of 1 rendering per 10ms.
*/
Xterm.prototype.attach = function (socket, bidirectional, buffered) {
return exports.attach(this, socket, bidirectional, buffered);
}; };
/**
* Detaches the current terminal from the given socket. term._sendData = function (data) {
* socket.send(data);
* @param {WebSocket} socket - The socket from which to detach the current
* terminal.
*/
Xterm.prototype.detach = function (socket) {
return exports.detach(this, socket);
}; };
return exports;
socket.addEventListener('message', term._getMessage);
if (bidirectional) {
term.on('data', term._sendData);
}
socket.addEventListener('close', term.detach.bind(term, socket));
socket.addEventListener('error', term.detach.bind(term, socket));
};
/**
* Detaches the given terminal from the given socket
*
* @param {Xterm} term - The terminal to be detached from the given socket.
* @param {WebSocket} socket - The socket from which to detach the current
* terminal.
*/
exports.detach = function (term, socket) {
term.off('data', term._sendData);
socket = (typeof socket == 'undefined') ? term.socket : socket;
if (socket) {
socket.removeEventListener('message', term._getMessage);
}
delete term.socket;
};
/**
* Attaches the current terminal to the given socket
*
* @param {WebSocket} socket - The socket to attach the current terminal.
* @param {boolean} bidirectional - Whether the terminal should send data
* to the socket as well.
* @param {boolean} buffered - Whether the rendering of incoming data
* should happen instantly or at a maximum
* frequency of 1 rendering per 10ms.
*/
Xterm.prototype.attach = function (socket, bidirectional, buffered) {
return exports.attach(this, socket, bidirectional, buffered);
};
/**
* Detaches the current terminal from the given socket.
*
* @param {WebSocket} socket - The socket from which to detach the current
* terminal.
*/
Xterm.prototype.detach = function (socket) {
return exports.detach(this, socket);
};
return exports;
}); });
//# sourceMappingURL=attach.js.map

110
dist/addons/fit/fit.js vendored
View File

@ -10,50 +10,72 @@
* @module xterm/addons/fit/fit * @module xterm/addons/fit/fit
* @license MIT * @license MIT
*/ */
(function (fit) { (function (fit) {
if (typeof exports === 'object' && typeof module === 'object') { if (typeof exports === 'object' && typeof module === 'object') {
/* /*
* CommonJS environment * CommonJS environment
*/ */
module.exports = fit(require('../../xterm')); module.exports = fit(require('../../xterm'));
} } else if (typeof define == 'function') {
else if (typeof define == 'function') { /*
/* * Require.js is available
* Require.js is available */
*/ define(['../../xterm'], fit);
define(['../../xterm'], fit); } else {
} /*
else { * Plain browser environment
/* */
* Plain browser environment fit(window.Terminal);
*/ }
fit(window.Terminal);
}
})(function (Xterm) { })(function (Xterm) {
var exports = {}; var exports = {};
exports.proposeGeometry = function (term) {
var parentElementStyle = window.getComputedStyle(term.element.parentElement), parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height')), parentElementWidth = Math.max(0, parseInt(parentElementStyle.getPropertyValue('width')) - 17), elementStyle = window.getComputedStyle(term.element), elementPaddingVer = parseInt(elementStyle.getPropertyValue('padding-top')) + parseInt(elementStyle.getPropertyValue('padding-bottom')), elementPaddingHor = parseInt(elementStyle.getPropertyValue('padding-right')) + parseInt(elementStyle.getPropertyValue('padding-left')), availableHeight = parentElementHeight - elementPaddingVer, availableWidth = parentElementWidth - elementPaddingHor, container = term.rowContainer, subjectRow = term.rowContainer.firstElementChild, contentBuffer = subjectRow.innerHTML, characterHeight, rows, characterWidth, cols, geometry; exports.proposeGeometry = function (term) {
subjectRow.style.display = 'inline'; var parentElementStyle = window.getComputedStyle(term.element.parentElement),
subjectRow.innerHTML = 'W'; // Common character for measuring width, although on monospace parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height')),
characterWidth = subjectRow.getBoundingClientRect().width; parentElementWidth = Math.max(0, parseInt(parentElementStyle.getPropertyValue('width')) - 17),
subjectRow.style.display = ''; // Revert style before calculating height, since they differ. elementStyle = window.getComputedStyle(term.element),
characterHeight = parseInt(subjectRow.offsetHeight); elementPaddingVer = parseInt(elementStyle.getPropertyValue('padding-top')) + parseInt(elementStyle.getPropertyValue('padding-bottom')),
subjectRow.innerHTML = contentBuffer; elementPaddingHor = parseInt(elementStyle.getPropertyValue('padding-right')) + parseInt(elementStyle.getPropertyValue('padding-left')),
rows = parseInt(availableHeight / characterHeight); availableHeight = parentElementHeight - elementPaddingVer,
cols = parseInt(availableWidth / characterWidth); availableWidth = parentElementWidth - elementPaddingHor,
geometry = { cols: cols, rows: rows }; container = term.rowContainer,
return geometry; subjectRow = term.rowContainer.firstElementChild,
}; contentBuffer = subjectRow.innerHTML,
exports.fit = function (term) { characterHeight,
var geometry = exports.proposeGeometry(term); rows,
term.resize(geometry.cols, geometry.rows); characterWidth,
}; cols,
Xterm.prototype.proposeGeometry = function () { geometry;
return exports.proposeGeometry(this);
}; subjectRow.style.display = 'inline';
Xterm.prototype.fit = function () { subjectRow.innerHTML = 'W'; // Common character for measuring width, although on monospace
return exports.fit(this); characterWidth = subjectRow.getBoundingClientRect().width;
}; subjectRow.style.display = ''; // Revert style before calculating height, since they differ.
return exports; characterHeight = parseInt(subjectRow.offsetHeight);
subjectRow.innerHTML = contentBuffer;
rows = parseInt(availableHeight / characterHeight);
cols = parseInt(availableWidth / characterWidth);
geometry = {cols: cols, rows: rows};
return geometry;
};
exports.fit = function (term) {
var geometry = exports.proposeGeometry(term);
term.resize(geometry.cols, geometry.rows);
};
Xterm.prototype.proposeGeometry = function () {
return exports.proposeGeometry(this);
};
Xterm.prototype.fit = function () {
return exports.fit(this);
};
return exports;
}); });
//# sourceMappingURL=fit.js.map

View File

@ -4,47 +4,47 @@
* @license MIT * @license MIT
*/ */
(function (fullscreen) { (function (fullscreen) {
if (typeof exports === 'object' && typeof module === 'object') { if (typeof exports === 'object' && typeof module === 'object') {
/* /*
* CommonJS environment * CommonJS environment
*/
module.exports = fullscreen(require('../../xterm'));
}
else if (typeof define == 'function') {
/*
* Require.js is available
*/
define(['../../xterm'], fullscreen);
}
else {
/*
* Plain browser environment
*/
fullscreen(window.Terminal);
}
})(function (Xterm) {
var exports = {};
/**
* Toggle the given terminal's fullscreen mode.
* @param {Xterm} term - The terminal to toggle full screen mode
* @param {boolean} fullscreen - Toggle fullscreen on (true) or off (false)
*/ */
exports.toggleFullScreen = function (term, fullscreen) { module.exports = fullscreen(require('../../xterm'));
var fn; } else if (typeof define == 'function') {
if (typeof fullscreen == 'undefined') { /*
fn = (term.element.classList.contains('fullscreen')) ? 'remove' : 'add'; * Require.js is available
} */
else if (!fullscreen) { define(['../../xterm'], fullscreen);
fn = 'remove'; } else {
} /*
else { * Plain browser environment
fn = 'add'; */
} fullscreen(window.Terminal);
term.element.classList[fn]('fullscreen'); }
}; })(function (Xterm) {
Xterm.prototype.toggleFullscreen = function (fullscreen) { var exports = {};
exports.toggleFullScreen(this, fullscreen);
}; /**
return exports; * Toggle the given terminal's fullscreen mode.
* @param {Xterm} term - The terminal to toggle full screen mode
* @param {boolean} fullscreen - Toggle fullscreen on (true) or off (false)
*/
exports.toggleFullScreen = function (term, fullscreen) {
var fn;
if (typeof fullscreen == 'undefined') {
fn = (term.element.classList.contains('fullscreen')) ? 'remove' : 'add';
} else if (!fullscreen) {
fn = 'remove';
} else {
fn = 'add';
}
term.element.classList[fn]('fullscreen');
};
Xterm.prototype.toggleFullscreen = function (fullscreen) {
exports.toggleFullScreen(this, fullscreen);
};
return exports;
}); });
//# sourceMappingURL=fullscreen.js.map

View File

@ -3,163 +3,205 @@
* @module xterm/addons/linkify/linkify * @module xterm/addons/linkify/linkify
* @license MIT * @license MIT
*/ */
(function (linkify) { (function (linkify) {
if (typeof exports === 'object' && typeof module === 'object') { if (typeof exports === 'object' && typeof module === 'object') {
/* /*
* CommonJS environment * CommonJS environment
*/ */
module.exports = linkify(require('../../xterm')); module.exports = linkify(require('../../xterm'));
} } else if (typeof define == 'function') {
else if (typeof define == 'function') { /*
/* * Require.js is available
* Require.js is available */
*/ define(['../../xterm'], linkify);
define(['../../xterm'], linkify); } else {
} /*
else { * Plain browser environment
/* */
* Plain browser environment linkify(window.Terminal);
*/ }
linkify(window.Terminal);
}
})(function (Xterm) { })(function (Xterm) {
'use strict'; 'use strict';
var exports = {}, protocolClause = '(https?:\\/\\/)', domainCharacterSet = '[\\da-z\\.-]+', negatedDomainCharacterSet = '[^\\da-z\\.-]+', domainBodyClause = '(' + domainCharacterSet + ')', tldClause = '([a-z\\.]{2,6})', ipClause = '((\\d{1,3}\\.){3}\\d{1,3})', portClause = '(:\\d{1,5})', hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|' + ipClause + ')' + portClause + '?', pathClause = '(\\/[\\/\\w\\.-]*)*', negatedPathCharacterSet = '[^\\/\\w\\.-]+', bodyClause = hostClause + pathClause, start = '(?:^|' + negatedDomainCharacterSet + ')(', end = ')($|' + negatedPathCharacterSet + ')', lenientUrlClause = start + protocolClause + '?' + bodyClause + end, strictUrlClause = start + protocolClause + bodyClause + end, lenientUrlRegex = new RegExp(lenientUrlClause), strictUrlRegex = new RegExp(strictUrlClause);
var exports = {},
protocolClause = '(https?:\\/\\/)',
domainCharacterSet = '[\\da-z\\.-]+',
negatedDomainCharacterSet = '[^\\da-z\\.-]+',
domainBodyClause = '(' + domainCharacterSet + ')',
tldClause = '([a-z\\.]{2,6})',
ipClause = '((\\d{1,3}\\.){3}\\d{1,3})',
portClause = '(:\\d{1,5})',
hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|' + ipClause + ')' + portClause + '?',
pathClause = '(\\/[\\/\\w\\.-]*)*',
negatedPathCharacterSet = '[^\\/\\w\\.-]+',
bodyClause = hostClause + pathClause,
start = '(?:^|' + negatedDomainCharacterSet + ')(',
end = ')($|' + negatedPathCharacterSet + ')',
lenientUrlClause = start + protocolClause + '?' + bodyClause + end,
strictUrlClause = start + protocolClause + bodyClause + end,
lenientUrlRegex = new RegExp(lenientUrlClause),
strictUrlRegex = new RegExp(strictUrlClause);
/**
* Converts all valid URLs found in the given terminal line into
* hyperlinks. The terminal line can be either the HTML element itself
* or the index of the termina line in the children of the terminal
* rows container.
*
* @param {Xterm} terminal - The terminal that owns the given line.
* @param {number|HTMLDivElement} line - The terminal line that should get
* "linkified".
* @param {boolean} lenient - The regex type that will be used to identify links. If lenient is
* false, the regex requires a protocol clause. Defaults to true.
* @param {string} target - Sets target="" attribute with value provided to links.
* Default doesn't set target attribute
* @emits linkify
* @emits linkify:line
*/
exports.linkifyTerminalLine = function (terminal, line, lenient, target) {
if (typeof line == 'number') {
line = terminal.rowContainer.children[line];
} else if (! (line instanceof HTMLDivElement)) {
var message = 'The "line" argument should be either a number';
message += ' or an HTMLDivElement';
throw new TypeError(message);
}
if (typeof target === 'undefined') {
target = '';
} else {
target = 'target="' + target + '"';
}
var buffer = document.createElement('span'),
nodes = line.childNodes;
for (var j=0; j<nodes.length; j++) {
var node = nodes[j],
match;
/**
* Since we cannot access the TextNode's HTML representation
* from the instance itself, we assign its data as textContent
* to a dummy buffer span, in order to retrieve the TextNode's
* HTML representation from the buffer's innerHTML.
*/
buffer.textContent = node.data;
var nodeHTML = buffer.innerHTML;
/**
* Apply function only on TextNodes
*/
if (node.nodeType != node.TEXT_NODE) {
continue;
}
var url = exports.findLinkMatch(node.data, lenient);
if (!url) {
continue;
}
var startsWithProtocol = new RegExp('^' + protocolClause),
urlHasProtocol = url.match(startsWithProtocol),
href = (urlHasProtocol) ? url : 'http://' + url,
link = '<a href="' + href + '" ' + target + '>' + url + '</a>',
newHTML = nodeHTML.replace(url, link);
line.innerHTML = line.innerHTML.replace(nodeHTML, newHTML);
}
/** /**
* Converts all valid URLs found in the given terminal line into * This event gets emitted when conversion of all URL susbtrings
* hyperlinks. The terminal line can be either the HTML element itself * to HTML anchor elements (links) has finished, for a specific
* or the index of the termina line in the children of the terminal * line of the current Xterm instance.
* rows container.
* *
* @param {Xterm} terminal - The terminal that owns the given line. * @event linkify:line
* @param {number|HTMLDivElement} line - The terminal line that should get
* "linkified".
* @param {boolean} lenient - The regex type that will be used to identify links. If lenient is
* false, the regex requires a protocol clause. Defaults to true.
* @param {string} target - Sets target="" attribute with value provided to links.
* Default doesn't set target attribute
* @emits linkify
* @emits linkify:line
*/ */
exports.linkifyTerminalLine = function (terminal, line, lenient, target) { terminal.emit('linkify:line', line);
if (typeof line == 'number') { };
line = terminal.rowContainer.children[line];
} /**
else if (!(line instanceof HTMLDivElement)) { * Finds a link within a block of text.
var message = 'The "line" argument should be either a number'; *
message += ' or an HTMLDivElement'; * @param {string} text - The text to search .
throw new TypeError(message); * @param {boolean} lenient - Whether to use the lenient search.
} * @return {string} A URL.
if (typeof target === 'undefined') { */
target = ''; exports.findLinkMatch = function (text, lenient) {
} var match = text.match(lenient ? lenientUrlRegex : strictUrlRegex);
else { if (!match || match.length === 0) {
target = 'target="' + target + '"'; return null;
} }
var buffer = document.createElement('span'), nodes = line.childNodes; return match[1];
for (var j = 0; j < nodes.length; j++) { }
var node = nodes[j], match;
/** /**
* Since we cannot access the TextNode's HTML representation * Converts all valid URLs found in the terminal view into hyperlinks.
* from the instance itself, we assign its data as textContent *
* to a dummy buffer span, in order to retrieve the TextNode's * @param {Xterm} terminal - The terminal that should get "linkified".
* HTML representation from the buffer's innerHTML. * @param {boolean} lenient - The regex type that will be used to identify links. If lenient is
*/ * false, the regex requires a protocol clause. Defaults to true.
buffer.textContent = node.data; * @param {string} target - Sets target="" attribute with value provided to links.
var nodeHTML = buffer.innerHTML; * Default doesn't set target attribute
/** * @emits linkify
* Apply function only on TextNodes * @emits linkify:line
*/ */
if (node.nodeType != node.TEXT_NODE) { exports.linkify = function (terminal, lenient, target) {
continue; var rows = terminal.rowContainer.children;
}
var url = exports.findLinkMatch(node.data, lenient); lenient = (typeof lenient == "boolean") ? lenient : true;
if (!url) { for (var i=0; i<rows.length; i++) {
continue; var line = rows[i];
}
var startsWithProtocol = new RegExp('^' + protocolClause), urlHasProtocol = url.match(startsWithProtocol), href = (urlHasProtocol) ? url : 'http://' + url, link = '<a href="' + href + '" ' + target + '>' + url + '</a>', newHTML = nodeHTML.replace(url, link); exports.linkifyTerminalLine(terminal, line, lenient, target);
line.innerHTML = line.innerHTML.replace(nodeHTML, newHTML); }
}
/**
* This event gets emitted when conversion of all URL susbtrings
* to HTML anchor elements (links) has finished, for a specific
* line of the current Xterm instance.
*
* @event linkify:line
*/
terminal.emit('linkify:line', line);
};
/** /**
* Finds a link within a block of text. * This event gets emitted when conversion of all URL substrings to
* HTML anchor elements (links) has finished for the current Xterm
* instance's view.
* *
* @param {string} text - The text to search . * @event linkify
* @param {boolean} lenient - Whether to use the lenient search.
* @return {string} A URL.
*/ */
exports.findLinkMatch = function (text, lenient) { terminal.emit('linkify');
var match = text.match(lenient ? lenientUrlRegex : strictUrlRegex); };
if (!match || match.length === 0) {
return null; /**
} * Extend Xterm prototype.
return match[1]; */
};
/** /**
* Converts all valid URLs found in the terminal view into hyperlinks. * Converts all valid URLs found in the current terminal linte into
* * hyperlinks.
* @param {Xterm} terminal - The terminal that should get "linkified". *
* @param {boolean} lenient - The regex type that will be used to identify links. If lenient is * @memberof Xterm
* false, the regex requires a protocol clause. Defaults to true. * @param {number|HTMLDivElement} line - The terminal line that should get
* @param {string} target - Sets target="" attribute with value provided to links. * "linkified".
* Default doesn't set target attribute * @param {boolean} lenient - The regex type that will be used to identify links. If lenient is
* @emits linkify * false, the regex requires a protocol clause. Defaults to true.
* @emits linkify:line * @param {string} target - Sets target="" attribute with value provided to links.
*/ * Default doesn't set target attribute
exports.linkify = function (terminal, lenient, target) { */
var rows = terminal.rowContainer.children; Xterm.prototype.linkifyTerminalLine = function (line, lenient, target) {
lenient = (typeof lenient == "boolean") ? lenient : true; return exports.linkifyTerminalLine(this, line, lenient, target);
for (var i = 0; i < rows.length; i++) { };
var line = rows[i];
exports.linkifyTerminalLine(terminal, line, lenient, target); /**
} * Converts all valid URLs found in the current terminal into hyperlinks.
/** *
* This event gets emitted when conversion of all URL substrings to * @memberof Xterm
* HTML anchor elements (links) has finished for the current Xterm * @param {boolean} lenient - The regex type that will be used to identify links. If lenient is
* instance's view. * false, the regex requires a protocol clause. Defaults to true.
* * @param {string} target - Sets target="" attribute with value provided to links.
* @event linkify * Default doesn't set target attribute
*/ */
terminal.emit('linkify'); Xterm.prototype.linkify = function (lenient, target) {
}; return exports.linkify(this, lenient, target);
/** };
* Extend Xterm prototype.
*/ return exports;
/**
* Converts all valid URLs found in the current terminal linte into
* hyperlinks.
*
* @memberof Xterm
* @param {number|HTMLDivElement} line - The terminal line that should get
* "linkified".
* @param {boolean} lenient - The regex type that will be used to identify links. If lenient is
* false, the regex requires a protocol clause. Defaults to true.
* @param {string} target - Sets target="" attribute with value provided to links.
* Default doesn't set target attribute
*/
Xterm.prototype.linkifyTerminalLine = function (line, lenient, target) {
return exports.linkifyTerminalLine(this, line, lenient, target);
};
/**
* Converts all valid URLs found in the current terminal into hyperlinks.
*
* @memberof Xterm
* @param {boolean} lenient - The regex type that will be used to identify links. If lenient is
* false, the regex requires a protocol clause. Defaults to true.
* @param {string} target - Sets target="" attribute with value provided to links.
* Default doesn't set target attribute
*/
Xterm.prototype.linkify = function (lenient, target) {
return exports.linkify(this, lenient, target);
};
return exports;
}); });
//# sourceMappingURL=linkify.js.map

View File

@ -4,119 +4,132 @@
* @module xterm/addons/terminado/terminado * @module xterm/addons/terminado/terminado
* @license MIT * @license MIT
*/ */
(function (attach) { (function (attach) {
if (typeof exports === 'object' && typeof module === 'object') { if (typeof exports === 'object' && typeof module === 'object') {
/* /*
* CommonJS environment * CommonJS environment
*/ */
module.exports = attach(require('../../xterm')); module.exports = attach(require('../../xterm'));
} } else if (typeof define == 'function') {
else if (typeof define == 'function') { /*
/* * Require.js is available
* Require.js is available */
*/ define(['../../xterm'], attach);
define(['../../xterm'], attach); } else {
} /*
else { * Plain browser environment
/* */
* Plain browser environment attach(window.Terminal);
*/ }
attach(window.Terminal);
}
})(function (Xterm) { })(function (Xterm) {
'use strict'; 'use strict';
var exports = {};
/** var exports = {};
* Attaches the given terminal to the given socket.
* /**
* @param {Xterm} term - The terminal to be attached to the given socket. * Attaches the given terminal to the given socket.
* @param {WebSocket} socket - The socket to attach the current terminal. *
* @param {boolean} bidirectional - Whether the terminal should send data * @param {Xterm} term - The terminal to be attached to the given socket.
* to the socket as well. * @param {WebSocket} socket - The socket to attach the current terminal.
* @param {boolean} buffered - Whether the rendering of incoming data * @param {boolean} bidirectional - Whether the terminal should send data
* should happen instantly or at a maximum * to the socket as well.
* frequency of 1 rendering per 10ms. * @param {boolean} buffered - Whether the rendering of incoming data
*/ * should happen instantly or at a maximum
exports.terminadoAttach = function (term, socket, bidirectional, buffered) { * frequency of 1 rendering per 10ms.
bidirectional = (typeof bidirectional == 'undefined') ? true : bidirectional; */
term.socket = socket; exports.terminadoAttach = function (term, socket, bidirectional, buffered) {
term._flushBuffer = function () { bidirectional = (typeof bidirectional == 'undefined') ? true : bidirectional;
term.write(term._attachSocketBuffer); term.socket = socket;
term._attachSocketBuffer = null;
clearTimeout(term._attachSocketBufferTimer); term._flushBuffer = function () {
term._attachSocketBufferTimer = null; term.write(term._attachSocketBuffer);
}; term._attachSocketBuffer = null;
term._pushToBuffer = function (data) { clearTimeout(term._attachSocketBufferTimer);
if (term._attachSocketBuffer) { term._attachSocketBufferTimer = null;
term._attachSocketBuffer += data; };
}
else { term._pushToBuffer = function (data) {
term._attachSocketBuffer = data; if (term._attachSocketBuffer) {
setTimeout(term._flushBuffer, 10); term._attachSocketBuffer += data;
} } else {
}; term._attachSocketBuffer = data;
term._getMessage = function (ev) { setTimeout(term._flushBuffer, 10);
var data = JSON.parse(ev.data); }
if (data[0] == "stdout") { };
if (buffered) {
term._pushToBuffer(data[1]); term._getMessage = function (ev) {
} var data = JSON.parse(ev.data)
else { if( data[0] == "stdout" ) {
term.write(data[1]); if (buffered) {
} term._pushToBuffer(data[1]);
} } else {
}; term.write(data[1]);
term._sendData = function (data) {
socket.send(JSON.stringify(['stdin', data]));
};
term._setSize = function (size) {
socket.send(JSON.stringify(['set_size', size.rows, size.cols]));
};
socket.addEventListener('message', term._getMessage);
if (bidirectional) {
term.on('data', term._sendData);
} }
term.on('resize', term._setSize); }
socket.addEventListener('close', term.terminadoDetach.bind(term, socket));
socket.addEventListener('error', term.terminadoDetach.bind(term, socket));
}; };
/**
* Detaches the given terminal from the given socket term._sendData = function (data) {
* socket.send(JSON.stringify(['stdin', data]));
* @param {Xterm} term - The terminal to be detached from the given socket.
* @param {WebSocket} socket - The socket from which to detach the current
* terminal.
*/
exports.terminadoDetach = function (term, socket) {
term.off('data', term._sendData);
socket = (typeof socket == 'undefined') ? term.socket : socket;
if (socket) {
socket.removeEventListener('message', term._getMessage);
}
delete term.socket;
}; };
/**
* Attaches the current terminal to the given socket term._setSize = function (size) {
* socket.send(JSON.stringify(['set_size', size.rows, size.cols]));
* @param {WebSocket} socket - The socket to attach the current terminal.
* @param {boolean} bidirectional - Whether the terminal should send data
* to the socket as well.
* @param {boolean} buffered - Whether the rendering of incoming data
* should happen instantly or at a maximum
* frequency of 1 rendering per 10ms.
*/
Xterm.prototype.terminadoAttach = function (socket, bidirectional, buffered) {
return exports.terminadoAttach(this, socket, bidirectional, buffered);
}; };
/**
* Detaches the current terminal from the given socket. socket.addEventListener('message', term._getMessage);
*
* @param {WebSocket} socket - The socket from which to detach the current if (bidirectional) {
* terminal. term.on('data', term._sendData);
*/ }
Xterm.prototype.terminadoDetach = function (socket) { term.on('resize', term._setSize);
return exports.terminadoDetach(this, socket);
}; socket.addEventListener('close', term.terminadoDetach.bind(term, socket));
return exports; socket.addEventListener('error', term.terminadoDetach.bind(term, socket));
};
/**
* Detaches the given terminal from the given socket
*
* @param {Xterm} term - The terminal to be detached from the given socket.
* @param {WebSocket} socket - The socket from which to detach the current
* terminal.
*/
exports.terminadoDetach = function (term, socket) {
term.off('data', term._sendData);
socket = (typeof socket == 'undefined') ? term.socket : socket;
if (socket) {
socket.removeEventListener('message', term._getMessage);
}
delete term.socket;
};
/**
* Attaches the current terminal to the given socket
*
* @param {WebSocket} socket - The socket to attach the current terminal.
* @param {boolean} bidirectional - Whether the terminal should send data
* to the socket as well.
* @param {boolean} buffered - Whether the rendering of incoming data
* should happen instantly or at a maximum
* frequency of 1 rendering per 10ms.
*/
Xterm.prototype.terminadoAttach = function (socket, bidirectional, buffered) {
return exports.terminadoAttach(this, socket, bidirectional, buffered);
};
/**
* Detaches the current terminal from the given socket.
*
* @param {WebSocket} socket - The socket from which to detach the current
* terminal.
*/
Xterm.prototype.terminadoDetach = function (socket) {
return exports.terminadoDetach(this, socket);
};
return exports;
}); });
//# sourceMappingURL=terminado.js.map

44
dist/xterm.css vendored
View File

@ -71,7 +71,7 @@
resize: none; resize: none;
} }
.terminal .terminal-cursor { .terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
background-color: #fff; background-color: #fff;
color: #000; color: #000;
} }
@ -82,11 +82,11 @@
background-color: transparent; background-color: transparent;
} }
.terminal.focus .terminal-cursor.blinking { .terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar).focus.xterm-cursor-blink .terminal-cursor {
animation: blink-cursor 1.2s infinite step-end; animation: xterm-cursor-blink 1.2s infinite step-end;
} }
@keyframes blink-cursor { @keyframes xterm-cursor-blink {
0% { 0% {
background-color: #fff; background-color: #fff;
color: #000; color: #000;
@ -97,6 +97,38 @@
} }
} }
.terminal.xterm-cursor-style-bar .terminal-cursor,
.terminal.xterm-cursor-style-underline .terminal-cursor {
position: relative;
}
.terminal.xterm-cursor-style-bar .terminal-cursor::before,
.terminal.xterm-cursor-style-underline .terminal-cursor::before {
content: "";
display: block;
position: absolute;
background-color: #fff;
}
.terminal.xterm-cursor-style-bar .terminal-cursor::before {
top: 0;
bottom: 0;
left: 0;
width: 1px;
}
.terminal.xterm-cursor-style-underline .terminal-cursor::before {
bottom: 0;
left: 0;
right: 0;
height: 1px;
}
.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink .terminal-cursor::before,
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink .terminal-cursor::before {
animation: xterm-cursor-non-bar-blink 1.2s infinite step-end;
}
@keyframes xterm-cursor-non-bar-blink {
0% { background-color: #fff; }
50% { background-color: transparent; }
}
.terminal .composition-view { .terminal .composition-view {
background: #000; background: #000;
color: #FFF; color: #FFF;
@ -116,6 +148,10 @@
overflow-y: scroll; overflow-y: scroll;
} }
.terminal .xterm-wide-char {
display: inline-block;
}
.terminal .xterm-rows { .terminal .xterm-rows {
position: absolute; position: absolute;
left: 0; left: 0;

8786
dist/xterm.js vendored

File diff suppressed because it is too large Load Diff

2
dist/xterm.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,7 @@
{ {
"name": "xterm", "name": "xterm",
"description": "Full xterm terminal, in your browser", "description": "Full xterm terminal, in your browser",
"version": "2.2.3", "version": "2.3.0",
"ignore": [ "ignore": [
"demo", "demo",
"test", "test",