From 78159510738c53bad4f91cc1b89e27c862f9ef72 Mon Sep 17 00:00:00 2001
From: Scott Erickson <sderickson@gmail.com>
Date: Fri, 9 May 2014 15:22:23 -0700
Subject: [PATCH] Split out aether from vendor.js. Should help #826.

---
 .../javascripts/workers/aether_worker.js      |  2 +-
 .../javascripts/workers/worker_world.js       |  2 +-
 app/assets/main.html                          |  1 +
 config.coffee                                 | 20 +++++++++++--------
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/workers/aether_worker.js b/app/assets/javascripts/workers/aether_worker.js
index 9fbad8155..65badb459 100644
--- a/app/assets/javascripts/workers/aether_worker.js
+++ b/app/assets/javascripts/workers/aether_worker.js
@@ -1,7 +1,7 @@
 var window = self;
 var Global = self;
 
-importScripts("/javascripts/tome_aether.js");
+importScripts("/javascripts/lodash.js", "/javascripts/aether.js");
 console.log("imported scripts!");
 var aethers = {};
 
diff --git a/app/assets/javascripts/workers/worker_world.js b/app/assets/javascripts/workers/worker_world.js
index b5a156ca7..4b4589e49 100644
--- a/app/assets/javascripts/workers/worker_world.js
+++ b/app/assets/javascripts/workers/worker_world.js
@@ -60,7 +60,7 @@ var console = {
 console.error = console.info = console.log;
 self.console = console;
 
-importScripts('/javascripts/world.js');
+importScripts('/javascripts/world.js', "/javascripts/lodash.js", "/javascripts/aether.js");
 
 // We could do way more from this: http://stackoverflow.com/questions/10653809/making-webworkers-a-safe-environment
 Object.defineProperty(self, "XMLHttpRequest", {
diff --git a/app/assets/main.html b/app/assets/main.html
index 0521041b5..b0fac676c 100644
--- a/app/assets/main.html
+++ b/app/assets/main.html
@@ -34,6 +34,7 @@
   <script src="/lib/ace/ace.js"></script>  
   <!--[if IE 9]>     <script src="/javascripts/vendor_with_box2d.js"></script> <![endif]-->
   <!--[if !IE]><!--> <script src="/javascripts/vendor.js"></script>            <!--<![endif]-->
+  <script src="/javascripts/aether.js"></script>
   <script src="/javascripts/app.js"></script> <!-- it's all Backbone! -->
   
   <script>
diff --git a/config.coffee b/config.coffee
index 27ad5562b..1ce617d76 100644
--- a/config.coffee
+++ b/config.coffee
@@ -22,24 +22,28 @@ exports.config =
           |(app[\/\\]lib[\/\\]utils.coffee)
           |(vendor[\/\\]scripts[\/\\]Box2dWeb-2.1.a.3)
           |(vendor[\/\\]scripts[\/\\]string_score.js)
-          |(bower_components[\/\\]lodash[\/\\]dist[\/\\]lodash.js)
-          |(bower_components[\/\\]aether[\/\\]build[\/\\]aether.js)
         )///
         'javascripts/app.js': /^app/
         'javascripts/vendor.js': ///^(
           vendor[\/\\](?!scripts[\/\\]Box2d)
-          |bower_components
+          |bower_components[\/\\](?!aether)
         )///
         'javascripts/vendor_with_box2d.js': ///^(
           vendor[\/\\]
-          |bower_components  # include box2dweb for profiling (and for IE9...)
+          |bower_components[\/\\](?!aether)  # include box2dweb for profiling (and for IE9...)
         )///
-        'javascripts/tome_aether.js': ///^(
+        'javascripts/lodash.js': ///^(
           (bower_components[\/\\]lodash[\/\\]dist[\/\\]lodash.js)
-          |(bower_components[\/\\]aether[\/\\]build[\/\\]aether.js)
         )///
-        'test/javascripts/test.js': /^test[\/\\](?!vendor)/
-        'test/javascripts/test-vendor.js': /^test[\/\\](?=vendor)/
+        'javascripts/aether.js': ///^(
+          (bower_components[\/\\]aether[\/\\]build[\/\\]aether.js)
+        )///
+#        'javascripts/tome_aether.js': ///^(
+#          (bower_components[\/\\]lodash[\/\\]dist[\/\\]lodash.js)
+#          |(bower_components[\/\\]aether[\/\\]build[\/\\]aether.js)
+#        )///
+#        'test/javascripts/test.js': /^test[\/\\](?!vendor)/
+#        'test/javascripts/test-vendor.js': /^test[\/\\](?=vendor)/
       order:
         before: [
           'bower_components/jquery/dist/jquery.js'