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 user-domain 

Conflicts:
	Makefile
	npm-shrinkwrap.json
pull/223/head
Fabian Jakobs 2015-10-13 13:48:58 +00:00
rodzic 95012eb90a 3f6a2d66cd
commit 88c9baaf62
9 zmienionych plików z 61 dodań i 45 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
node_modules/architect-build/build_support/mini_require.js wygenerowano vendored
Wyświetl plik

@ -299,8 +299,17 @@ require.undef = function(module, recursive) {
function undefAll(module, hash) {
Object.keys(hash).forEach(function(key) {
var i = key.indexOf("!") + 1;
if (key.lastIndexOf(module, 0) == 0)
require.undef(key);
if (i) {
var plugin = key.slice(0, i - 1);
var resource = key.slice(i);
if (resource.lastIndexOf(module, 0) == 0 || plugin.lastIndexOf(module, 0) == 0) {
require.undef(key);
require.undef(resource);
}
}
});
}

8
package.json
Wyświetl plik

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.0.2867",
"version": "3.1.8",
"author": "Ajax.org B.V. <info@ajax.org>",
"private": true,
"main": "bin/c9",
@ -65,7 +65,7 @@
"c9.ide.language.javascript.eslint": "#df7e424b54",
"c9.ide.language.javascript.tern": "#40cf04bded",
"c9.ide.language.javascript.infer": "#8478e3c702",
"c9.ide.language.jsonalyzer": "#d44cb13695",
"c9.ide.language.jsonalyzer": "#8401c240b3",
"c9.ide.collab": "#a8e597ae5e",
"c9.ide.local": "#a6e689e33b",
"c9.ide.find": "#35379124ca",
@ -75,14 +75,14 @@
"c9.automate": "#47e2c429c9",
"c9.ide.ace.emmet": "#6dc4585e02",
"c9.ide.ace.gotoline": "#a8ff07c8f4",
"c9.ide.ace.keymaps": "#bf6d36213f",
"c9.ide.ace.keymaps": "#2e3c6e3c8f",
"c9.ide.ace.repl": "#7989bbd07f",
"c9.ide.ace.split": "#0ae0151c78",
"c9.ide.ace.statusbar": "#d95be89d53",
"c9.ide.ace.stripws": "#cf0f42ac59",
"c9.ide.behaviors": "#e2c7f68242",
"c9.ide.closeconfirmation": "#cee4674141",
"c9.ide.configuration": "#382b61f4ab",
"c9.ide.configuration": "#a9066299a2",
"c9.ide.dialog.wizard": "#7667ec79a8",
"c9.ide.fontawesome": "#781602c5d8",
"c9.ide.format": "#b0bb91a623",

16
plugins/c9.cli.publish/publish.js
Wyświetl plik

@ -267,19 +267,21 @@ define(function(require, exports, module) {
if (!json.categories || json.categories.length == 0)
return callback(new Error("ERROR: At least one category is required in package.json"));
var description = json.description;
if (description)
console.warn("WARNING: Description property in package.json will be ignored. README.md will be used.");
// Validate README.md
if (!fs.existsSync(join(cwd, "README.md"))) {
if (fs.existsSync(join(cwd, "README.md"))) {
description = fs.readFileSync(join(cwd, "README.md"), "utf8")
.replace(/^\#.*\n*/, "");
} else {
console.warn("WARNING: README.md is missing.");
if (!force)
return callback(new Error("Use --force to ignore these warnings."));
}
if (json.description)
console.warn("WARNING: Description property in package.json will be ignored. README.md will be used.");
var description = fs.readFileSync(join(cwd, "README.md"), "utf8")
.replace(/^\#.*\n*/, "");
// Validate plugins
var plugins = {};

55
plugins/c9.fs/fs.cache.xml.js
Wyświetl plik

@ -292,29 +292,33 @@ define(function(require, exports, module) {
// Validation
var toNode = findNode(newPath);
if (parent) { // Dir is in cache
deleteNode(node, true);
if (toNode)
deleteNode(toNode, true);
createNode(newPath, null, node); // Move node
recurPathUpdate(node, oldPath, newPath);
e.undo = function(){
if (!parent) {
var tmpParent = node;
while (node.parent && tmpParent.parent.status == "pending")
tmpParent = tmpParent.parent;
if (tmpParent)
deleteNode(tmpParent, true);
}
deleteNode(node, true);
if (toNode)
deleteNode(toNode);
createNode(newPath, null, toNode);
createNode(newPath, null, node); // Move node
recurPathUpdate(node, oldPath, newPath);
e.undo = function(){
createNode(oldPath, null, node);
recurPathUpdate(node, newPath, oldPath);
if (toNode)
createNode(newPath, null, toNode);
};
e.confirm = function() {
if (node.status === "predicted")
node.status = "loaded";
};
node.status = "predicted";
}
else {
removeSingleNode(e);
}
createNode(oldPath, null, node);
recurPathUpdate(node, newPath, oldPath);
};
e.confirm = function() {
if (node.status === "predicted")
node.status = "loaded";
};
node.status = "predicted";
}, plugin);
fs.on("afterRename", afterHandler, plugin);
@ -553,10 +557,6 @@ define(function(require, exports, module) {
node.status = "loaded";
}
if (isFolder && !node.map)
node.map = {};
else if (!isFolder && node.map)
delete node.map;
if (stat.size != undefined)
node.size = stat.size;
if (stat.mtime != undefined)
@ -566,6 +566,11 @@ define(function(require, exports, module) {
node.isFolder = isFolder;
}
if (node.isFolder && !node.map)
node.map = {};
else if (!node.isFolder && node.map)
delete node.map;
node.children = null;
if (!updating) {

4
plugins/c9.ide.ace/ace.js
Wyświetl plik

@ -618,8 +618,8 @@ define(function(require, exports, module) {
return isAvailable ? isAvailable(editor.ace) : true;
};
command.findEditor = function(editor) {
if (apf.activeElement && apf.activeElement.ace && apf.activeElement.ace.isFocused())
command.findEditor = function(editor, e) {
if (e && apf.activeElement && apf.activeElement.ace && apf.activeElement.ace.isFocused())
return apf.activeElement.ace;
return editor && editor.ace || editor;
};

2
plugins/c9.ide.help/help.xml
Wyświetl plik

@ -23,7 +23,7 @@
<p textselect="true">
Arron Bailiss, Bas de Wachter, Dana Ivan, Fabian Jakobs, Harutyun Amirjanyan,
Ivar Pruijn, Justin Dray, Lennart Kats, Luca Cipriani,
Mostafa Eweda, Matthijs van Henten, Nikolai Onken, Tim Robinson, Ruben Daniels
Mostafa Eweda, Matthijs van Henten, Nikolai Onken, Suraj Biyani, Tim Robinson, Ruben Daniels
</p>
</div>
<div class="c9Copyright">

4
plugins/c9.ide.keys/commands.js
Wyświetl plik

@ -127,10 +127,10 @@ define(function(require, exports, module) {
}
if (command.isAvailable && !command.isAvailable(editor, args, e))
return; //Disable commands for other contexts
return; // Disable commands for other contexts
if (command.findEditor)
editor = command.findEditor(editor);
editor = command.findEditor(editor, e);
if (editor && editor.$readOnly && !command.readOnly)
return false;

6
settings/local.js
Wyświetl plik

@ -47,9 +47,9 @@ module.exports = function(manifest, installPath, settingDir) {
// config.update.port = "8888"
// config.update.host = "http"
config.nodeBin = [process.platform == "win32"
? path.join(process.execPath, "..\\node.exe")
: path.join(installPath, "node/bin/node")];
// config.nodeBin = [process.platform == "win32"
// ? path.join(process.execPath, "..\\node.exe")
// : path.join(installPath, "node/bin/node")];
config.bashBin = process.platform == "win32"
? process.env.C9_BASH_BIN || "C:\\cygwin\\bin\\bash.exe"
: "/bin/bash";