From 15c5f5b84019f5e73ab815df2c107b8cf776d60b Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Wed, 20 Feb 2013 17:00:24 +1100 Subject: [PATCH] grrrrr asset pipeline hates me --- app/views/common/_discourse_javascript.html.erb | 1 - config/application.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb index d804667feef..8d09b2a0159 100644 --- a/app/views/common/_discourse_javascript.html.erb +++ b/app/views/common/_discourse_javascript.html.erb @@ -3,7 +3,6 @@ // 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').inspect.html_safe %> }; var assetPath = function(asset){ diff --git a/config/application.rb b/config/application.rb index 36b538dcfa3..30076578ec1 100644 --- a/config/application.rb +++ b/config/application.rb @@ -30,7 +30,7 @@ module Discourse config.assets.paths += %W(#{config.root}/config/locales) config.assets.precompile += [ - 'admin.js', 'admin.css', 'shiny/shiny.css', 'preload_store.js', 'jquery.js', 'defer/html-sanitizer-bundle.js' + 'admin.js', 'admin.css', 'shiny/shiny.css', 'preload_store.js', 'jquery.js' #, 'defer/html-sanitizer-bundle.js' ] # Activate observers that should always be running.