kopia lustrzana https://github.com/c9/core
Merge pull request +9349 from c9/update-salesforce
Trivial salesforce-related updatespull/152/head
commit
4797dbb6b8
|
@ -55,7 +55,7 @@
|
||||||
"c9"
|
"c9"
|
||||||
],
|
],
|
||||||
"c9plugins": {
|
"c9plugins": {
|
||||||
"c9.ide.language": "#00dd412ebd",
|
"c9.ide.language": "#3c703d6784",
|
||||||
"c9.ide.language.css": "#a649f2a710",
|
"c9.ide.language.css": "#a649f2a710",
|
||||||
"c9.ide.language.generic": "#77d43cfaf0",
|
"c9.ide.language.generic": "#77d43cfaf0",
|
||||||
"c9.ide.language.html": "#0f4078c187",
|
"c9.ide.language.html": "#0f4078c187",
|
||||||
|
|
|
@ -37,8 +37,8 @@ define(function(require, module, exports) {
|
||||||
var metadata = options.metadata;
|
var metadata = options.metadata;
|
||||||
|
|
||||||
plugin.title = title;
|
plugin.title = title;
|
||||||
plugin.heading = util.escapeXml(header);
|
plugin.heading = options && options.isHTML ? header : util.escapeXml(header);
|
||||||
plugin.body = util.escapeXml(msg).replace(/\n/g, "<br />");
|
plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace(/\n/g, "<br>");
|
||||||
|
|
||||||
plugin.allowClose = cancel;
|
plugin.allowClose = cancel;
|
||||||
|
|
||||||
|
|
|
@ -493,8 +493,8 @@ define(function(require, exports, module) {
|
||||||
predictStartY = session.terminal.y + session.terminal.ybase;
|
predictStartY = session.terminal.y + session.terminal.ybase;
|
||||||
state = STATE_PREDICT;
|
state = STATE_PREDICT;
|
||||||
if (!checkTextBeforePrediction()) {
|
if (!checkTextBeforePrediction()) {
|
||||||
errorHandler.reportError(new Error("Warning: unable to init predictions"));
|
// Appears to happen when tmux or shell unexpectedly sends a new line
|
||||||
if (DEBUG) debugger;
|
console.warn("Unable to init predictions");
|
||||||
state = STATE_WAIT_FOR_ECHO;
|
state = STATE_WAIT_FOR_ECHO;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Ładowanie…
Reference in New Issue