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

Merge branch 'master' of github.com:c9/newclient into merge-account-profile 

Conflicts:
	plugins/c9.ide.server/plugins.js
pull/85/head
Nikolai Onken 2015-03-24 16:37:38 +00:00
rodzic eee93a429e
commit 8d01ba39ef
28 zmienionych plików z 273 dodań i 183 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
.eslintrc
Wyświetl plik

@ -17,7 +17,7 @@ rules:
no-cond-assign: [1, "except-parens"] no-cond-assign: [1, "except-parens"]
no-debugger: 3 no-debugger: 3
no-dupe-keys: 3 no-dupe-keys: 3
no-eval: 2 no-eval: 3
no-func-assign: 1 no-func-assign: 1
no-invalid-regexp: 1 no-invalid-regexp: 1
no-irregular-whitespace: 3 no-irregular-whitespace: 3

1
.gitignore vendored
Wyświetl plik

@ -8,6 +8,7 @@ plugins/c9.ide.layout.classic/less/*.css
plugins/c9.vfs.standalone/www/less.html plugins/c9.vfs.standalone/www/less.html
plugins/c9.ide.run/todo plugins/c9.ide.run/todo
plugins/c9.vfs.standalone/www/charts plugins/c9.vfs.standalone/www/charts
plugins/c9.ide.language.javascript.tern/util/sigs_ts
scripts/build scripts/build
build/output build/output
build/standalone/ build/standalone/

2
README.md
Wyświetl plik

@ -1,5 +1,5 @@
Cloud9 3.0 SDK for Plugin Development Cloud9 3.0 SDK for Plugin Development
======================================= ======================================
This is the core repository for the Cloud9 v3 SDK. The SDK allows you to run a version of Cloud9 that allows you to develop plugins and create a custom IDE based on Cloud9. This is the core repository for the Cloud9 v3 SDK. The SDK allows you to run a version of Cloud9 that allows you to develop plugins and create a custom IDE based on Cloud9.

4
docs/CODING_STANDARDS.md
Wyświetl plik

@ -19,7 +19,7 @@ Base
Tabs vs Spaces Tabs vs Spaces
-------------- --------------
We use 4 spaces of indenteation. We use 4 spaces of indentation.
Line Termination Line Termination
---------------- ----------------
@ -100,7 +100,7 @@ Your opening braces go on the same line as the statement.
Also, notice the use of whitespace before and after the condition statement. Also, notice the use of whitespace before and after the condition statement.
Closing braces are always followed by a new line. This is releavant for `else`, `catch` and `finally`. Closing braces are always followed by a new line. This is relevant for `else`, `catch` and `finally`.
*Right*: *Right*:

1
node_modules/ace/lib/ace/virtual_renderer.js wygenerowano vendored
Wyświetl plik

@ -1038,6 +1038,7 @@ var VirtualRenderer = function(container, theme) {
}; };
this.$updateLines = function() { this.$updateLines = function() {
if (!this.$changedLines) return;
var firstRow = this.$changedLines.firstRow; var firstRow = this.$changedLines.firstRow;
var lastRow = this.$changedLines.lastRow; var lastRow = this.$changedLines.lastRow;
this.$changedLines = null; this.$changedLines = null;

6
node_modules/ace_tree/lib/ace_tree/mouse/default_handlers.js wygenerowano vendored
Wyświetl plik

@ -65,15 +65,15 @@ function DefaultHandlers(mouseHandler) {
var editor = this.editor; var editor = this.editor;
var node = e.getNode(); var node = e.getNode();
var title; var title, provider = editor.provider;
if (!node) { if (!node) {
title = ""; title = "";
} else if (editor.provider.columns) { } else if (provider.columns) {
var pos = e.getDocumentPosition(); var pos = e.getDocumentPosition();
var columnData = editor.renderer.$headingLayer.findColumn(pos.x); var columnData = editor.renderer.$headingLayer.findColumn(pos.x);
title = columnData ? columnData.column.getText(node) : ""; title = columnData ? columnData.column.getText(node) : "";
} else { } else {
title = editor.provider.getText(node); title = provider.getTooltipText ? provider.getTooltipText(node) : provider.getText(node);
} }
if (editor.container.title != title) if (editor.container.title != title)

4
node_modules/c9/inline-mocha.js wygenerowano vendored
Wyświetl plik

@ -1,10 +1,10 @@
module.exports = function(module, reporter) { module.exports = function(module, reporter, options) {
if (typeof module !== "undefined" && module === require.main) { if (typeof module !== "undefined" && module === require.main) {
if (typeof global.onload === "undefined") if (typeof global.onload === "undefined")
global.onload = undefined; global.onload = undefined;
var file = module.filename; var file = module.filename;
var Mocha = require("mocha"); var Mocha = require("mocha");
var mocha = new Mocha(); var mocha = new Mocha(options || {});
mocha.reporter(reporter || "spec"); mocha.reporter(reporter || "spec");
var suite = mocha.suite; var suite = mocha.suite;
suite.emit('pre-require', global, file, mocha); suite.emit('pre-require', global, file, mocha);

20
node_modules/vfs-local/localfs.js wygenerowano vendored
Wyświetl plik

@ -1380,23 +1380,21 @@ module.exports = function setup(fsOptions) {
}); });
callback(done); callback(done);
function loop(watchers, path, event, callback) { function done(callback) {
if (!watchers.length) if (!watchers.length)
return callback(); return callback();
// Notify each watcher of changes and reactivate it
var watcher = watchers.pop(); var watcher = watchers.pop();
watcher.handleWatchEvent(event, basename(path), true); fs.stat(path, function(err, stat) {
if (err || !stat) return;
stat.vfsWrite = true;
watcher.sendToAllListeners("change", basename(path), stat);
});
watcher.resume(function() { watcher.resume(function() {
loop(watchers, path, event, callback); done(callback);
}); });
} }
function done(callback) {
loop(watchers, path, "change", function() {
loop(dirWatchers, parentDir, "directory", callback);
});
}
} }
function connect(port, options, callback) { function connect(port, options, callback) {

12
package.json
Wyświetl plik

@ -36,7 +36,7 @@
"send": "~0.1.4", "send": "~0.1.4",
"simple-mime": "~0.0.8", "simple-mime": "~0.0.8",
"tern": "git://github.com/lennartcl/tern.git#97464df789dbb4d81ca4579383a02b320c69563d", "tern": "git://github.com/lennartcl/tern.git#97464df789dbb4d81ca4579383a02b320c69563d",
"tern_from_ts": "git://github.com/cloud9ide/tern_from_ts.git#b8b3d555e545aa41ed8d0df054ef38416a578faa", "tern_from_ts": "git://github.com/cloud9ide/tern_from_ts.git#6a0107e602b0d044fe1753533cf31f52cf5fb95a",
"through": "2.2.0", "through": "2.2.0",
"tmp": "~0.0.20", "tmp": "~0.0.20",
"uglify-js": "2.4.16", "uglify-js": "2.4.16",
@ -49,17 +49,17 @@
}, },
"licenses": [], "licenses": [],
"c9plugins": { "c9plugins": {
"c9.ide.language": "#4a23a36945", "c9.ide.language": "#de3c644b88",
"c9.ide.language.css": "#afda1f867c", "c9.ide.language.css": "#afda1f867c",
"c9.ide.language.generic": "#87a4a44671", "c9.ide.language.generic": "#87a4a44671",
"c9.ide.language.html": "#fa4833e117", "c9.ide.language.html": "#fa4833e117",
"c9.ide.language.html.diff": "#a7311cfc9f", "c9.ide.language.html.diff": "#a7311cfc9f",
"c9.ide.language.javascript": "#8479d0a9c1", "c9.ide.language.javascript": "#ec9ecf31cf",
"c9.ide.language.javascript.immediate": "#9a2cce9121", "c9.ide.language.javascript.immediate": "#9a2cce9121",
"c9.ide.language.javascript.eslint": "#8832423ad1", "c9.ide.language.javascript.eslint": "#8832423ad1",
"c9.ide.language.javascript.tern": "#7aab8b0b6a", "c9.ide.language.javascript.tern": "#7aab8b0b6a",
"c9.ide.language.javascript.infer": "#ebb2daf81a", "c9.ide.language.javascript.infer": "#ebb2daf81a",
"c9.ide.language.jsonalyzer": "#a1057f20db", "c9.ide.language.jsonalyzer": "#d82c60fcb9",
"c9.ide.collab": "#7b09419b5c", "c9.ide.collab": "#7b09419b5c",
"c9.ide.local": "#2bfd7ff051", "c9.ide.local": "#2bfd7ff051",
"c9.ide.find": "#989c06e6a7", "c9.ide.find": "#989c06e6a7",
@ -94,8 +94,8 @@
"c9.ide.pubsub": "#92ec19ed3a", "c9.ide.pubsub": "#92ec19ed3a",
"c9.ide.readonly": "#f6f07bbe42", "c9.ide.readonly": "#f6f07bbe42",
"c9.ide.recentfiles": "#7c099abf40", "c9.ide.recentfiles": "#7c099abf40",
"c9.ide.remote": "#cd45e81d2f", "c9.ide.remote": "#f531d62cfb",
"c9.ide.run": "#e510a39b4b", "c9.ide.run": "#3349df7c52",
"c9.ide.run.build": "#915e48b363", "c9.ide.run.build": "#915e48b363",
"c9.ide.run.debug.xdebug": "#b91d23f48b", "c9.ide.run.debug.xdebug": "#b91d23f48b",
"c9.ide.save": "#a32a8f4346", "c9.ide.save": "#a32a8f4346",

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

@ -289,14 +289,14 @@ define(function(require, exports, module) {
var newPath = e.args[1]; var newPath = e.args[1];
var parent = findNode(dirname(newPath)); var parent = findNode(dirname(newPath));
//Validation // Validation
var toNode = findNode(newPath); var toNode = findNode(newPath);
if (parent) { //Dir is in cache if (parent) { // Dir is in cache
if (toNode) if (toNode)
deleteNode(toNode); deleteNode(toNode);
createNode(newPath, null, node); // Move node createNode(newPath, null, node); // Move node
recurPathUpdate(node, oldPath, newPath); recurPathUpdate(node, oldPath, newPath);
e.undo = function(){ e.undo = function(){
@ -480,6 +480,11 @@ define(function(require, exports, module) {
} }
function createNode(path, stat, updateNode, updating) { function createNode(path, stat, updateNode, updating) {
if (!/^[!~/]/.test(path)) {
var e = new Error("Refusing to add a node with misformed path to fs.cache");
return reportError(e, { path: path });
}
if (orphans[path]) { if (orphans[path]) {
updateNode = orphans[path]; updateNode = orphans[path];
delete orphans[path]; delete orphans[path];

7
plugins/c9.fs/fs.js
Wyświetl plik

@ -62,6 +62,13 @@ define(function(require, exports, module) {
if (typeof args[args.length - 1] != "function") if (typeof args[args.length - 1] != "function")
throw new Error("Missing callback for " + name); throw new Error("Missing callback for " + name);
if (!/^[!~/]/.test(path)) {
var e = new Error("Invalid path passed to fs");
e.data = { name: name, path: path };
setTimeout(function() { throw e });
return args[args.length - 1](e);
}
var original_callback = args.pop(); var original_callback = args.pop();

5
plugins/c9.ide.errorhandler/raygun.js
Wyświetl plik

@ -1419,7 +1419,8 @@ window.TraceKit = TraceKit;
var blackListedErrors = { var blackListedErrors = {
'Error with empty message': {}, 'Error with empty message': {},
'Script error.': {} 'Script error.': {},
'DealPly is not defined': { factor: 10e5 }
}; };
function processUnhandledException(stackTrace, options) { function processUnhandledException(stackTrace, options) {
var stack = [], var stack = [],
@ -1479,7 +1480,7 @@ window.TraceKit = TraceKit;
if (blackListedErrors.hasOwnProperty(message)) { if (blackListedErrors.hasOwnProperty(message)) {
var count = (blackListedErrors[message].count || 0) + 1; var count = (blackListedErrors[message].count || 0) + 1;
blackListedErrors[message].count = count; blackListedErrors[message].count = count;
if (count % 10 !== 1) { if (count % (blackListedErrors[message].factor || 10) !== 1) {
return; return;
} }
finalCustomData.$blackList = blackListedErrors[message]; finalCustomData.$blackList = blackListedErrors[message];

57
plugins/c9.ide.errorhandler/simple_error_handler.js
Wyświetl plik

@ -50,29 +50,29 @@ define(function(require, exports, module) {
oldOnError.apply(this, arguments); oldOnError.apply(this, arguments);
}; };
//Catch all APF Routed errors // Catch all APF Routed errors
// ui.addEventListener("error", function(e) { // ui.addEventListener("error", function(e) {
// var errorInfo = { // var errorInfo = {
// agent : navigator.userAgent, // agent : navigator.userAgent,
// type : "APF Error", // type : "APF Error",
// message : e.message, // message : e.message,
// tgt : e.currentTarget && e.currentTarget.serialize(), // tgt : e.currentTarget && e.currentTarget.serialize(),
// url : e.url, // url : e.url,
// state : e.state, // state : e.state,
// e : e.error, // e : e.error,
// workspaceId : plugin.workspaceId // workspaceId : plugin.workspaceId
// }; // };
//
// emit("error", errorInfo); // emit("error", errorInfo);
//
// http.request("/api/debug", { // http.request("/api/debug", {
// method : "POST", // method : "POST",
// contentType : "application/json", // contentType : "application/json",
// body : errorInfo // body : errorInfo
// }, function(err) { // }, function(err) {
// if (err) console.error(err); // if (err) console.error(err);
// }); // });
// }); // });
} }
} }
@ -87,8 +87,11 @@ define(function(require, exports, module) {
// }); // });
} }
function reportError(exception) { function reportError(exception, customData) {
console.error(exception.stack || exception); if (customData)
console.error(exception, customData);
else
console.error(exception.stack || exception);
submitError(exception); submitError(exception);
} }
@ -98,6 +101,10 @@ define(function(require, exports, module) {
load(); load();
}); });
plugin.on("unload", function(){
loaded = false;
});
/***** Register and define API *****/ /***** Register and define API *****/
plugin.freezePublicAPI({ plugin.freezePublicAPI({

2
plugins/c9.ide.layout.classic/less/blackdg.less
Wyświetl plik

@ -211,7 +211,7 @@
left : -2px; left : -2px;
vertical-align : top; vertical-align : top;
margin-right : 2px !important; margin-right : 2px !important;
margin-left : 1px !important; margin-left : @datagrid-row-toggler-loading !important;
} }
.blackdg .loading.selected .toggler{ .blackdg .loading.selected .toggler{
background : url("@{datagrid-selected-spinner}") no-repeat 0 0; background : url("@{datagrid-selected-spinner}") no-repeat 0 0;

1
plugins/c9.ide.layout.classic/themes/default-dark-gray.less
Wyświetl plik

@ -705,6 +705,7 @@
@datagrid-row-padding: 2px 0 2px 4px; @datagrid-row-padding: 2px 0 2px 4px;
@datagrid-row-height: 18px; @datagrid-row-height: 18px;
@datagrid-row-toggler: -1px 4px -3px 3px; @datagrid-row-toggler: -1px 4px -3px 3px;
@datagrid-row-toggler-loading: 1px;
@datagrid-editor-box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5) inset; @datagrid-editor-box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5) inset;

1
plugins/c9.ide.layout.classic/themes/default-dark.less
Wyświetl plik

@ -705,6 +705,7 @@
@datagrid-row-padding: 2px 0 2px 4px; @datagrid-row-padding: 2px 0 2px 4px;
@datagrid-row-height: 18px; @datagrid-row-height: 18px;
@datagrid-row-toggler: -1px 4px -3px 3px; @datagrid-row-toggler: -1px 4px -3px 3px;
@datagrid-row-toggler-loading: 1px;
@datagrid-editor-box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5) inset; @datagrid-editor-box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5) inset;

