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 community-link 

Conflicts:
	plugins/c9.ide.help.support/support.js
pull/227/head
Lennart Kats 2015-12-08 09:12:37 +00:00
rodzic 674bef6eeb 95af4c4949
commit 00777d2daa
8 zmienionych plików z 121 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
package.json
Wyświetl plik

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.1.586",
"version": "3.1.647",
"author": "Ajax.org B.V. <info@ajax.org>",
"private": true,
"main": "bin/c9",
@ -55,7 +55,7 @@
"c9"
],
"c9plugins": {
"c9.ide.language": "#9557589338",
"c9.ide.language": "#abdcee8894",
"c9.ide.language.css": "#a649f2a710",
"c9.ide.language.generic": "#77d43cfaf0",
"c9.ide.language.html": "#0f4078c187",
@ -63,7 +63,7 @@
"c9.ide.language.javascript": "#2b77bdb96a",
"c9.ide.language.javascript.immediate": "#0535804ada",
"c9.ide.language.javascript.eslint": "#3ec4557969",
"c9.ide.language.javascript.tern": "#d8f3df1b39",
"c9.ide.language.javascript.tern": "#8233331bc9",
"c9.ide.language.javascript.infer": "#8478e3c702",
"c9.ide.language.jsonalyzer": "#45453961d9",
"c9.ide.collab": "#30efed939e",
@ -71,7 +71,7 @@
"c9.ide.find": "#e33fbaed2f",
"c9.ide.find.infiles": "#c3bf17286d",
"c9.ide.find.replace": "#8cbce45290",
"c9.ide.run.debug": "#b1381a67a7",
"c9.ide.run.debug": "#3e06ddc0d2",
"c9.automate": "#47e2c429c9",
"c9.ide.ace.emmet": "#6dc4585e02",
"c9.ide.ace.gotoline": "#a8ff07c8f4",
@ -86,7 +86,7 @@
"c9.ide.dialog.wizard": "#7667ec79a8",
"c9.ide.fontawesome": "#781602c5d8",
"c9.ide.format": "#5ec97fb083",
"c9.ide.help.support": "#e8fbf34641",
"c9.ide.help.support": "#0c311f7165",
"c9.ide.imgeditor": "#612e75ef4f",
"c9.ide.immediate": "#a962119bec",
"c9.ide.installer": "#0fde9f0067",
@ -107,13 +107,13 @@
"c9.ide.run.debug.xdebug": "#70aeb327c0",
"c9.ide.save": "#a2820d0ea1",
"c9.ide.scm": "#930a9e6f00",
"c9.ide.terminal.monitor": "#35afa7f97f",
"c9.ide.test": "#0690ddb1c2",
"c9.ide.test.mocha": "#7844e1dc83",
"c9.ide.terminal.monitor": "#43c4f35f60",
"c9.ide.test": "#5b4c724bf6",
"c9.ide.test.mocha": "#fc053b23d2",
"c9.ide.theme.flat": "#92cda0fb40",
"c9.ide.threewaymerge": "#229382aa0b",
"c9.ide.undo": "#b028bcb4d5",
"c9.ide.upload": "#0bd010d3dc",
"c9.ide.welcome": "#336862828d"
"c9.ide.welcome": "#4a53636aea"
}
}

3
plugins/c9.cli.bridge/bridge-service.js
Wyświetl plik

@ -83,6 +83,9 @@ module.exports = function (vfs, options, register) {
api.onData(e);
};
registerClient(stream);
api.onConnect({ write: function(e) {
stream.emit("data", e) }
});
var unixServer = net.createServer(registerClient);
unixServer.listen(SOCKET);

3
plugins/c9.cli.bridge/bridge.js
Wyświetl plik

