Fix load order of xhr

humphd · Apr 4, 2014 · 4d72468 · 4d72468
1 parent 5c13b22
commit 4d72468
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main.js b/src/main.js
@@ -7,7 +7,7 @@ requirejs.config({
   }
 });
 
-requirejs(['filer', 'webserver', 'xhr'], function(Filer, WebServer) {
+requirejs(['filer', 'webserver'], function(Filer, WebServer) {
   var Path = Filer.Path;
 
   function install(file) {
@@ -89,7 +89,11 @@ requirejs(['filer', 'webserver', 'xhr'], function(Filer, WebServer) {
     // Case 3: a path was given into the web root, try to serve it.
     // Strip any server added trailing slash (unless we have '/').
     var url = option === '/' ? option : option.replace(/\/$/, '');
-    WebServer.serve(url);
+
+    // We need to swap out the XHR implementation when loading from the filesystem
+    require(['xhr'], function() {
+      WebServer.serve(url);
+    });
   }
 
   boot();