7
plugins/c9.ide.layout.classic/themes/default-flat-light.less
Wyświetl plik

@ -363,7 +363,7 @@
@pane-button-running-top: 6px; @pane-button-running-top: 6px;
@pane-button-running-animation: rotation 2s infinite steps(16); @pane-button-running-animation: rotation 2s infinite steps(16);
@pane-button-save-image: "@{image-path}/tab-save-spinner-active_flat_light.png"; @pane-button-save-image: "@{image-path}/tab-save-spinner-active_flat_light.png";
@pane-button-save-image-width: 360px; @pane-button-save-image-width: 336px;
@pane-button-save-image-height: 14px; @pane-button-save-image-height: 14px;
@pane-button-save-width: 14px; @pane-button-save-width: 14px;
@pane-button-save-height: 14px; @pane-button-save-height: 14px;
@ -705,6 +705,7 @@
@datagrid-row-padding: 5px 0 5px 7px; @datagrid-row-padding: 5px 0 5px 7px;
@datagrid-row-height: 24px; @datagrid-row-height: 24px;
@datagrid-row-toggler: -1px 4px -3px -2px; @datagrid-row-toggler: -1px 4px -3px -2px;
@datagrid-row-toggler-loading: -4px;
@datagrid-editor-box-shadow: none; @datagrid-editor-box-shadow: none;
@ -1493,8 +1494,8 @@
@share-textbox-border-color: @textbox-border-color; @share-textbox-border-color: @textbox-border-color;
@share-textbox-width: 378px; @share-textbox-width: 378px;
@share-textbox-margin: 5px 0 0 0; @share-textbox-margin: 5px 0 0 0;
@share-access-right: 150px; @share-access-right: 140px;
@share-access-top: 36px; @share-access-top: 66px;
@share-invite-button-width: 120px; @share-invite-button-width: 120px;
@share-invite-button-height: 30px; @share-invite-button-height: 30px;
@share-invite-button-right: 10px; @share-invite-button-right: 10px;

