kopia lustrzana https://github.com/c9/core
Merge remote-tracking branch 'origin/master' into localdev
Conflicts: npm-shrinkwrap.jsonsmf-sdk
commit
fcda818107
|
@ -324,6 +324,7 @@ module.exports = function(options) {
|
|||
"plugins/c9.ide.language.javascript.tern/tern",
|
||||
"plugins/c9.ide.language.javascript.tern/architect_resolver",
|
||||
"plugins/c9.ide.language.javascript.eslint/eslint",
|
||||
"plugins/c9.ide.language.python/python",
|
||||
{
|
||||
packagePath: "plugins/c9.ide.language.jsonalyzer/jsonalyzer",
|
||||
extendToken: extendToken,
|
||||
|
|
|
@ -81,10 +81,10 @@ var snippetCompleter = {
|
|||
};
|
||||
|
||||
var completers = [snippetCompleter, textCompleter, keyWordCompleter];
|
||||
// Allows default completers to be removed or replaced with a explict set of completers
|
||||
// A null argument here will result in an empty completer array, not a null attribute
|
||||
// Modifies list of default completers
|
||||
exports.setCompleters = function(val) {
|
||||
completers = val || [];
|
||||
completers.length = 0;
|
||||
if (val) completers.push.apply(completers, val);
|
||||
};
|
||||
exports.addCompleter = function(completer) {
|
||||
completers.push(completer);
|
||||
|
|
|
@ -588,6 +588,7 @@ exports.handler.addCommands({
|
|||
exec: function(editor) {
|
||||
exports.killRing.add(editor.getCopyText());
|
||||
editor.commands.byName.cut.exec(editor);
|
||||
editor.setEmacsMark(null);
|
||||
},
|
||||
readOnly: true,
|
||||
multiSelectAction: "forEach"
|
||||
|
|
|
@ -482,6 +482,7 @@ var TextInput = function(parentNode, host) {
|
|||
if (host.renderer.$keepTextAreaAtCursor)
|
||||
host.renderer.$keepTextAreaAtCursor = null;
|
||||
|
||||
clearTimeout(closeTimeout);
|
||||
// on windows context menu is opened after mouseup
|
||||
if (useragent.isWin && !useragent.isOldIE)
|
||||
event.capture(host.container, move, onContextMenuClose);
|
||||
|
@ -507,6 +508,11 @@ var TextInput = function(parentNode, host) {
|
|||
host.textInput.onContextMenu(e);
|
||||
onContextMenuClose();
|
||||
};
|
||||
event.addListener(text, "mouseup", onContextMenu);
|
||||
event.addListener(text, "mousedown", function(e) {
|
||||
e.preventDefault();
|
||||
onContextMenuClose();
|
||||
});
|
||||
event.addListener(host.renderer.scroller, "contextmenu", onContextMenu);
|
||||
event.addListener(text, "contextmenu", onContextMenu);
|
||||
};
|
||||
|
|
|
@ -185,7 +185,7 @@ exports.addMouseWheelListener = function(el, callback) {
|
|||
}
|
||||
};
|
||||
|
||||
exports.addMultiMouseDownListener = function(el, timeouts, eventHandler, callbackName) {
|
||||
exports.addMultiMouseDownListener = function(elements, timeouts, eventHandler, callbackName) {
|
||||
var clicks = 0;
|
||||
var startX, startY, timer;
|
||||
var eventNames = {
|
||||
|
@ -194,7 +194,7 @@ exports.addMultiMouseDownListener = function(el, timeouts, eventHandler, callbac
|
|||
4: "quadclick"
|
||||
};
|
||||
|
||||
exports.addListener(el, "mousedown", function(e) {
|
||||
function onMousedown(e) {
|
||||
if (exports.getButton(e) !== 0) {
|
||||
clicks = 0;
|
||||
} else if (e.detail > 1) {
|
||||
|
@ -226,18 +226,22 @@ exports.addMultiMouseDownListener = function(el, timeouts, eventHandler, callbac
|
|||
clicks = 0;
|
||||
else if (clicks > 1)
|
||||
return eventHandler[callbackName](eventNames[clicks], e);
|
||||
});
|
||||
|
||||
if (useragent.isOldIE) {
|
||||
exports.addListener(el, "dblclick", function(e) {
|
||||
clicks = 2;
|
||||
if (timer)
|
||||
clearTimeout(timer);
|
||||
timer = setTimeout(function() {timer = null}, timeouts[clicks - 1] || 600);
|
||||
eventHandler[callbackName]("mousedown", e);
|
||||
eventHandler[callbackName](eventNames[clicks], e);
|
||||
});
|
||||
}
|
||||
function onDblclick(e) {
|
||||
clicks = 2;
|
||||
if (timer)
|
||||
clearTimeout(timer);
|
||||
timer = setTimeout(function() {timer = null}, timeouts[clicks - 1] || 600);
|
||||
eventHandler[callbackName]("mousedown", e);
|
||||
eventHandler[callbackName](eventNames[clicks], e);
|
||||
}
|
||||
if (!Array.isArray(elements))
|
||||
elements = [elements];
|
||||
elements.forEach(function(el) {
|
||||
exports.addListener(el, "mousedown", onMousedown);
|
||||
if (useragent.isOldIE)
|
||||
exports.addListener(el, "dblclick", onDblclick);
|
||||
});
|
||||
};
|
||||
|
||||
var getModifierHash = useragent.isMac && useragent.isOpera && !("KeyboardEvent" in window)
|
||||
|
|
|
@ -22,8 +22,8 @@
|
|||
],[
|
||||
"start"
|
||||
],[
|
||||
"start",
|
||||
["punctuation.section.comment"," // let's talk about it"]
|
||||
["comment_block",2,"start"],
|
||||
["comment"," // let's talk about it"]
|
||||
],[
|
||||
"start"
|
||||
],[
|
||||
|
@ -53,12 +53,11 @@
|
|||
],[
|
||||
"start"
|
||||
],[
|
||||
"start",
|
||||
["punctuation.section.comment"," // also not a comment"]
|
||||
["comment_block",3,"start"],
|
||||
["comment"," // also not a comment"]
|
||||
],[
|
||||
"start",
|
||||
["meta.tag.any.jade"," div"],
|
||||
["entity.other.attribute-name.class.jade",".attemptAtBlock"]
|
||||
["comment_block",3,"start"],
|
||||
["comment"," div.attemptAtBlock"]
|
||||
],[
|
||||
"start",
|
||||
["text"," "]
|
||||
|
|
|
@ -1367,9 +1367,7 @@ PHP.Parser.prototype.parseEscapeSequences = function( str, quote ) {
|
|||
return chr(octdec(str));
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
return str;
|
||||
);
|
||||
};
|
||||
|
||||
/* This is an automatically GENERATED file, which should not be manually edited.
|
||||
|
|
|
@ -72,11 +72,12 @@ function DefaultHandlers(mouseHandler) {
|
|||
var selectionRange = editor.getSelectionRange();
|
||||
var selectionEmpty = selectionRange.isEmpty();
|
||||
editor.$blockScrolling++;
|
||||
if (selectionEmpty)
|
||||
if (selectionEmpty || button == 1)
|
||||
editor.selection.moveToPosition(pos);
|
||||
editor.$blockScrolling--;
|
||||
// 2: contextmenu, 1: linux paste
|
||||
editor.textInput.onContextMenu(ev.domEvent);
|
||||
if (button == 2)
|
||||
editor.textInput.onContextMenu(ev.domEvent);
|
||||
return; // stopping event here breaks contextmenu on ff mac
|
||||
}
|
||||
|
||||
|
|
|
@ -60,15 +60,12 @@ var MouseHandler = function(editor) {
|
|||
var mouseTarget = editor.renderer.getMouseEventTarget();
|
||||
event.addListener(mouseTarget, "click", this.onMouseEvent.bind(this, "click"));
|
||||
event.addListener(mouseTarget, "mousemove", this.onMouseMove.bind(this, "mousemove"));
|
||||
event.addMultiMouseDownListener(mouseTarget, [400, 300, 250], this, "onMouseEvent");
|
||||
if (editor.renderer.scrollBarV) {
|
||||
event.addMultiMouseDownListener(editor.renderer.scrollBarV.inner, [400, 300, 250], this, "onMouseEvent");
|
||||
event.addMultiMouseDownListener(editor.renderer.scrollBarH.inner, [400, 300, 250], this, "onMouseEvent");
|
||||
if (useragent.isIE) {
|
||||
event.addListener(editor.renderer.scrollBarV.element, "mousedown", focusEditor);
|
||||
event.addListener(editor.renderer.scrollBarH.element, "mousedown", focusEditor);
|
||||
}
|
||||
}
|
||||
event.addMultiMouseDownListener([
|
||||
mouseTarget,
|
||||
editor.renderer.scrollBarV && editor.renderer.scrollBarV.element,
|
||||
editor.renderer.scrollBarH && editor.renderer.scrollBarH.element,
|
||||
editor.textInput && editor.textInput.getElement()
|
||||
].filter(Boolean), [400, 300, 250], this, "onMouseEvent");
|
||||
event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this, "mousewheel"));
|
||||
event.addTouchMoveListener(editor.container, this.onTouchMove.bind(this, "touchmove"));
|
||||
|
||||
|
@ -79,11 +76,11 @@ var MouseHandler = function(editor) {
|
|||
event.addListener(gutterEl, "mousemove", this.onMouseEvent.bind(this, "guttermousemove"));
|
||||
|
||||
event.addListener(mouseTarget, "mousedown", focusEditor);
|
||||
|
||||
event.addListener(gutterEl, "mousedown", function(e) {
|
||||
editor.focus();
|
||||
return event.preventDefault(e);
|
||||
});
|
||||
event.addListener(gutterEl, "mousedown", focusEditor);
|
||||
if (useragent.isIE && editor.renderer.scrollBarV) {
|
||||
event.addListener(editor.renderer.scrollBarV.element, "mousedown", focusEditor);
|
||||
event.addListener(editor.renderer.scrollBarH.element, "mousedown", focusEditor);
|
||||
}
|
||||
|
||||
editor.on("mousemove", function(e){
|
||||
if (_self.state || _self.$dragDelay || !_self.$dragEnabled)
|
||||
|
|
|
@ -14,10 +14,10 @@ module.exports = function(options, imports, register) {
|
|||
this.end("");
|
||||
});
|
||||
imports.connect.addResponseMethod("secureRedirect", function(location) {
|
||||
var parsedLocation = url.parse(location);
|
||||
|
||||
var parsedLocation = url.parse(location, false, true);
|
||||
|
||||
if (!trustedDomainsRe.test(parsedLocation.host))
|
||||
location = parsedLocation.path;
|
||||
location = parsedLocation.path || "/";
|
||||
|
||||
this.redirect(location);
|
||||
});
|
||||
|
|
|
@ -195,19 +195,25 @@ module.exports = function Route(route, options, handler, types) {
|
|||
var type = param.type;
|
||||
var value = EMPTY;
|
||||
var isValid = true;
|
||||
switch(param.source) {
|
||||
switch (param.source) {
|
||||
case "body":
|
||||
if (param.optional && !(key in body))
|
||||
break;
|
||||
|
||||
value = body[key]; // body is already JSON parsed
|
||||
if (param.optional && value == null)
|
||||
if (param.optional && value == null) {
|
||||
value = EMPTY;
|
||||
break;
|
||||
}
|
||||
|
||||
isValid = type.check(value);
|
||||
break;
|
||||
|
||||
case "query":
|
||||
if (param.optional && query[key] == null)
|
||||
if (param.optional && query[key] == null) {
|
||||
value = EMPTY;
|
||||
break;
|
||||
}
|
||||
|
||||
try {
|
||||
value = type.parse(query[key]);
|
||||
|
@ -216,13 +222,19 @@ module.exports = function Route(route, options, handler, types) {
|
|||
}
|
||||
isValid = isValid === false ? false : type.check(value);
|
||||
break;
|
||||
|
||||
case "url":
|
||||
if (param.optional && urlParams[key] == null)
|
||||
if (param.optional && urlParams[key] == null) {
|
||||
value = EMPTY;
|
||||
break;
|
||||
}
|
||||
|
||||
value = urlParams[key]; // is already parsed and checked
|
||||
isValid = true;
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new Error("Invalid source: " + params.source);
|
||||
}
|
||||
|
||||
if (!isValid) {
|
||||
|
@ -238,7 +250,6 @@ module.exports = function Route(route, options, handler, types) {
|
|||
req.params[key] = value;
|
||||
else if ("default" in param)
|
||||
req.params[key] = param.default;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -164,6 +164,38 @@ module.exports = {
|
|||
});
|
||||
},
|
||||
|
||||
"test router: decode parameter in body with defaults": function(next) {
|
||||
var route = new Route("/user", {
|
||||
params: {
|
||||
scm: {
|
||||
type: /^(git|hg)?$/,
|
||||
optional: true,
|
||||
default: "git",
|
||||
source: "body"
|
||||
}
|
||||
}
|
||||
}, sinon.stub());
|
||||
|
||||
var req = {
|
||||
match: "match",
|
||||
parsedUrl: { query: "" },
|
||||
body: { }
|
||||
};
|
||||
var res = {};
|
||||
|
||||
route.decodeParams(req, res, function(err, result) {
|
||||
assert.equal(err, null);
|
||||
assert.equal(req.params.scm, "git");
|
||||
|
||||
req.body.scm = null; // should be treated the same as undefined
|
||||
route.decodeParams(req, res, function(err, result) {
|
||||
assert.equal(err, null);
|
||||
assert.equal(req.params.scm, "git");
|
||||
next();
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
"test router: optional number argument can be falsy": function(next) {
|
||||
var route = new Route("/user", {
|
||||
params: {
|
||||
|
|
|
@ -368,7 +368,6 @@ function Worker(vfs) {
|
|||
args[1] = function(err, payload) {
|
||||
if (err) return cb(err);
|
||||
cb(null, {
|
||||
payload: payload,
|
||||
serverTime: Date.now() - start
|
||||
});
|
||||
};
|
||||
|
|
20
package.json
20
package.json
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "c9",
|
||||
"description": "New Cloud9 Client",
|
||||
"version": "3.1.773",
|
||||
"version": "3.1.822",
|
||||
"author": "Ajax.org B.V. <info@ajax.org>",
|
||||
"private": true,
|
||||
"main": "bin/c9",
|
||||
|
@ -55,7 +55,7 @@
|
|||
"c9"
|
||||
],
|
||||
"c9plugins": {
|
||||
"c9.ide.language": "#a0cbe67003",
|
||||
"c9.ide.language": "#9bd9e99520",
|
||||
"c9.ide.language.css": "#a649f2a710",
|
||||
"c9.ide.language.generic": "#77d43cfaf0",
|
||||
"c9.ide.language.html": "#0f4078c187",
|
||||
|
@ -63,9 +63,9 @@
|
|||
"c9.ide.language.javascript": "#2b77bdb96a",
|
||||
"c9.ide.language.javascript.immediate": "#0535804ada",
|
||||
"c9.ide.language.javascript.eslint": "#3ec4557969",
|
||||
"c9.ide.language.javascript.tern": "#468cc173c4",
|
||||
"c9.ide.language.javascript.infer": "#8478e3c702",
|
||||
"c9.ide.language.jsonalyzer": "#45453961d9",
|
||||
"c9.ide.language.javascript.tern": "#213b54a899",
|
||||
"c9.ide.language.javascript.infer": "#99cf41f8bc",
|
||||
"c9.ide.language.jsonalyzer": "#492c4b0956",
|
||||
"c9.ide.collab": "#30efed939e",
|
||||
"c9.ide.local": "#a6e689e33b",
|
||||
"c9.ide.find": "#e33fbaed2f",
|
||||
|
@ -90,8 +90,8 @@
|
|||
"c9.ide.imgeditor": "#612e75ef4f",
|
||||
"c9.ide.immediate": "#a962119bec",
|
||||
"c9.ide.installer": "#0fde9f0067",
|
||||
"c9.ide.language.python": "#undefined",
|
||||
"c9.ide.mount": "#c4b3a1e4b7",
|
||||
"c9.ide.language.python": "#20c876d856",
|
||||
"c9.ide.mount": "#befb8188d5",
|
||||
"c9.ide.navigate": "#c191d9b92f",
|
||||
"c9.ide.newresource": "#981a408a7b",
|
||||
"c9.ide.openfiles": "#7fa4a97fed",
|
||||
|
@ -103,10 +103,10 @@
|
|||
"c9.ide.recentfiles": "#7c099abf40",
|
||||
"c9.ide.remote": "#301d2ab519",
|
||||
"c9.ide.processlist": "#2b12cd1bdd",
|
||||
"c9.ide.run": "#0aee352839",
|
||||
"c9.ide.run": "#f39a46d09e",
|
||||
"c9.ide.run.build": "#0598fff697",
|
||||
"c9.ide.run.debug.xdebug": "#70aeb327c0",
|
||||
"c9.ide.save": "#a2820d0ea1",
|
||||
"c9.ide.save": "#9461acd953",
|
||||
"c9.ide.scm": "#27ac592b33",
|
||||
"c9.ide.terminal.monitor": "#2332e52331",
|
||||
"c9.ide.test": "#5b4c724bf6",
|
||||
|
@ -115,6 +115,6 @@
|
|||
"c9.ide.threewaymerge": "#229382aa0b",
|
||||
"c9.ide.undo": "#b028bcb4d5",
|
||||
"c9.ide.upload": "#0bd010d3dc",
|
||||
"c9.ide.welcome": "#4a53636aea"
|
||||
"c9.ide.welcome": "#2e8792e2fc"
|
||||
}
|
||||
}
|
|
@ -122,7 +122,7 @@ function plugin(options, imports, register) {
|
|||
|
||||
var allowedErrorKeys = [
|
||||
"message", "projectState", "premium", "retryIn", "progress",
|
||||
"oldHost", "blocked", "className"
|
||||
"oldHost", "blocked", "className", "errors"
|
||||
];
|
||||
|
||||
allowedErrorKeys.forEach(function(key) {
|
||||
|
|
|
@ -1101,6 +1101,11 @@ define(function(require, module, exports) {
|
|||
tab.classList.add("error");
|
||||
tab.document.meta.error = true;
|
||||
|
||||
if (tab.document.meta.closeOnError) {
|
||||
tab.close();
|
||||
return callback && callback(err);
|
||||
}
|
||||
|
||||
alert("Error opening file",
|
||||
"Could not open file: " + tab.path,
|
||||
err.code == "ENOENT"
|
||||
|
|
|
@ -112,7 +112,7 @@ define(function(require, exports, module) {
|
|||
+ "</span><span class='path'>"
|
||||
+ (command.hint
|
||||
? this.replaceStrong(command.hint)
|
||||
: "No Description")
|
||||
: "")
|
||||
+ "</span></div>");
|
||||
};
|
||||
|
||||
|
|
|
@ -93,7 +93,7 @@ define(function(require, exports, module) {
|
|||
onclick: function() { window.open(accountUrl); }
|
||||
}), c += 100, plugin);
|
||||
menus.addItemByPath(name + "/Home", new ui.item({
|
||||
onclick: function() { window.open(ideBaseUrl); }
|
||||
onclick: function() { window.open(ideBaseUrl + "?redirect=0"); }
|
||||
}), c += 100, plugin);
|
||||
|
||||
if (!options.noLogout) {
|
||||
|
|
|
@ -243,7 +243,7 @@ define(function(require, module, exports) {
|
|||
else
|
||||
panels.deactivate(plugin.name);
|
||||
|
||||
if (tabs.focussedTab && !panels.showing)
|
||||
if (tabs.focussedTab && tabs.focussedTab.editor && !panels.showing)
|
||||
tabs.focussedTab.editor.focus();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -264,6 +264,9 @@ function main(options, imports, register) {
|
|||
"plugins/c9.ide.language.javascript.infer/infer_jumptodef",
|
||||
"plugins/c9.ide.language.javascript.infer/infer_tooltip",
|
||||
"plugins/c9.ide.language.javascript.infer/infer_completer",
|
||||
"plugins/c9.ide.language.python/worker/python_worker",
|
||||
"plugins/c9.ide.language.python/worker/python_jsonalyzer_worker",
|
||||
"plugins/c9.ide.language.python/server/python_jsonalyzer_server_worker",
|
||||
"plugins/c9.ide.language.html/html_completer",
|
||||
"plugins/c9.ide.language.css/css_handler",
|
||||
"plugins/c9.ide.language.javascript.tern/worker/tern_worker",
|
||||
|
|
|
@ -5,7 +5,7 @@ define(function(require, exports, module) {
|
|||
"use strict";
|
||||
|
||||
main.consumes = [
|
||||
"Plugin", "pubsub", "vfs", "metrics", "vfs.endpoint"
|
||||
"Plugin", "pubsub", "vfs", "metrics", "vfs.endpoint", "dialog.alert"
|
||||
];
|
||||
main.provides = ["vfs.listener"];
|
||||
return main;
|
||||
|
@ -16,6 +16,7 @@ define(function(require, exports, module) {
|
|||
var vfs = imports.vfs;
|
||||
var vfsEndpoint = imports["vfs.endpoint"];
|
||||
var metrics = imports.metrics;
|
||||
var showAlert = imports["dialog.alert"].show;
|
||||
|
||||
/***** Initialization *****/
|
||||
|
||||
|
@ -35,6 +36,20 @@ define(function(require, exports, module) {
|
|||
vfsEndpoint.clearCache();
|
||||
vfs.reconnect();
|
||||
}
|
||||
else if (m.action == "remote_changed") {
|
||||
metrics.increment("vfs.remote_changed", 1, true);
|
||||
vfsEndpoint.clearCache();
|
||||
|
||||
showAlert("Workspace configuration changed!",
|
||||
"The configuration of this workspace has changed.",
|
||||
"Cloud9 will be reloaded in order to activate the changes.",
|
||||
function() {
|
||||
setTimeout(function() {
|
||||
window.location.reload();
|
||||
}, 500);
|
||||
}
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -394,6 +394,11 @@ require([
|
|||
return callback ? callback(null, ws) : ws;
|
||||
}
|
||||
},
|
||||
"preferences.experimental": {
|
||||
addExperiment: function() {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
"ace.gotoline": {},
|
||||
"ace.stripws": {
|
||||
disable: function(){},
|
||||
|
|
|
@ -76,7 +76,7 @@ function main(config, settings, options, callback) {
|
|||
})
|
||||
.concat({
|
||||
consumes: [],
|
||||
provides: ["cdn.build", "db", "health"],
|
||||
provides: ["cdn.build", "db", "redis", "health"],
|
||||
setup: function(options, imports, register) {
|
||||
register(null, {
|
||||
"cdn.build": {},
|
||||
|
@ -87,6 +87,7 @@ function main(config, settings, options, callback) {
|
|||
}
|
||||
}
|
||||
},
|
||||
"redis": {},
|
||||
"health": {
|
||||
addCheck: function() {}
|
||||
}
|
||||
|
|
Ładowanie…
Reference in New Issue