diff --git a/node_modules/architect/architect.js b/node_modules/architect/architect.js index 59d552b2..de683671 100644 --- a/node_modules/architect/architect.js +++ b/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); } }()); diff --git a/plugins/c9.vfs.standalone/views/standalone.html.ejs b/plugins/c9.vfs.standalone/views/standalone.html.ejs index cc280dc2..cfdfbe85 100644 --- a/plugins/c9.vfs.standalone/views/standalone.html.ejs +++ b/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."); }); }); - \ No newline at end of file +