From 17e979bf3fed455f6a66252f0dde1da603dfb366 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Wed, 9 Dec 2015 09:14:54 +0000
Subject: [PATCH] Show error when html5.js can't be loaded

---
 node_modules/architect/architect.js                 | 10 ++++------
 package.json                                        |  1 +
 plugins/c9.vfs.standalone/views/standalone.html.ejs |  3 +++
 3 files changed, 8 insertions(+), 6 deletions(-)

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/package.json b/package.json
index 343bb108..6cbc61dc 100644
--- a/package.json
+++ b/package.json
@@ -90,6 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
+        "c9.ide.language.python": "#undefined",
         "c9.ide.mount": "#b9a5a2d45c",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",
diff --git a/plugins/c9.vfs.standalone/views/standalone.html.ejs b/plugins/c9.vfs.standalone/views/standalone.html.ejs
index cc280dc2..7a9e3811 100644
--- a/plugins/c9.vfs.standalone/views/standalone.html.ejs
+++ b/plugins/c9.vfs.standalone/views/standalone.html.ejs
@@ -109,6 +109,9 @@
                     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 ?unpacked=1 added to the URL.");
             });
         });
     </script>