kopia lustrzana https://github.com/c9/core
better fix for predict_echo test
rodzic
f4bf550bf6
commit
469dd34bdf
|
@ -1611,7 +1611,7 @@ module.exports = function setup(fsOptions) {
|
||||||
if (options.capturePane) {
|
if (options.capturePane) {
|
||||||
options = options.capturePane;
|
options = options.capturePane;
|
||||||
args = [
|
args = [
|
||||||
"-C",
|
// "-C",
|
||||||
"-u2", // force utf and 256 color
|
"-u2", // force utf and 256 color
|
||||||
"-L", tmuxName,
|
"-L", tmuxName,
|
||||||
"capture-pane", options.joinLines !== false ? "-peJ" : "-pe",
|
"capture-pane", options.joinLines !== false ? "-peJ" : "-pe",
|
||||||
|
|
|
@ -134,9 +134,7 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root", "ace/test/asse
|
||||||
session = editor.ace.getSession().c9session;
|
session = editor.ace.getSession().c9session;
|
||||||
send = session.send;
|
send = session.send;
|
||||||
|
|
||||||
if (peek(-2) === "$") // maybe there already was a prompt
|
setTimeout(init);
|
||||||
return init();
|
|
||||||
afterPrompt(function() { setTimeout(init); });
|
|
||||||
|
|
||||||
function init() {
|
function init() {
|
||||||
afterPrompt(function() { setTimeout(start); });
|
afterPrompt(function() { setTimeout(start); });
|
||||||
|
|
|
@ -668,6 +668,7 @@ define(function(require, exports, module) {
|
||||||
var queue = "";
|
var queue = "";
|
||||||
var warned = false;
|
var warned = false;
|
||||||
var timer = null;
|
var timer = null;
|
||||||
|
var initialConnect = true;
|
||||||
|
|
||||||
function send(data) {
|
function send(data) {
|
||||||
if (!(c9.status & c9.NETWORK))
|
if (!(c9.status & c9.NETWORK))
|
||||||
|
@ -680,7 +681,7 @@ define(function(require, exports, module) {
|
||||||
timer = setTimeout(function() {
|
timer = setTimeout(function() {
|
||||||
timer = null;
|
timer = null;
|
||||||
if (!session.connected)
|
if (!session.connected)
|
||||||
return warnConnection();
|
return initialConnect || warnConnection();
|
||||||
// Send data to stdin of tmux process
|
// Send data to stdin of tmux process
|
||||||
session.pty.write(queue);
|
session.pty.write(queue);
|
||||||
queue = "";
|
queue = "";
|
||||||
|
@ -746,6 +747,11 @@ define(function(require, exports, module) {
|
||||||
tab: session.tab
|
tab: session.tab
|
||||||
});
|
});
|
||||||
loadHistory(session);
|
loadHistory(session);
|
||||||
|
initialConnect = false;
|
||||||
|
if (queue) {
|
||||||
|
session.pty.write(queue);
|
||||||
|
queue = "";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Ładowanie…
Reference in New Issue