Merge remote-tracking branch 'origin/master' into localdev

Conflicts: npm-shrinkwrap.json
2015-12-29 08:44:58 +00:00 · 2015-12-29 08:44:58 +00:00 · c280ed8cf0
commit c280ed8cf0
--- a/node_modules/ace/lib/ace/mouse/mouse_handler.js
+++ b/node_modules/ace/lib/ace/mouse/mouse_handler.js
@ -62,8 +62,8 @@ var MouseHandler = function(editor) {
    event.addListener(mouseTarget, "mousemove", this.onMouseMove.bind(this, "mousemove"));
    event.addMultiMouseDownListener([
        mouseTarget,
-        editor.renderer.scrollBarV && editor.renderer.scrollBarV.element,
-        editor.renderer.scrollBarH && editor.renderer.scrollBarH.element,
+        editor.renderer.scrollBarV && editor.renderer.scrollBarV.inner,
+        editor.renderer.scrollBarH && editor.renderer.scrollBarH.inner,
        editor.textInput && editor.textInput.getElement()
    ].filter(Boolean), [400, 300, 250], this, "onMouseEvent");
    event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this, "mousewheel"));
--- a/node_modules/amd-loader/amd-loader.js
+++ b/node_modules/amd-loader/amd-loader.js
@ -15,34 +15,26 @@ module.constructor.prototype._compile = function(content, filename){
 };

 global.define = function (id, injects, factory) {
+    var DEFAULT_INJECTS = ["require", "exports", "module"];

-    // infere the module
+    // infer the module
    var currentModule = moduleStack[moduleStack.length-1];
    var mod = currentModule || module.parent || require.main;
-    
-    // parse arguments
-    if (!factory) {
-        // two or less arguments
+
+    // assign arguments
+    if (arguments.length === 1) {
+        factory = id;
+        injects = DEFAULT_INJECTS;
+        id = null;
+    }
+    else if (arguments.length === 2) {
        factory = injects;
-        if (factory) {
-            // two args
-            if (typeof id === "string") {
-                if (id !== mod.id) {
-                    throw new Error("Can not assign module to a different id than the current file");
-                }
-                // default injects
-                injects = [];
-            }
-            else{
-                // anonymous, deps included
-                injects = id;          
-            }
-        }
-        else {
-            // only one arg, just the factory
-            factory = id;
-            injects = [];
-        }
+        injects = id;
+        id = null;
+    }
+
+    if (typeof id === "string" && id !== mod.id) {
+        throw new Error("Can not assign module to a different id than the current file");
    }

    var req = function(module, relativeId, callback) {
@ -67,8 +59,6 @@ global.define = function (id, injects, factory) {
        } else
            return require(fileName);
    }.bind(this, mod);
-
-    injects.unshift("require", "exports", "module");
    
    id = mod.id;
    if (typeof factory !== "function") {
@ -92,4 +82,4 @@ global.define = function (id, injects, factory) {
        // since AMD encapsulates a function/callback, it can allow the factory to return the exports.
        mod.exports = returned;
    }
-};
+};
--- a/node_modules/c9/scm_url_parse.js
+++ b/node_modules/c9/scm_url_parse.js
@ -5,7 +5,8 @@ define(function(require, exports, module) {
    
    var providers = {
        "bitbucket.org": "bitbucket",
-        "github.com": "github"
+        "github.com": "github",
+        "source.developers.google.com": "google",
    };
    var defaultProvider = "unknown";
    
@ -38,6 +39,9 @@ define(function(require, exports, module) {
                case "github":
                    scm = "git";
                    break;
+                case "google":
+                    scm = "git";
+                    break;
                case "bitbucket": 
                    scm = parsed.pathname.match(/\.git$/) ? "git": "hg";
                    break;
@ -58,4 +62,4 @@ define(function(require, exports, module) {
            return null;
        }
    };
-});
+});
--- a/node_modules/vfs-local/localfs.js
+++ b/node_modules/vfs-local/localfs.js
@ -1837,13 +1837,14 @@ module.exports = function setup(fsOptions) {
                    ";", "set", "-q", "set-titles", "on",
                    ";", "set", "-q", "quiet", "on",
                    ";", "set", "-q", "-g", "prefix", "C-b",
-                    ";", "set", "-q", "-g", "terminal-overrides", "'xterm:colors=256'"
+                    ";", "set", "-q", "-g", "default-terminal", "xterm-256color",
+                    ";", "setw", "-q", "-g", "xterm-keys", "on"
                );
                
                // disable buffering of tmux output
                // old versions of tmux skip parts of output without this flag
                if (parseFloat(TMUXNAME.substr("cloud9".length)) < 2.1)
-                    args.push(";", "setw", "c0-change-trigger", "0");
+                    args.push(";", "setw", "-q", "c0-change-trigger", "0");
                
                if (options.output) {
                    args.push(
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
    "name": "c9",
    "description": "New Cloud9 Client",
-    "version": "3.1.822",
+    "version": "3.1.855",
    "author": "Ajax.org B.V. <info@ajax.org>",
    "private": true,
    "main": "bin/c9",
@ -55,17 +55,17 @@
        "c9"
    ],
    "c9plugins": {
-        "c9.ide.language": "#9bd9e99520",
-        "c9.ide.language.css": "#a649f2a710",
-        "c9.ide.language.generic": "#77d43cfaf0",
-        "c9.ide.language.html": "#0f4078c187",
+        "c9.ide.language": "#c7ae4f890d",
+        "c9.ide.language.css": "#8a77f72326",
+        "c9.ide.language.generic": "#378d8a2127",
+        "c9.ide.language.html": "#d831388dd2",
        "c9.ide.language.html.diff": "#24f3608d26",
-        "c9.ide.language.javascript": "#2b77bdb96a",
-        "c9.ide.language.javascript.immediate": "#0535804ada",
-        "c9.ide.language.javascript.eslint": "#3ec4557969",
-        "c9.ide.language.javascript.tern": "#213b54a899",
-        "c9.ide.language.javascript.infer": "#99cf41f8bc",
-        "c9.ide.language.jsonalyzer": "#492c4b0956",
+        "c9.ide.language.javascript": "#720a876edd",
+        "c9.ide.language.javascript.immediate": "#54173370a8",
+        "c9.ide.language.javascript.eslint": "#a7d10ddf32",
+        "c9.ide.language.javascript.tern": "#c662c32555",
+        "c9.ide.language.javascript.infer": "#5036f68fe6",
+        "c9.ide.language.jsonalyzer": "#794b694ef6",
        "c9.ide.collab": "#30efed939e",
        "c9.ide.local": "#a6e689e33b",
        "c9.ide.find": "#e33fbaed2f",
@ -90,7 +90,7 @@
        "c9.ide.imgeditor": "#612e75ef4f",
        "c9.ide.immediate": "#a962119bec",
        "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#20c876d856",
+        "c9.ide.language.python": "#660b42e3a3",
        "c9.ide.mount": "#befb8188d5",
        "c9.ide.navigate": "#c191d9b92f",
        "c9.ide.newresource": "#981a408a7b",
@ -103,12 +103,12 @@
        "c9.ide.recentfiles": "#7c099abf40",
        "c9.ide.remote": "#301d2ab519",
        "c9.ide.processlist": "#2b12cd1bdd",
-        "c9.ide.run": "#f39a46d09e",
+        "c9.ide.run": "#d37ffe17d5",
        "c9.ide.run.build": "#0598fff697",
        "c9.ide.run.debug.xdebug": "#70aeb327c0",
        "c9.ide.save": "#9461acd953",
        "c9.ide.scm": "#27ac592b33",
-        "c9.ide.terminal.monitor": "#2332e52331",
+        "c9.ide.terminal.monitor": "#e26502f0df",
        "c9.ide.test": "#5b4c724bf6",
        "c9.ide.test.mocha": "#fc053b23d2",
        "c9.ide.theme.flat": "#92cda0fb40",
--- a/plugins/c9.ide.terminal/aceterm/input.js
+++ b/plugins/c9.ide.terminal/aceterm/input.js
@ -3,6 +3,15 @@ define(function(require, exports, module) {
    module.exports = function initInput(ace) {
        var HashHandler = require("ace/keyboard/hash_handler").HashHandler;
        var KEY_MODS = require("ace/lib/keys").KEY_MODS;
+        var TERM_MODS = {
+            "shift-"           : 2,
+            "alt-"             : 3,
+            "alt-shift-"       : 4,
+            "ctrl-"            : 5,
+            "ctrl-shift-"      : 6,
+            "ctrl-alt-"        : 7,
+            "ctrl-alt-shift-"  : 8,
+        };
        var specialKeys = new HashHandler();
        // http://www.math.utah.edu/docs/info/features_7.html
        specialKeys.bindKeys({
@ -19,9 +28,7 @@ define(function(require, exports, module) {
            "Return"            : '\r',
            "Escape"            : '\x1b',
            "Left"              : '\x1b[D',
-            "Ctrl-Left"         : '\x1b[5D',
            "Right"             : '\x1b[C',
-            "Ctrl-Right"        : '\x1b[5C',
            "Up"                : '\x1b[A',
            "Down"              : '\x1b[B',
            "Delete"            : '\x1b[3~',
@ -50,25 +57,25 @@ define(function(require, exports, module) {
            name: "\u001bb" // "alt-b"
        }, {
            bindKey: {win: "Ctrl-right", mac: "Option-right"},
-            name: "\u001bf" //"alt-b"
+            name: "\u001bf" // "alt-b"
        }, {
            bindKey: {win: "Ctrl-Delete", mac: "Option-Delete"},
-            name: "\u001bd" //"alt-d"
+            name: "\u001bd" // "alt-d"
        }, {
            bindKey: {win: "Ctrl-Backspace", mac: "Option-Backspace"},
-            name: "\x1b\x7f" //"alt-backspace"
+            name: "\x1b\x7f" // "alt-backspace"
        }, {
            bindKey: {win: "Ctrl-Delete", mac: "Option-Delete"},
-            name: "\u001bd" //"alt-d"
+            name: "\u001bd" // "alt-d"
        }, {
-            bindKey: {win: "Alt-Backspace", mac: "Ctrl-Backspace"},
-            name: "\u0017" //"ctrl-w"
+            bindKey: {win: "Alt-Backspace|Shift-Backspace", mac: "Ctrl-Backspace|Shift-Backspace"},
+            name: "\u0015" // "ctrl-u"
        }, {
-            bindKey: {win: "Alt-Backspace", mac: "Ctrl-Backspace"},
-            name: "\u0017" //"ctrl-w"
+            bindKey: {win: "Alt-Delete|Shift-Delete", mac: "Ctrl-Delete|Shift-Delete"},
+            name: "\u000b" // "ctrl-k"
        }, {
            bindKey: {win: "Ctrl-z", mac: "Cmd-z"},
-            name: "\u0018\u0015" //"ctrl-x ctrl-u"
+            name: "\u0018\u0015" // "ctrl-x ctrl-u"
        }];
        
        specialKeys.addCommands(aliases);
@ -130,7 +137,11 @@ define(function(require, exports, module) {
            }
            if (term.applicationKeypad) {
                if (applicationKeys[keyString]) {
-                    this.send(applicationKeys[keyString]);
+                    var mod = TERM_MODS[KEY_MODS[hashId]];
+                    var str = applicationKeys[keyString];
+                    if (mod)
+                        str = "\u001b[1;" + mod + str.slice(-1);
+                    this.send(str);
                    return {command: "null"};
                }
            }
--- a/plugins/c9.static/build.js
+++ b/plugins/c9.static/build.js
@ -264,9 +264,9 @@ function main(options, imports, register) {
                "plugins/c9.ide.language.javascript.infer/infer_jumptodef",
                "plugins/c9.ide.language.javascript.infer/infer_tooltip",
                "plugins/c9.ide.language.javascript.infer/infer_completer",
-                "plugins/c9.ide.language.python/worker/python_worker",
-                "plugins/c9.ide.language.python/worker/python_jsonalyzer_worker",
-                "plugins/c9.ide.language.python/server/python_jsonalyzer_server_worker",
+                "plugins/c9.ide.language.python/worker/python_linter",
+                "plugins/c9.ide.language.python/worker/python_completer",
+                "plugins/c9.ide.language.python/worker/python_jsonalyzer",
                "plugins/c9.ide.language.html/html_completer",
                "plugins/c9.ide.language.css/css_handler",
                "plugins/c9.ide.language.javascript.tern/worker/tern_worker",