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

Conflicts:
	.c9/project.settings

node_modules/connect-architect/connect.csp/csp.js

@@ -68,7 +68,7 @@ function csp() {
                         res.csp(key, directive[key]);
                 }
                 else {
-                    throw new TypeError("Invalud argument 'directive'");
+                    throw new TypeError("Invalid argument 'directive'");
                 }
                 return;
             }

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.353",
+    "version": "3.1.389",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -69,7 +69,7 @@
         "c9.ide.collab": "#7d0423e652",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#35379124ca",
-        "c9.ide.find.infiles": "#c132ad243c",
+        "c9.ide.find.infiles": "#c3bf17286d",
         "c9.ide.find.replace": "#44772dd796",
         "c9.ide.run.debug": "#dbe6c81252",
         "c9.automate": "#47e2c429c9",
@@ -80,14 +80,14 @@
         "c9.ide.ace.split": "#0ae0151c78",
         "c9.ide.ace.statusbar": "#2155083cf6",
         "c9.ide.ace.stripws": "#cf0f42ac59",
-        "c9.ide.behaviors": "#ee32d7da73",
+        "c9.ide.behaviors": "#5ae88f87e1",
         "c9.ide.closeconfirmation": "#cee4674141",
         "c9.ide.configuration": "#a9066299a2",
         "c9.ide.dialog.wizard": "#7667ec79a8",
         "c9.ide.fontawesome": "#781602c5d8",
         "c9.ide.format": "#5ec97fb083",
         "c9.ide.help.support": "#e95f98f87c",
-        "c9.ide.imgeditor": "#03a313cbab",
+        "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
         "c9.ide.mount": "#c4b3a1e4b7",
@@ -105,7 +105,7 @@
         "c9.ide.run": "#4b031257ee",
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#891f40a245",
-        "c9.ide.save": "#76cf52ab6d",
+        "c9.ide.save": "#5118b30230",
         "c9.ide.scm": "#6a21a21157",
         "c9.ide.terminal.monitor": "#35afa7f97f",
         "c9.ide.test": "#f3e5dad5cc",

plugins/c9.ide.editors/pane.js

@@ -103,23 +103,30 @@ define(function(require, module, exports) {
                         emit("afterClose", event);
                         
                         if (tab.aml.$amlDestroyed) {
-                            tab.unload(e);
+                            tab.unload(event);
                             closing--;
                         }
+                        else if (tab.meta.$skipAnimation) {
+                            closeNow();
+                        }
                         else {
                             tab.aml.on("afterclose", function(){
-                                if (tab.meta.$closeSync) {
-                                    tab.unload(e);
-                                    closing--;
-                                }
-                                else {
-                                    setTimeout(function(){
-                                        tab.unload(e);
-                                        closing--;
-                                    });
-                                }
+                                closeNow();
                             });
                         }
+                        
+                        function closeNow(){
+                            if (tab.meta.$closeSync) {
+                                tab.unload(event);
+                                closing--;
+                            }
+                            else {
+                                setTimeout(function(){
+                                    tab.unload(event);
+                                    closing--;
+                                });
+                            }
+                        }
                     },
                     overactivetab: true,
                     childNodes: [

plugins/c9.ide.editors/tab.js

@@ -304,7 +304,7 @@ define(function(require, module, exports) {
                 if (rule)
                     ui.removeStyleRule(rule, stylesheet);
                 // If there are no more pages left, reset location
-                var last = amlPane.getPages().length === 0;
+                var last = e && e.last || amlPane.getPages().length === 0;
                 if (last)
                     apf.setStyleClass(amlPane.$ext, "empty");
 

plugins/c9.ide.layout.classic/less/dropdown-dark-glossy.less

@@ -69,7 +69,6 @@
 }
 
 .dropdown-dark-glossy-options {
-    .box-sizing(border-box);
     display: none;
     background: @menu-background;
     border: 1px solid @menu-border-color;