mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge remote-tracking branch 'origin/master' into remove-npm-updater

pull/149/head
Fabian Jakobs 2015-09-08 09:39:01 +00:00
rodzic 7ff9f4ee65 1dfea34803
commit e43faf077a
5 zmienionych plików z 20 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
configs/client-default.js
Wyświetl plik

@ -382,7 +382,7 @@ module.exports = function(options) {
"plugins/c9.ide.immediate/evaluator",
"plugins/c9.ide.immediate/evaluators/browserjs",
"plugins/c9.ide.immediate/evaluators/debugnode",
"plugins/c9.ide.immediate/evaluators/bash",
// "plugins/c9.ide.immediate/evaluators/bash",
"plugins/c9.ide.run.debug/variables",
"plugins/c9.ide.run.debug/watches",
"plugins/c9.ide.run.debug/liveinspect",

18
package.json
Wyświetl plik

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.0.2610",
"version": "3.0.2621",
"author": "Ajax.org B.V. <info@ajax.org>",
"private": true,
"main": "bin/c9",
@ -65,8 +65,8 @@
"c9.ide.language.javascript.eslint": "#df7e424b54",
"c9.ide.language.javascript.tern": "#ad1d9b1b3a",
"c9.ide.language.javascript.infer": "#8478e3c702",
"c9.ide.language.jsonalyzer": "#875571f514",
"c9.ide.collab": "#3156c58f37",
"c9.ide.language.jsonalyzer": "#83646961c7",
"c9.ide.collab": "#56c59702c7",
"c9.ide.local": "#a9703b630c",
"c9.ide.find": "#35379124ca",
"c9.ide.find.infiles": "#c132ad243c",
@ -76,7 +76,7 @@
"c9.ide.ace.emmet": "#6dc4585e02",
"c9.ide.ace.gotoline": "#a8ff07c8f4",
"c9.ide.ace.keymaps": "#bf6d36213f",
"c9.ide.ace.repl": "#723e1d80a2",
"c9.ide.ace.repl": "#441348094e",
"c9.ide.ace.split": "#0ae0151c78",
"c9.ide.ace.statusbar": "#d95be89d53",
"c9.ide.ace.stripws": "#cf0f42ac59",
@ -88,11 +88,11 @@
"c9.ide.format": "#b0bb91a623",
"c9.ide.help.support": "#e95f98f87c",
"c9.ide.imgeditor": "#66a9733dc1",
"c9.ide.immediate": "#2f0e96fa2b",
"c9.ide.immediate": "#2ef20acbcc",
"c9.ide.installer": "#0fde9f0067",
"c9.ide.mount": "#292b312b4b",
"c9.ide.navigate": "#c191d9b92f",
"c9.ide.newresource": "#f1f0624768",
"c9.ide.newresource": "#981a408a7b",
"c9.ide.openfiles": "#7fa4a97fed",
"c9.ide.preview": "#c530a7978d",
"c9.ide.preview.browser": "#c50007ebbc",
@ -102,10 +102,10 @@
"c9.ide.recentfiles": "#7c099abf40",
"c9.ide.remote": "#301d2ab519",
"c9.ide.processlist": "#bc11818bb5",
"c9.ide.run": "#1ce4f82ea2",
"c9.ide.run.build": "#4de6a0b9a4",
"c9.ide.run": "#c53178c339",
"c9.ide.run.build": "#0598fff697",
"c9.ide.run.debug.xdebug": "#61dcbd0180",
"c9.ide.save": "#326087f5a2",
"c9.ide.save": "#572967ef59",
"c9.ide.scm": "#f3847917b8",
"c9.ide.terminal.monitor": "#b52a3f2144",
"c9.ide.theme.flat": "#2de8414db7",

2
plugins/c9.ide.dialog.common/alert_internal.js
Wyświetl plik

@ -37,7 +37,7 @@ define(function(require, module, exports) {
else {
plugin.title = title;
}
plugin.heading = util.escapeXml(header);
plugin.heading = options && options.isHTML ? header : util.escapeXml(header);
plugin.body = options && options.isHTML ? msg : (util.escapeXml(msg) || "")
.replace(/\n/g, "<br />")
.replace(/(https?:\/\/[^\s]*\b)/g, "<a href='$1' target='_blank'>$1</a>");

6
plugins/c9.ide.dialog.common/confirm.js
Wyświetl plik

@ -21,11 +21,11 @@ define(function(require, module, exports) {
/***** Methods *****/
function show(title, header, msg, onconfirm, oncancel) {
function show(title, header, msg, onconfirm, oncancel, options) {
return plugin.queue(function(){
plugin.title = title;
plugin.heading = util.escapeXml(header);
plugin.body = util.escapeXml(msg);
plugin.heading = options && options.isHTML ? header : util.escapeXml(header);
plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace(/\n/g, "<br>");
plugin.update([
{ id: "ok", onclick: function(){ plugin.hide(); onconfirm(); } },

8
plugins/c9.ide.ui/forms.js
Wyświetl plik

@ -477,8 +477,12 @@ define(function(require, exports, module) {
container.parentNode = htmlNode;
htmlNode = htmlNode.$int;
}
htmlNode.insertBefore(container.$ext, beforeNode || null);
// if we have apf node, make sure apf child-parent links do not get broken
if (htmlNode.host && container.host) {
htmlNode.host.insertBefore(container.host, beforeNode && beforeNode.host);
} else {
htmlNode.insertBefore(container.$ext, beforeNode || null);
}
show();
}