LAB-linuxserver/core
1
0
Fork 0
mirror of https://github.com/linuxserver/core.git synced 2026-02-20 05:07:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:c9/newclient into fix/testpanel

Browse Source
This commit is contained in:
Ruben Daniels 2015-10-01 15:30:59 -07:00
commit 9b17d0e88e
8 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node_modules/ace/lib/ace/lib/event.js generated vendored
View File

@ -281,7 +281,9 @@ function normalizeCommandKeys(callback, e, keyCode) {
keyCode = -1;
}
if (hashId & 8 && (keyCode === 91 || keyCode === 92)) {
// keyCode of right command is 93 on mac and 92 on windows.
// keyCode of left command key is 91
if (hashId & 8 && (keyCode >= 91 && keyCode <= 93)) {
keyCode = -1;
}

2
node_modules/vfs-local/localfs.js generated vendored
View File

@ -1402,7 +1402,7 @@ module.exports = function setup(fsOptions) {
tryConnect();
function tryConnect() {
var called = false;
var socket = net.connect(port, process.env.OPENSHIFT_DIY_IP || "localhost", function() {
var socket = net.connect(port, "127.0.0.1", function() {
if (called) return;
called = true;

4
package.json
View File

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.0.2813",
"version": "3.0.2835",
"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": "#83646961c7",
"c9.ide.language.jsonalyzer": "#d44cb13695",
"c9.ide.collab": "#a8e597ae5e",
"c9.ide.local": "#a9703b630c",
"c9.ide.find": "#35379124ca",

5
plugins/c9.error/logger.raygun.js
View File

@ -1,3 +1,8 @@
/**
* This error handler is for server side error logging.
*
**/
"use strict";
plugin.consumes = ["raygun"];

12
plugins/c9.ide.dialog.common/error.js
View File

@ -1,7 +1,7 @@
define(function(require, exports, module) {
"use strict";
main.consumes = ["Plugin", "ui", "metrics"];
main.consumes = ["Plugin", "ui", "metrics", "error_handler"];
main.provides = ["dialog.error"];
return main;
@ -9,6 +9,7 @@ define(function(require, exports, module) {
var Plugin = imports.Plugin;
var ui = imports.ui;
var metrics = imports.metrics;
var errorHandler = imports.error_handler;
/***** Initialization *****/
@ -114,14 +115,17 @@ define(function(require, exports, module) {
+ (message.className ? message.className : "");
if (!message.noError) {
metrics.increment("dialog.error");
if (!message) {
console.trace();
return console.error("empty error message", message);
}
console.error("Error dialog shown: ", getMessageString(message));
metrics.increment("dialog.error");
errorHandler.log(new Error("Error dialog shown"), {
message: message,
messageString: getMessageString(message),
});
}
hide(function() {

4
plugins/c9.ide.errorhandler/raygun_error_handler.js
View File

@ -1,5 +1,7 @@
/**
* This error handler catches window.onerror and sends them to raygun.io
* This error handler is for client side error logging
* It also automatically catches window.onerror and sends them to raygun.io
* You can also import it and call .log to manually send an error
*
* @extends Plugin
* @singleton

2
plugins/c9.ide.help/help.xml
View File

@ -21,7 +21,7 @@
</div>
<div class="c9Staff">
<p textselect="true">
Arron Bailiss, Bas de Wachter, Fabian Jakobs, Harutyun Amirjanyan,
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
</p>

1
plugins/c9.ide.ui/lib/splitbox.js
View File

@ -577,6 +577,7 @@ apf.vsplitbox = function(struct, tagName) {
if (isPercentage) {
fNode.$ext.style.height = "";
fNode.$ext.style.bottom = (100 - parseFloat(fNode.height)) + "%";
lNode.$ext.style.height = "";
}
if (this.$handle) {