1
plugins/c9.ide.layout.classic/themes/default-light-gray.less
Wyświetl plik

@ -705,6 +705,7 @@
@datagrid-row-padding: 2px 0 2px 4px; @datagrid-row-padding: 2px 0 2px 4px;
@datagrid-row-height: 18px; @datagrid-row-height: 18px;
@datagrid-row-toggler: -1px 4px -3px 3px; @datagrid-row-toggler: -1px 4px -3px 3px;
@datagrid-row-toggler-loading: 1px;
@datagrid-editor-box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5) inset; @datagrid-editor-box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5) inset;

1
plugins/c9.ide.layout.classic/themes/default-light.less
Wyświetl plik

@ -705,6 +705,7 @@
@datagrid-row-padding: 2px 0 2px 4px; @datagrid-row-padding: 2px 0 2px 4px;
@datagrid-row-height: 18px; @datagrid-row-height: 18px;
@datagrid-row-toggler: -1px 4px -3px 3px; @datagrid-row-toggler: -1px 4px -3px 3px;
@datagrid-row-toggler-loading: 1px;
@datagrid-editor-box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5) inset; @datagrid-editor-box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5) inset;

215
plugins/c9.ide.server/plugins.js
Wyświetl plik

@ -4,106 +4,133 @@
* @copyright 2013, Ajax.org B.V. * @copyright 2013, Ajax.org B.V.
*/ */
"use strict"; define(function(require, exports, module) {
"use strict";
main.consumes = ["Plugin", "connect.static"];
main.provides = ["c9.static.plugins"];
return main;
main.consumes = [
"connect.static"
];
main.provides = ["c9.static.plugins"];
module.exports = main; function main(options, imports, register) {
var Plugin = imports.Plugin;
function main(options, imports, register) { var statics = imports["connect.static"];
var statics = imports["connect.static"]; var fs = require("fs");
var fs = require("fs");
var whitelist = options.whitelist;
var blacklist = options.blacklist;
/***** Initialization *****/
var plugin = new Plugin("Ajax.org", main.consumes);
var loaded = false;
function load(){
if (loaded) return false;
loaded = true;
var requirePaths = {
ace: "lib/ace/lib/ace",
ace_tree: "lib/ace_tree/lib/ace_tree",
treehugger: "lib/treehugger/lib/treehugger",
acorn: "lib/treehugger/lib/treehugger/js",
tern: "lib/tern",
tern_from_ts: "lib/tern_from_ts",
ui: "lib/ui",
c9: "lib/c9",
frontdoor: "lib/frontdoor",
};
if (whitelist === "*") {
statics.addStatics([{
path: __dirname + "/../../node_modules",
mount: "/lib"
}]);
var whitelist = options.whitelist; statics.addStatics([{
var blacklist = options.blacklist; path: __dirname + "/../../plugins",
mount: "/plugins",
var requirePaths = { rjs: requirePaths
ace: "lib/ace/lib/ace", }]);
ace_tree: "lib/ace_tree/lib/ace_tree", } else {
treehugger: "lib/treehugger/lib/treehugger", [
acorn: "lib/treehugger/lib/treehugger/js", "ace_tree",
tern: "lib/tern", "acorn",
ui: "lib/ui", "tern",
c9: "lib/c9", "tern_from_ts",
frontdoor: "lib/frontdoor", "treehugger",
}; "pivottable",
"architect",
if (whitelist === "*") { "source-map",
statics.addStatics([{ "rusha",
path: __dirname + "/../../node_modules", "c9",
mount: "/lib" "ui",
}]); "emmet",
"frontdoor",
statics.addStatics([{ "mocha", // TESTING
path: __dirname + "/../../plugins", "chai", // TESTING
mount: "/plugins", ].forEach(function(name) {
rjs: requirePaths statics.addStatics([{
}]); path: __dirname + "/../../node_modules/" + name,
} else { mount: "/lib/" + name
[ }]);
"ace_tree", });
"acorn",
"tern", statics.addStatics([{
"treehugger", path: __dirname + "/../../node_modules/ace",
"pivottable", mount: "/lib/ace",
"architect", rjs: requirePaths
"source-map", }]);
"rusha",
"c9", statics.addStatics(fs.readdirSync(__dirname + "/../")
"ui", .filter(function(path) {
"emmet", if (path in blacklist)
"frontdoor", return false;
"mocha", // TESTING else if (path in whitelist)
"chai", // TESTING return true;
].forEach(function(name) { else if (path.indexOf("c9.ide.") === 0)
return true;
else if (path.indexOf("c9.account") === 0)
return true;
else
return false;
})
.map(function(path) {
return {
path: __dirname + "/../../plugins/" + path,
mount: "/plugins/" + path
};
})
);
}
statics.addStatics([{ statics.addStatics([{
path: __dirname + "/../../node_modules/" + name, path: __dirname + "/www",
mount: "/lib/" + name mount: "/"
}]); }]);
statics.addStatics([{
path: __dirname + "/../../docs",
mount: "/docs"
}]);
}
/***** Lifecycle *****/
plugin.on("load", function(){
load();
});
plugin.on("unload", function(){
loaded = false;
}); });
statics.addStatics([{ /***** Register and define API *****/
path: __dirname + "/../../node_modules/ace",
mount: "/lib/ace",
rjs: requirePaths
}]);
statics.addStatics(fs.readdirSync(__dirname + "/../") plugin.freezePublicAPI({});
.filter(function(path) {
if (path in blacklist) register(null, {
return false; "c9.static.plugins": plugin
else if (path in whitelist) });
return true;
else if (path.indexOf("c9.ide.") === 0)
return true;
else if (path.indexOf("c9.account") === 0)
return true;
else
return false;
})
.map(function(path) {
return {
path: __dirname + "/../../plugins/" + path,
mount: "/plugins/" + path
};
})
);
} }
});
statics.addStatics([{
path: __dirname + "/www",
mount: "/"
}]);
statics.addStatics([{
path: __dirname + "/../../docs",
mount: "/docs"
}]);
register(null, {
"c9.static.plugins": {}
});
}

