Merge remote-tracking branch 'origin/master' into fix-worker

node_modules/architect/architect.js

@@ -277,11 +277,9 @@ else (function () {
         });
     }
 
-    function resolveConfig(config, base, callback) {
-        if (typeof base == "function") {
-            callback = base;
-            base     = "";
-        }
+    function resolveConfig(config, base, callback, errback) {
+        if (typeof base == "function")
+            return resolveConfig(config, "", arguments[1], arguments[2]);
         
         var paths = [], pluginIndexes = {};
         config.forEach(function (plugin, index) {
@@ -306,7 +304,7 @@ else (function () {
                 plugin.consumes = module.consumes || [];
             });
             callback(null, config);
-        });
+        }, errback);
     }
 }());
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.878",
+    "version": "3.1.886",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -55,17 +55,17 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#a027ffa8d6",
-        "c9.ide.language.css": "#36150db526",
-        "c9.ide.language.generic": "#365368d108",
-        "c9.ide.language.html": "#e7b5ab7ff8",
+        "c9.ide.language": "#9374163ea5",
+        "c9.ide.language.css": "#be07d72209",
+        "c9.ide.language.generic": "#2b5cc6275e",
+        "c9.ide.language.html": "#9be847c0ce",
         "c9.ide.language.html.diff": "#24f3608d26",
-        "c9.ide.language.javascript": "#1fd30cdf38",
-        "c9.ide.language.javascript.immediate": "#3e4f50e694",
-        "c9.ide.language.javascript.eslint": "#b3a4891ca7",
-        "c9.ide.language.javascript.tern": "#a70b174dd2",
-        "c9.ide.language.javascript.infer": "#8d2f248e33",
-        "c9.ide.language.jsonalyzer": "#2ebf2b73d6",
+        "c9.ide.language.javascript": "#1a0b1584c2",
+        "c9.ide.language.javascript.immediate": "#c8b1e5767a",
+        "c9.ide.language.javascript.eslint": "#586becb51d",
+        "c9.ide.language.javascript.tern": "#b03b4dc50b",
+        "c9.ide.language.javascript.infer": "#001fe08ecb",
+        "c9.ide.language.jsonalyzer": "#1454bd1ed7",
         "c9.ide.collab": "#10c224f9b8",
         "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": "#ed39fb324b",
+        "c9.ide.language.python": "#85edff7f88",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

plugins/c9.vfs.standalone/views/standalone.html.ejs

@@ -109,8 +109,11 @@
                     if (window.hideLoader)
                         window.hideLoader();
                 }
+            }, function loadError(mod) {
+                if (mod.id === "plugins/c9.ide.clipboard/html5")
+                    return alert("Unable to load html5.js.\n\nThis may be caused by a false positive in your virus scanner. Please try reloading with ?packed=1 added to the URL.");
             });
         });
     </script>
 </body>
-</html>
+</html>