Merge remote-tracking branch 'origin/master' into vfs-upgrade-engineio

Conflicts:
	npm-shrinkwrap.json

node_modules/ace/lib/ace/editor.js

@@ -1486,7 +1486,7 @@ var Editor = function(renderer, session) {
             var indentString = lang.stringRepeat(" ", count);
         } else {
             var count = column % size;
-            while (line[range.start.column] == " " && count) {
+            while (line[range.start.column - 1] == " " && count) {
                 range.start.column--;
                 count--;
             }

node_modules/ace/lib/ace/editor_text_edit_test.js

@@ -124,6 +124,12 @@ module.exports = {
         var range = editor.getSelectionRange();
         assert.position(range.start, 1, 7);
         assert.position(range.end, 2, 7);
+        
+        session.setValue("   x");
+        session.setOption("useSoftTabs", false);
+        editor.selection.moveTo(0, 3);
+        editor.indent();
+        assert.equal("\tx", session.toString());
     },
 
     "test: indent selected lines" : function() {

node_modules/ace/lib/ace/mode/behaviour/cstyle.js

@@ -277,6 +277,8 @@ var CstyleBehaviour = function() {
                 var pair;
                 if (rightChar == quote) {
                     pair = stringBefore !== stringAfter;
+                    if (pair && /string\.end/.test(rightToken.type))
+                        pair = false;
                 } else {
                     if (stringBefore && !stringAfter)
                         return null; // wrap string with different quote

node_modules/ace/lib/ace/mode/sh_highlight_rules.js

@@ -84,7 +84,7 @@ var ShHighlightRules = function() {
             token : ["text", "comment"],
             regex : /(^|\s)(#.*)$/
         }, {
-            token : "string",
+            token : "string.start",
             regex : '"',
             push : [{
                 token : "constant.language.escape",
@@ -95,7 +95,7 @@ var ShHighlightRules = function() {
                 token : "keyword.operator",
                 regex : /`/ // TODO highlight `
             }, {
-                token : "string",
+                token : "string.end",
                 regex : '"',
                 next: "pop"
             }, {

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2576",
+    "version": "3.1.2593",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -37,7 +37,7 @@
         "tern_from_ts": "git://github.com/cloud9ide/tern_from_ts.git#84d51dcb9b16b126a206789d4d4237cde2801fe4",
         "through": "2.2.0",
         "tmp": "~0.0.20",
-        "uglify-js": "2.4.16",
+        "uglify-js": "^2.6.2",
         "ws": "0.4.31",
         "read": "~1.0.5",
         "form-data": "~0.2.0",
@@ -67,7 +67,7 @@
         "c9.ide.language.javascript.immediate": "#c8b1e5767a",
         "c9.ide.language.javascript.eslint": "#4de5457db1",
         "c9.ide.language.javascript.tern": "#64ab01f271",
-        "c9.ide.language.javascript.infer": "#18acb93a3a",
+        "c9.ide.language.javascript.infer": "#69fbc134d6",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
         "c9.ide.collab": "#cfbf987438",
@@ -75,7 +75,7 @@
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#bd34c29373",
         "c9.ide.find.replace": "#810ebf8bfb",
-        "c9.ide.run.debug": "#94a48978bf",
+        "c9.ide.run.debug": "#317feee072",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",
@@ -92,7 +92,7 @@
         "c9.ide.format": "#5ec97fb083",
         "c9.ide.help.support": "#932fbb3743",
         "c9.ide.imgeditor": "#612e75ef4f",
-        "c9.ide.immediate": "#0e0c18066c",
+        "c9.ide.immediate": "#76c8e3213a",
         "c9.ide.installer": "#b2e4ba0a92",
         "c9.ide.language.python": "#aff0772c78",
         "c9.ide.language.go": "#6ce1c7a7ef",
@@ -104,7 +104,7 @@
         "c9.ide.preview.browser": "#897177be7f",
         "c9.ide.preview.markdown": "#c3174d86e0",
         "c9.ide.pubsub": "#99b7289040",
-        "c9.ide.readonly": "#cfd951ec16",
+        "c9.ide.readonly": "#7421caab61",
         "c9.ide.recentfiles": "#7c099abf40",
         "c9.ide.remote": "#301d2ab519",
         "c9.ide.processlist": "#2b12cd1bdd",

plugins/c9.ide.layout.classic/themes/flat-dark.less

@@ -1,7 +1,7 @@
 @import "plugins/c9.ide.layout.classic/themes/flat-light.less";
 
 .bartools .c9-toolbarbutton-glossyOver{
-    background: #E6E6E6;
+    background: #303130;
 }
 
 .bartools .c9-toolbarbutton-glossymenuDown{
@@ -221,4 +221,4 @@
 
 @media print, (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx) {
     
-}
+}