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

configs/standalone.js

@@ -178,7 +178,7 @@ module.exports = function(config, optimist) {
             readonly: readonly
         },
         "./c9.vfs.server/vfs.server",
-        "./c9.error/logger.raygun_mock",
+        "./c9.error/logger.raygun_noop",
         "./c9.preview/preview.handler",
         "./c9.vfs.server/cache",
         "./c9.vfs.server/download",

node_modules/c9/setup_paths.js

@@ -5,13 +5,17 @@
  */
 var modules = require("module");
 var oldResolve = modules._resolveFilename;
-var extraPaths = [
-    __dirname + "/../../"
-];
+var path = require("path")
+var root = path.join(__dirname, "/../..");
+var extraPaths = [ root ];
 modules._resolveFilename = function(request, parent) {
     if (!parent) parent = { paths: [], filename: "" };
     // Ensure client extensions can be loaded
     request = request.replace(/^lib\//, "node_modules/");
+    // ensure we never use node_modules outside of root dir
+    parent.paths = parent.paths.filter(function(p) {
+        return p.indexOf(root) == 0
+    });
     // Add the extra paths
     extraPaths.forEach(function(p) {
         if (parent.paths.indexOf(p) === -1)

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.0.2433",
+    "version": "3.0.2446",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -63,7 +63,7 @@
         "c9.ide.language.javascript": "#8479d0a9c1",
         "c9.ide.language.javascript.immediate": "#0535804ada",
         "c9.ide.language.javascript.eslint": "#08e0af061f",
-        "c9.ide.language.javascript.tern": "#3ef5101eec",
+        "c9.ide.language.javascript.tern": "#32c6a94557",
         "c9.ide.language.javascript.infer": "#4c9a4282ff",
         "c9.ide.language.jsonalyzer": "#0717d1510f",
         "c9.ide.collab": "#b49eda3791",

plugins/c9.error/logger.raygun_noop.js

@@ -0,0 +1,18 @@
+"use strict";
+
+plugin.consumes = [];
+plugin.provides = ["error.logger"];
+
+module.exports = plugin;
+
+function plugin(options, imports, register) {
+    var noop = function() {};
+    
+    register(null, {
+        "error.logger": {
+            log: noop,
+            error: noop,
+            warn: noop
+        }
+    });
+}