Merge pull request +9697 from c9/fix/various

[Trivial] Fix misaligned inputbox in file save dialog

configs/client-default-local.js

@@ -84,6 +84,9 @@ module.exports.makeLocal = function(config, options) {
             config[i].autoInit = false;
         } else if (config[i].packagePath == "plugins/c9.ide.tree/tree") {
             config[i].defaultExpanded = !config.hosted;
+        } else if (config[i].packagePath == "plugins/c9.ide.errorhandler/raygun_error_handler") {
+            // TODO fix cycle introduced by local/info and raygun_error_handler
+            config[i].packagePath = "plugins/c9.ide.errorhandler/simple_error_handler";
         }
     }
 
@@ -127,9 +130,13 @@ module.exports.makeLocal = function(config, options) {
             contents: options.project.contents,
             descr: options.project.descr
         }
-    }].filter(Boolean);
+    },
+    c9Ws && "plugins/c9.ide.analytics/mock_analytics",
+    ].filter(Boolean);
 
-    var excludes = c9Ws ? {} : {
+    var excludes = c9Ws ? {
+        "plugins/c9.ide.analytics/analytics": true,
+    } : {
         "plugins/c9.ide.newresource/open": true,
         "plugins/c9.ide.info/info": true,
         // "plugins/c9.ide.login/login": true,

local/index.html

@@ -271,7 +271,7 @@
         function loadRequireJsConfig(cb) {
             var requirejs = window.requirejs;
             window.require = requirejs;
-            requirejs.setConfig = requirejs.config;
+            requirejs.setConfig = requirejs.setConfig || requirejs.config;
             requirejs.config = function(config) {
                 config.baseUrl = requirejsBaseUrl + (config.baseUrl || "");
                 if (config.paths) {
@@ -293,7 +293,7 @@
                 require.packaged = true;
             if (!packed || devel) {
                 packageIsLoading = true;
-                loadScript("plugins/c9.vfs.standalone/www/require.js", function() {
+                loadScript("node_modules/architect-build/build_support/mini_require.js", function() {
                     removeNwRequire();
                     startIde();
                     packageIsLoading = false;

local/server.js

@@ -361,7 +361,7 @@ var server = {
                     }
                 }
                 
-                if (p.staticPrefix && options.windowLocation && options.packed) {
+                if (p.staticPrefix && options.windowLocation && (options.packed || isRemote)) {
                     p.staticPrefix = p.staticPrefix.replace(/^\/static/, options.windowLocation);
                 }
             }
@@ -392,6 +392,10 @@ var server = {
                     plugins = require(configPath).makeLocal(config.plugins, settings);
                     settings.url = config.url;
                 }
+                plugins.forEach(function(p) {
+                    if (p.staticPrefix)
+                        p.staticPrefix = p.staticPrefix.replace(/^https?:\/\/.*?\/static/, "/static");
+                })
                 updateFilePaths(plugins, function(){
                     cb(plugins, settings);
                 });
@@ -415,7 +419,6 @@ var server = {
     openWindow : openWindow,
     parseArgs : parseArgs,
     getRecentWindows: getRecentWindows,
-    listC9Projects: listC9Projects,
     getRemoteWorkspaceConfig: getRemoteWorkspaceConfig
 };
 
@@ -1023,49 +1026,6 @@ function loadData(url, callback) {
     xhr.send("");
 }
 
-// TODO add proper api to c9 server
-function listC9Projects(user, callback) {
-    if (!user)
-        return callback(null, []);
-        
-    var url = "https://c9.io/" + user.name;
-    loadData(url, function(err, result) {
-        if (err) return callback(err);
-        var ownProjects = [];
-        var sharedProjects = [];
-        try {
-            var pids = Object.create(null);
-            JSON.parse(result.match(/projects:\s*(.*),/)[1]).forEach(function(x) {
-                var userName = x.owner_username || user.name;
-                
-                var project = {
-                    name: userName + "/" + x.name,
-                    projectName: x.name,
-                    pid: x.pid,
-                    isRemote: true,
-                };
-                
-                if (pids[project.pid])
-                    return;
-                
-                pids[project.pid] = project;
-                
-                if (userName == user.name)
-                    ownProjects.push(project);
-                else
-                    sharedProjects.push(project);
-            });
-        } catch(e) {
-            console.error(e);
-            return callback(e);
-        }
-        callback(null, {
-            shared: sharedProjects,
-            own: ownProjects
-        });
-    });
-}
-
 function getRemoteWorkspaceConfig(projectName, callback) {
     var url = "https://ide.c9.io/" + projectName + "?config=1";
     loadData(url, function(err, result, xhr) {

node_modules/architect/architect.js

@@ -406,7 +406,9 @@ function checkCycles(config, lookup) {
             "\nMissing services:\n" + unresolvedList.join("\n") + "\n", unresolved,
             "\nResolved services:", Object.keys(resolved));
         var err  = new Error("Could not resolve dependencies\n"
-            + "Missing services: " + unresolvedList);
+            + (unresolvedList.length ? "Missing services: " + unresolvedList
+            : "Config contains cyclic dependencies" // TODO print cycles
+            ));
         err.unresolved = unresolvedList;
         throw err;
     }

package.json

@@ -67,7 +67,7 @@
         "c9.ide.language.javascript.infer": "#8478e3c702",
         "c9.ide.language.jsonalyzer": "#d44cb13695",
         "c9.ide.collab": "#a8e597ae5e",
-        "c9.ide.local": "#a9703b630c",
+        "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#35379124ca",
         "c9.ide.find.infiles": "#c132ad243c",
         "c9.ide.find.replace": "#44772dd796",
@@ -102,7 +102,7 @@
         "c9.ide.recentfiles": "#7c099abf40",
         "c9.ide.remote": "#301d2ab519",
         "c9.ide.processlist": "#2b12cd1bdd",
-        "c9.ide.run": "#ba97f384a6",
+        "c9.ide.run": "#89a02ba00a",
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#e00549cb0f",

plugins/c9.ide.dialog.file/file.css

@@ -26,7 +26,6 @@
     font-size: 8pt;
     overflow: hidden;
     position: relative;
-    height: 210px;
     border-radius:3px;
 }