From ec280913b22e60a5396636893fd9a185c458c54e Mon Sep 17 00:00:00 2001
From: M Smart <mina.smart@thescore.com>
Date: Tue, 22 Jul 2014 19:46:43 -0400
Subject: [PATCH 1/2] Enumerate deferred scripts with a sprockets helper

---
 .../common/_discourse_javascript.html.erb     |  6 +-----
 .../deferred_javascripts_helper.rb            | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 config/initializers/deferred_javascripts_helper.rb

diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index ed417bba16b..8b26e916b16 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -1,11 +1,7 @@
 <script>
   window.assetPath = (function(){
 
-    // TODO: automate this to grab from the manifest, Rails voodoo should be able to get it
-    var map = {
-      'defer/html-sanitizer-bundle': <%= asset_path('defer/html-sanitizer-bundle.js').inspect.html_safe %>,
-      'defer/google_diff_match_patch': <%= asset_path('defer/google_diff_match_patch.js').inspect.html_safe %>
-    };
+    var map = <%= deferred_javascripts %>;
 
     return function(asset){ return map[asset]; };
   })();
diff --git a/config/initializers/deferred_javascripts_helper.rb b/config/initializers/deferred_javascripts_helper.rb
new file mode 100644
index 00000000000..ae4f963cecf
--- /dev/null
+++ b/config/initializers/deferred_javascripts_helper.rb
@@ -0,0 +1,20 @@
+module DeferredJavascriptsHelper
+
+  # Provides a javascript map of the files in the 'defer' directory
+  def deferred_javascripts
+    files = {}
+
+    Dir.glob("#{Rails.root}/app/assets/javascripts/defer/*.js").each do |file|
+      module_name = "defer/#{File.basename(file, '.js')}"
+      file_name = asset_path("defer/#{File.basename(file)}")
+      files[module_name] = file_name
+    end
+
+    return files.to_json.html_safe
+  end
+
+end
+
+module Sprockets::Rails::Helper
+  include DeferredJavascriptsHelper
+end

From 0d9e2b5df52bd34df26e29565f21654b58bfe78f Mon Sep 17 00:00:00 2001
From: M Smart <mina.smart@thescore.com>
Date: Tue, 22 Jul 2014 20:14:57 -0400
Subject: [PATCH 2/2] Move the scripts helper into a better place.

---
 .../helpers/deferred_scripts_helper.rb                    | 8 ++------
 app/views/common/_discourse_javascript.html.erb           | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename config/initializers/deferred_javascripts_helper.rb => app/helpers/deferred_scripts_helper.rb (73%)

diff --git a/config/initializers/deferred_javascripts_helper.rb b/app/helpers/deferred_scripts_helper.rb
similarity index 73%
rename from config/initializers/deferred_javascripts_helper.rb
rename to app/helpers/deferred_scripts_helper.rb
index ae4f963cecf..66c42fdd105 100644
--- a/config/initializers/deferred_javascripts_helper.rb
+++ b/app/helpers/deferred_scripts_helper.rb
@@ -1,7 +1,7 @@
-module DeferredJavascriptsHelper
+module DeferredScriptsHelper
 
   # Provides a javascript map of the files in the 'defer' directory
-  def deferred_javascripts
+  def deferred_scripts
     files = {}
 
     Dir.glob("#{Rails.root}/app/assets/javascripts/defer/*.js").each do |file|
@@ -14,7 +14,3 @@ module DeferredJavascriptsHelper
   end
 
 end
-
-module Sprockets::Rails::Helper
-  include DeferredJavascriptsHelper
-end
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index 8b26e916b16..77f0c14c155 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -1,7 +1,7 @@
 <script>
   window.assetPath = (function(){
 
-    var map = <%= deferred_javascripts %>;
+    var map = <%= deferred_scripts %>;
 
     return function(asset){ return map[asset]; };
   })();