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 sdk

pull/39/head
Ruben Daniels 2015-02-17 17:06:37 +00:00
rodzic f1c7c239d2 854d1b7aa0
commit 8b24276cba
4 zmienionych plików z 11 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
package.json
Wyświetl plik

@ -60,7 +60,7 @@
"c9.ide.language.javascript.tern": "#a65ad88dd9",
"c9.ide.language.javascript.infer": "#702bbd4dcd",
"c9.ide.language.jsonalyzer": "#eaf8152b03",
"c9.ide.collab": "#d07855bac7",
"c9.ide.collab": "#13fe5c8f27",
"c9.ide.local": "#2bfd7ff051",
"c9.ide.find": "#989c06e6a7",
"c9.ide.find.infiles": "#28b3cfcb47",

7
plugins/c9.ide.ui/menus.js
Wyświetl plik

@ -932,6 +932,7 @@ define(function(require, exports, module) {
plugin.on("load", function(){
aml = new ui.menu({
id: options.id,
zindex: options.zindex,
"onprop.visible" : function(e) {
emit(e.value ? "show" : "hide", lastCoords);
checkItems.call(this, e);
@ -1032,6 +1033,12 @@ define(function(require, exports, module) {
* @readonly
*/
get visible(){ return aml.visible; },
/**
* Specifies the zindex of the menu
* @property {Number} zindex
*/
get zindex(){ return aml && ui.getStyle(aml.$ext, "z-index"); },
set zindex(value) { aml && aml.setAttribute("zindex", value); },
/**
* The menu items appended to this menu
* @property {MenuItem[]} items

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

@ -122,8 +122,6 @@ define(function(require, exports, module) {
}
var url = server + "/" + req.projectSession.pid + "/preview";
if (req.session.token)
url += "?access_token=" + encodeURIComponent(req.session.token);
req.proxyUrl = url;
next();
@ -135,6 +133,8 @@ define(function(require, exports, module) {
var path = req.params.path;
var url = req.proxyUrl + path;
if (req.session.token)
url += "?access_token=" + encodeURIComponent(req.session.token);
var parsedUrl = parseUrl(url);
var httpModule = parsedUrl.protocol == "https:" ? https : http;

6
plugins/c9.vfs.server/vfs.js
Wyświetl plik

@ -181,7 +181,6 @@ Vfs.prototype._createEngine = function(vfs, options) {
if (!eioSocket || listeningForEIOSocketClose) return;
eioSocket.once("close", function (reason, description) {
var logMetadata = {message: "Socket closed", collab: options.collab, reason: reason, description: description, id: that.id, sid: socket.id, pid: that.pid};
console.log(logMetadata);
that.logger.log(logMetadata);
listeningForEIOSocketClose = false;
});
@ -196,7 +195,6 @@ Vfs.prototype._createEngine = function(vfs, options) {
}
socket.on('disconnect', function (err) {
var logMetadata = {message: "Socket disconnected", collab: options.collab, err: err, id: that.id, sid: socket.id, pid: that.pid};
console.log(logMetadata);
that.logger.log(logMetadata);
});
@ -217,9 +215,7 @@ Vfs.prototype._createEngine = function(vfs, options) {
}
worker.on("disconnect", function() {
var logMetadata = {collab: options.collab, id: that.id, sid: socket.id, pid: that.pid};
console.log("VFS socket disconnect:", logMetadata);
logMetadata.message = "VFS socket disconnect";
var logMetadata = {message: "VFS socket disconnect", collab: options.collab, id: that.id, sid: socket.id, pid: that.pid};
that.logger.log(logMetadata);
if (options.collab) {
if (collabApi)