Merge branch 'master' of github.com:c9/newclient into theme/flat-dark

Conflicts:
	plugins/c9.ide.cs50.stats/stats50.js

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.263",
+    "version": "3.1.312",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -98,11 +98,11 @@
         "c9.ide.preview.browser": "#cec211a76a",
         "c9.ide.preview.markdown": "#85c08d5e1e",
         "c9.ide.pubsub": "#a85fb27eca",
-        "c9.ide.readonly": "#c699cb172b",
+        "c9.ide.readonly": "#e67bb593bd",
         "c9.ide.recentfiles": "#7c099abf40",
         "c9.ide.remote": "#301d2ab519",
         "c9.ide.processlist": "#2b12cd1bdd",
-        "c9.ide.run": "#67f3a8ba3a",
+        "c9.ide.run": "#c50bad0667",
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#76cf52ab6d",

plugins/c9.core/http-xhr.js

@@ -83,13 +83,12 @@ define(function(require, module, exports) {
             }
             
             var timer;
-            var timedout = false;
             if (timeout) {
                 timer = setTimeout(function() {
-                    timedout = true;
                     xhr.abort();
                     var err = new Error("Timeout");
                     err.code = "ETIMEOUT";
+                    err.data = {url: url, query: options.query};
                     done(err);
                 }, timeout);
             }

plugins/c9.error/logger.raygun.js

@@ -16,9 +16,6 @@ function plugin(options, imports, register) {
     function error(err, customData, user) {
         if (typeof err == "string")
             err = new Error(err);
-        if (typeof err === "string") {
-            err = new Error(err);
-        }
         raygun.errorClient.setUser(user);
         raygun.errorClient.send(err, customData);
     }

plugins/c9.ide.errorhandler/raygun.js

@@ -165,6 +165,7 @@ TraceKit.report = (function reportModuleWrapper() {
         else
         {
         if (lastExceptionStack) {
+            errorObj = lastException;
             TraceKit.computeStackTrace.augmentStackTraceWithInitialElement(lastExceptionStack, url, lineNo, message);
             stack = lastExceptionStack;
             lastExceptionStack = null;
@@ -187,7 +188,7 @@ TraceKit.report = (function reportModuleWrapper() {
         }
         }
 
-        notifyHandlers(stack, 'from window.onerror');
+        notifyHandlers(stack, 'from window.onerror', {errorObj: errorObj});
 
         if (_oldOnerrorHandler) {
             return _oldOnerrorHandler.apply(this, arguments);
@@ -201,7 +202,7 @@ TraceKit.report = (function reportModuleWrapper() {
      * @param {Error} ex
      */
     function report(ex) {
-        var args = _slice.call(arguments, 1);
+        var args = _slice.call(arguments, 0);
         if (lastExceptionStack) {
             if (lastException === ex) {
                 return; // already caught by an inner catch block, ignore
@@ -1423,6 +1424,7 @@ window.TraceKit = TraceKit;
     'DealPly is not defined': { factor: 10e5 },
     "Cannot read property 'style' of null": { factor: 10e3 },
     "Project with id '<id>' does not exist": { factor: 10e2 },
+    "Workspace not found": { factor: 10e2 },
   };
   var groupedErrors = [{
     regex: /^((?:Project|User) with id ')(\d+)(' does not exist)/i,
@@ -1462,13 +1464,13 @@ window.TraceKit = TraceKit;
       });
     }
 
-    if (options === undefined) {
+    if (!options) {
       options = {};
     }
 
     if (isEmpty(options.customData)) {
       if (typeof _customData === 'function') {
-        options.customData = _customData();
+        options.customData = _customData(options.errorObj);
       } else {
         options.customData = _customData;
       }