kopia lustrzana https://github.com/c9/core
Merge pull request +11812 from c9/fix/various
Fix terminal monitor issues for googlepull/248/head
commit
d24552a3cc
|
@ -89,9 +89,9 @@ var DataProvider = function(root) {
|
|||
var childNode = ch[j];
|
||||
if (this.isOpen(childNode)) {
|
||||
this.setOpen(childNode, false);
|
||||
this.open(childNode, deep - 1);
|
||||
this.open(childNode, deep - 1, silent);
|
||||
} else if (deep > 0) {
|
||||
this.open(childNode, deep - 1);
|
||||
this.open(childNode, deep - 1, silent);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -97,8 +97,8 @@
|
|||
"c9.ide.navigate": "#1fbb7cd53b",
|
||||
"c9.ide.newresource": "#981a408a7b",
|
||||
"c9.ide.openfiles": "#2ae85a9e33",
|
||||
"c9.ide.preview": "#8f87ff2f6a",
|
||||
"c9.ide.preview.browser": "#c5b9a129de",
|
||||
"c9.ide.preview": "#2acbe41e62",
|
||||
"c9.ide.preview.browser": "#04760484d1",
|
||||
"c9.ide.preview.markdown": "#bc846e1562",
|
||||
"c9.ide.pubsub": "#a85fb27eca",
|
||||
"c9.ide.readonly": "#e67bb593bd",
|
||||
|
@ -110,7 +110,7 @@
|
|||
"c9.ide.run.debug.xdebug": "#a1b39e0ac4",
|
||||
"c9.ide.save": "#f8aaf93ea1",
|
||||
"c9.ide.scm": "#ca3c94b84f",
|
||||
"c9.ide.terminal.monitor": "#a0d1f02991",
|
||||
"c9.ide.terminal.monitor": "#1ccac33b0d",
|
||||
"c9.ide.test": "#a282ec1619",
|
||||
"c9.ide.test.mocha": "#fc053b23d2",
|
||||
"c9.ide.theme.flat": "#81dadeee55",
|
||||
|
|
|
@ -574,7 +574,10 @@ define(function(require, exports, module) {
|
|||
node.contenttype = stat.mime || util.getContentType(name);
|
||||
node.status = "loaded";
|
||||
}
|
||||
|
||||
if (typeof stat.mtime !== "number" && stat.mtime) {
|
||||
// TODO fix localfs to not send date objects here
|
||||
stat.mtime = +stat.mtime;
|
||||
}
|
||||
if (stat.size != undefined)
|
||||
node.size = stat.size;
|
||||
if (stat.mtime != undefined)
|
||||
|
@ -594,14 +597,6 @@ define(function(require, exports, module) {
|
|||
|
||||
node.children = null;
|
||||
|
||||
if (typeof node.mtime !== "number" && node.mtime) {
|
||||
// why Date ends up here?
|
||||
reportError(new Error("Date in fs cache"), {
|
||||
stat: stat,
|
||||
mtime: node.mtime,
|
||||
path: node.path
|
||||
});
|
||||
}
|
||||
if (!updating) {
|
||||
if (!modified.length)
|
||||
modified.push(parent);
|
||||
|
|
|
@ -321,6 +321,7 @@ define(function(require, exports, module) {
|
|||
},
|
||||
commands.openpreferences,
|
||||
commands.passKeysToBrowser,
|
||||
commands.commands,
|
||||
commands.find,
|
||||
commands.openterminal,
|
||||
commands.navigate,
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
define(function(require, exports, module) {
|
||||
var isWindows = require("ace/lib/useragent").isWindows;
|
||||
module.exports = function initInput(ace) {
|
||||
// use showkey --ascii to test
|
||||
var HashHandler = require("ace/keyboard/hash_handler").HashHandler;
|
||||
var KEY_MODS = require("ace/lib/keys").KEY_MODS;
|
||||
var TERM_MODS = {
|
||||
|
@ -98,7 +99,7 @@ define(function(require, exports, module) {
|
|||
if (isControl) {
|
||||
if (keyCode >= 65 && keyCode <= 90) {
|
||||
key = String.fromCharCode(keyCode - 64);
|
||||
} else if (keyCode === 32) {
|
||||
} else if (keyCode === 32 || keyCode == 192) {
|
||||
// NUL
|
||||
key = String.fromCharCode(0);
|
||||
} else if (keyCode >= 51 && keyCode <= 55) {
|
||||
|
@ -116,6 +117,9 @@ define(function(require, exports, module) {
|
|||
} else if (keyCode === 189 || keyCode === 173) {
|
||||
// _
|
||||
key = String.fromCharCode(31);
|
||||
} else if (keyCode === 220) {
|
||||
// SIGQUIT
|
||||
key = String.fromCharCode(28);
|
||||
}
|
||||
} else if (isMeta) {
|
||||
if (keyCode >= 65 && keyCode <= 90) {
|
||||
|
|
|
@ -301,8 +301,10 @@ Terminal.prototype.scroll = function() {//TODO optimize lines
|
|||
var row;
|
||||
|
||||
if (++this.ybase === Terminal.scrollback) {
|
||||
this.ybase = this.ybase / 2 | 0;
|
||||
this.lines = this.lines.slice(-(this.ybase + this.rows) + 1);
|
||||
var lineCount = this.ybase / 2 | 0;
|
||||
this.emit("discardOldScrollback", lineCount);
|
||||
this.ybase -= lineCount;
|
||||
this.lines = this.lines.slice(lineCount);
|
||||
}
|
||||
|
||||
this.ydisp = this.ybase;
|
||||
|
|
Ładowanie…
Reference in New Issue