@ -23,7 +23,8 @@ define(function(require, exports, module) {
if (!ENABLED) return;
ext.loadRemotePlugin("bridge", {
code: require("text!./bridge-service.js"),
code: c9.standalone ? undefined : require("text!./bridge-service.js"),
file: c9.standalone ? "c9.cli.bridge/bridge-service.js" : undefined,
redefine: true
}, function(err, remote) {
if (err)

94
plugins/c9.core/c9_test.js 100644
Wyświetl plik

@ -0,0 +1,94 @@
/*global describe:false, it:false */
"use client";
require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai) {
var expect = chai.expect;
expect.setupArchitectTest([
{
packagePath: "plugins/c9.core/c9",
startdate: new Date(),
debug: 2,
hosted: true,
local: false
},
"plugins/c9.vfs.client/vfs_client",
"plugins/c9.vfs.client/endpoint",
"plugins/c9.ide.auth/auth",
"plugins/c9.core/api",
"plugins/c9.core/ext",
"plugins/c9.core/http-xhr",
{
consumes: [],
provides: ["auth.bootstrap", "info", "dialog.error"],
setup: expect.html.mocked
},
{
consumes: ["c9", "vfs"],
provides: [],
setup: main
}
], architect);
function main(options, imports, register) {
var c9 = imports.c9;
var vfs = imports.vfs;
describe('c9', function() {
this.timeout(30000);
it('should send proper events during connecting', function(done) {
// var count = 0;
// c9.on("connecting", function c1(){
// count++;
// expect(c9.connecting).to.equal(true);
// expect(c9.connected).to.equal(false);
// expect(c9.has(c9.NETWORK)).to.equal(false);
// c9.off("connecting", c1);
// });
expect(c9.connected).to.equal(false);
c9.once("connect", function c2(){
// expect(count, "Connecting event was not called").to.equal(1);
expect(c9.connected).to.equal(true);
expect(c9.has(c9.NETWORK)).to.equal(true);
done();
});
c9.enable();
});
it('check status settings and getting', function(done) {
c9.setStatus(c9.status & ~c9.STORAGE);
expect(c9.has(c9.STORAGE)).to.equal(false);
c9.setStatus(c9.status | c9.STORAGE);
expect(c9.has(c9.STORAGE)).to.equal(true);
done();
});
it('should send correct events during away', function(done) {
expect(c9.connected).to.equal(true);
expect(c9.has(c9.NETWORK)).to.equal(true);
c9.once("away", function c1(){
expect(c9.connected).to.equal(false);
expect(c9.has(c9.NETWORK)).to.equal(true);
});
c9.once("back", function c1(){
expect(c9.connected).to.equal(true);
expect(c9.has(c9.NETWORK)).to.equal(true);
done();
});
vfs.connection.socket.close();
});
});
onload && onload();
}
});

9
plugins/c9.ide.ace/ace_test.js
Wyświetl plik

@ -259,10 +259,17 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai)
ace.setTheme(theme);
});
it('should allow setting useWrapMode', function(done) {
doc.value = "a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped a very long string to be wrapped ";
var charW = editor.ace.renderer.layerConfig.characterWidth;
expect(charW).to.ok;
bar.$ext.style.width = 150 * charW + "px"
doc.value = Array(17).join("a very long string to be wrapped ");
render();
bar.$ext.style.width = "1000px";
expect(document.querySelector(".ace_gutter-cell").offsetHeight).to.equal(lineHeight);
editor.setOption("useWrapMode", true);

2
plugins/c9.ide.panels/panel.js
Wyświetl plik

@ -243,7 +243,7 @@ define(function(require, module, exports) {
else
panels.deactivate(plugin.name);
if (tabs.focussedTab && tabs.focussedTab.editor && !panels.showing)
if (tabs.focussedTab && !panels.showing)
tabs.focussedTab.editor.focus();
}
}

1
plugins/c9.ide.server/views/flat-load-screen.html
Wyświetl plik

@ -36,6 +36,7 @@
"Use our Vim mode for extra addictive effect!",
"Not your grandfather's IDE",
"Now made with 20% more cloud!",
"Literally makes your laptop cooler",
];
var idx = Math.floor(Math.random() * messages.length);

4
server.js
Wyświetl plik

@ -89,7 +89,9 @@ function main(argv, config, onLoaded) {
var notDelayed = expanded.filter(function(c) { return delayLoadConfigs.indexOf(c) === -1 });
startConfigs(notDelayed, function() {
startConfigs(delayed, function() {});
startConfigs(delayed, function() {
console.log("Cloud9 is up and running");
});
});
function startConfigs(configs, done) {