4
plugins/c9.ide.terminal/link_handler.js
Wyświetl plik

@ -158,6 +158,10 @@ define(function(require, exports, module) {
if (!/(https?|ftp|file):/.test(href)) { if (!/(https?|ftp|file):/.test(href)) {
href = "http://" + href; href = "http://" + href;
} }
href = href.replace(/(^https?:\/\/)(0.0.0.0|localhost)(?=:|\/|$)/, function(_, protocol, host) {
host = c9.hostname || window.location.host;
return protocol + host.replace(/:\d+/, "");
});
if (e.metaKey || e.ctrlKey) if (e.metaKey || e.ctrlKey)
window.open(href); window.open(href);
else else

2
plugins/c9.ide.terminal/terminal.js
Wyświetl plik

@ -738,6 +738,8 @@ define(function(require, exports, module) {
terminal.on("afterWrite", function() { terminal.on("afterWrite", function() {
clearTmuxBorders(terminal); clearTmuxBorders(terminal);
}); });
session.getEmitter().sticky("terminalReady", session);
} }
/***** Lifecycle *****/ /***** Lifecycle *****/

21
plugins/c9.ide.tree/tree.js
Wyświetl plik

@ -227,7 +227,7 @@ define(function(require, exports, module) {
// Fetch UI elements // Fetch UI elements
container = plugin.getElement("container"); container = plugin.getElement("container");
winFilesViewer = options.aml winFilesViewer = options.aml;
// Create the Ace Tree // Create the Ace Tree
tree = new Tree(container.$int); tree = new Tree(container.$int);
@ -244,6 +244,16 @@ define(function(require, exports, module) {
return "<span class='filetree-icon " + icon + "'></span>"; return "<span class='filetree-icon " + icon + "'></span>";
}; };
fsCache.model.getTooltipText = function(node) {
var size = node.size;
return node.label + (node.link ? " => " + node.link + "\n" : "")
+ (size ? " | " + (
size < 0x400 ? size + " bytes" :
size < 0x100000 ? (size / 0x400).toFixed(2) + "KB" :
(size / 0x100000).toFixed(2) + "MB"
) : "");
};
if (settings.get("user/general/@treestyle") == "alternative") if (settings.get("user/general/@treestyle") == "alternative")
ui.setStyleClass(container.$int, "alternative"); ui.setStyleClass(container.$int, "alternative");
@ -951,10 +961,15 @@ define(function(require, exports, module) {
if (node === false || path.charAt(0) == "!") if (node === false || path.charAt(0) == "!")
return increment(); return increment();
if (!/^[!~/]/.test(path)) {
console.error("invalid path", path);
delete expandedList[path];
return increment();
}
if (node && node.status == "loaded") { if (node && node.status == "loaded") {
expandNode(node); expandNode(node);
increment(); return increment();
return;
} }
fs.readdir(path, function(err, data) { fs.readdir(path, function(err, data) {

5
plugins/c9.ide.watcher/gui.js
Wyświetl plik

@ -330,7 +330,10 @@ define(function(require, exports, module) {
} }
function updateChangedPath(err, path, data) { function updateChangedPath(err, path, data) {
var doc = changedPaths[path].tab.document; var tab = changedPaths[path].tab || tabManager.findTab(path);
if (!tab)
return changedPaths[path] && changedPaths[path].resolve();
var doc = tab.document;
doc.setBookmarkedValue(data, true); doc.setBookmarkedValue(data, true);
doc.meta.timestamp = Date.now() - settings.timeOffset; doc.meta.timestamp = Date.now() - settings.timeOffset;
changedPaths[path].resolve(); changedPaths[path].resolve();

2
plugins/c9.preview/preview.handler.js
Wyświetl plik

@ -311,7 +311,7 @@ define(function(require, exports, module) {
"content-length": data.length + inject.length, "content-length": data.length + inject.length,
"content-type": request.headers["content-type"], "content-type": request.headers["content-type"],
"etag": request.headers.etag, "etag": request.headers.etag,
"date": request.headers.data, "date": request.headers.date,
"access-control-allow-origin": "https://ide." + ideHost "access-control-allow-origin": "https://ide." + ideHost
}); });
res.write(data); res.write(data);

55
plugins/c9.vfs.client/endpoint.js
Wyświetl plik

@ -1,7 +1,7 @@
define(function(require, exports, module) { define(function(require, exports, module) {
"use strict"; "use strict";
main.consumes = ["Plugin", "auth", "http", "api"]; main.consumes = ["Plugin", "auth", "http", "api", "error_handler"];
main.provides = ["vfs.endpoint"]; main.provides = ["vfs.endpoint"];
return main; return main;
@ -10,6 +10,7 @@ define(function(require, exports, module) {
var auth = imports.auth; var auth = imports.auth;
var http = imports.http; var http = imports.http;
var api = imports.api; var api = imports.api;
var errorHandler = imports.error_handler;
/***** Initialization *****/ /***** Initialization *****/
@ -43,29 +44,32 @@ define(function(require, exports, module) {
var servers; var servers;
var pendingServerReqs = []; var pendingServerReqs = [];
if (options.getServers) initDefaultServers();
options.getServers(initDefaultServers);
else
initDefaultServers();
options.pid = options.pid || 1; options.pid = options.pid || 1;
/***** Methods *****/ /***** Methods *****/
function initDefaultServers(baseURI) { function initDefaultServers(baseURI) {
options.getServers = undefined; if (options.getServers)
var loc = require("url").parse(baseURI || document.baseURI || window.location.href); return options.getServers(init);
var defaultServers = [{ init();
url: loc.protocol + "//" + loc.hostname + (loc.port ? ":" + loc.port : "") + "/vfs",
region: "default" function init() {
}]; options.getServers = undefined;
servers = (urlServers || options.servers || defaultServers).map(function(server) { var loc = require("url").parse(baseURI || document.baseURI || window.location.href);
server.url = server.url.replace(/\/*$/, ""); var defaultServers = [{
return server; url: loc.protocol + "//" + loc.hostname + (loc.port ? ":" + loc.port : "") + "/vfs",
}); region: "default"
pendingServerReqs.forEach(function(cb) { }];
cb(null, servers); servers = (urlServers || options.servers || defaultServers).map(function(server) {
}); server.url = server.url.replace(/\/*$/, "");
return server;
});
pendingServerReqs.forEach(function(cb) {
cb(null, servers);
});
}
} }
function getServers(callback) { function getServers(callback) {
@ -90,10 +94,14 @@ define(function(require, exports, module) {
} }
function getVfsEndpoint(version, callback) { function getVfsEndpoint(version, callback) {
getServers(function(err, servers) { getServers(function(err, _servers) {
if (err) return callback(err); if (err) {
errorHandler.reportError(err);
initDefaultServers();
_servers = servers;
}
getVfsUrl(version, servers, function(err, vfsid, url, region) { getVfsUrl(version, _servers, function(err, vfsid, url, region) {
if (err) return callback(err); if (err) return callback(err);
callback(null, { callback(null, {
@ -166,7 +174,7 @@ define(function(require, exports, module) {
var server = servers[i]; var server = servers[i];
auth.request(server.url + "/" + options.pid, { auth.request(server.url + "/" + options.pid, {
method: "POST", method: "POST",
timeout: 20000, timeout: 120000,
body: { body: {
version: version version: version
}, },
@ -206,6 +214,9 @@ define(function(require, exports, module) {
return; return;
} }
else if (err.code == 403) { else if (err.code == 403) {
if (res.error.blocked)
callback(fatalError(res.error.message, "dashboard"));
// forbidden. User doesn't have access // forbidden. User doesn't have access
// wait a while before trying again // wait a while before trying again
setTimeout(function() { setTimeout(function() {

5
plugins/c9.vfs.client/vfs_client.js
Wyświetl plik

@ -7,7 +7,7 @@
define(function(require, exports, module) { define(function(require, exports, module) {
"use strict"; "use strict";
main.consumes = ["Plugin", "auth", "vfs.endpoint", "dialog.error", "dialog.alert"]; main.consumes = ["Plugin", "auth", "vfs.endpoint", "dialog.error", "dialog.alert", "error_handler"];
main.provides = ["vfs"]; main.provides = ["vfs"];
return main; return main;
@ -33,6 +33,7 @@ define(function(require, exports, module) {
var showError = errorDialog.show; var showError = errorDialog.show;
var hideError = errorDialog.hide; var hideError = errorDialog.hide;
var showAlert = imports["dialog.alert"].show; var showAlert = imports["dialog.alert"].show;
var errorHandler = imports.error_handler;
var eio = require("engine.io"); var eio = require("engine.io");
var Consumer = require("vfs-socket/consumer").Consumer; var Consumer = require("vfs-socket/consumer").Consumer;
@ -123,6 +124,7 @@ define(function(require, exports, module) {
}); });
function disconnect() { function disconnect() {
pingUrl = null;
reconnect(function(err) { reconnect(function(err) {
if (err && err.fatal) if (err && err.fatal)
return; return;
@ -275,6 +277,7 @@ define(function(require, exports, module) {
consumer.connect(transport, function(err, _vfs) { consumer.connect(transport, function(err, _vfs) {
// TODO // TODO
if (err) { if (err) {
errorHandler.reportError(new Error("Error connecting to VFS", { err: err }));
console.error("error connecting to VFS", err); console.error("error connecting to VFS", err);
return; return;
} }

2
scripts/install-sdk.sh
Wyświetl plik

@ -63,7 +63,7 @@ updatePackage() {
} }
updateAllPackages() { updateAllPackages() {
c9packages=(`"$NODE" -e 'console.log(Object.keys(require("./package.json").c9plugins).join(" "))'`); c9packages=`"$NODE" -e 'console.log(Object.keys(require("./package.json").c9plugins).join(" "))'`;
count=${#c9packages[@]} count=${#c9packages[@]}
i=0 i=0
for m in ${c9packages[@]}; do echo $m; for m in ${c9packages[@]}; do echo $m;