Merge master

Author: sergi

configs/default.js

@@ -192,6 +192,7 @@ var config = [
     "./cloud9.run.python",
     "./cloud9.run.apache",
     "./cloud9.run.php",
+    "./cloud9.run.other",
     "architect/plugins/architect.log",
     "./cloud9.ide.auth",
     "./cloud9.ide.git",
@@ -209,6 +210,7 @@ var config = [
     "./cloud9.ide.run-apache",
     "./cloud9.ide.run-ruby",
     "./cloud9.ide.run-php",
+    "./cloud9.ide.run-other",
     "./cloud9.run.python",
     "./cloud9.ide.revisions",
     {

plugins-client/ext.code/code.js

@@ -869,7 +869,7 @@ module.exports = ext.register("ext/code/code", {
         });
 
         // display feedback while loading files
-        var isOpen, bgMessage, loaderProgress, updateProgressInterval, animationEndTimeout;
+        var isOpen, bgMessage, loaderProgress, loaderBg, updateProgressInterval, animationEndTimeout;
         var checkLoading = function(e) {
             if (!_self.amlEditor.xmlRoot)
                 return;
@@ -893,26 +893,30 @@ module.exports = ext.register("ext/code/code", {
 
             if (loading) {
                 var theme = themes.getActiveTheme();
-                if (!bgMessage || !bgMessage.parentNode) {
-                    bgMessage = bgMessage || document.createElement("div");
+                if (!bgMessage) {
+                    bgMessage = document.createElement("div");
                     bgMessage.className = "ace_smooth_loading";
-                    bgMessage.style.backgroundColor = theme ? theme.bg : "gray";
-                    container.parentNode.appendChild(bgMessage);
 
-                    var loaderBg = document.createElement("div");
+                    loaderBg = document.createElement("div");
                     loaderBg.className = "loading_bg";
-                    loaderBg.style.width = loadingWidth + "px";
-                    loaderBg.style.left = padding + "px";
-                    loaderBg.style.top = 0.4 * container.offsetHeight + "px";
+
                     bgMessage.appendChild(loaderBg);
 
                     loaderProgress = document.createElement("div");
                     loaderProgress.className = "loading_progress";
-                    loaderProgress.style.left = padding + "px";
-                    loaderProgress.style.top = 0.4 * container.offsetHeight + "px";
                     bgMessage.appendChild(loaderProgress);
                     updateProgress(10);
                 }
+
+                if (!bgMessage.parentNode)
+                    container.parentNode.appendChild(bgMessage);
+                
+                bgMessage.style.backgroundColor = theme ? theme.bg : "gray";
+                loaderBg.style.width = loadingWidth + "px";
+                loaderBg.style.left = padding + "px";
+                loaderBg.style.top = 0.4 * container.offsetHeight + "px";
+                loaderProgress.style.left = padding + "px";
+                loaderProgress.style.top = 0.4 * container.offsetHeight + "px";
                 container.style.transitionProperty = "opacity";
                 container.style.transitionDuration = "100ms";
                 container.style.pointerEvents = "none";

plugins-client/ext.console/console.js

@@ -406,7 +406,12 @@ module.exports = ext.register("ext/console/console", {
     createProcessLog: function(message_pid, lang) {
         lang = lang ? lang.replace(/-debug$/, "") : "generic";
         lang = lang[0].toUpperCase() + lang.substring(1);
-        var command_id = this.createOutputBlock("Running " + lang + " Process", true);
+        
+        var cfgName;
+        var runningCfg = lstRunCfg.getModel().data && lstRunCfg.getModel().queryNode("node()[@running]");
+        if (runningCfg)
+            cfgName = runningCfg.getAttribute("name");
+        var command_id = this.createOutputBlock("Running " + lang + " Process" + (cfgName ? ' ("' + cfgName + '")' : ""), true);
         this.tracerToPidMap[command_id] = message_pid;
         this.pidToTracerMap[message_pid] = command_id;