Merge pull request +11019 from c9/error-html5

Show error when html5.js can't be loaded

node_modules/architect/architect.js

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

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>