Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

grrrrr asset pipeline hates me

This commit is contained in:
Sam Saffron 2013-02-20 17:00:24 +11:00
parent ea7b97be34
commit 15c5f5b840
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/common/_discourse_javascript.html.erb
View File

@ -3,7 +3,6 @@
// TODO: automate this to grab from the manifest, Rails voodoo should be able to get it // TODO: automate this to grab from the manifest, Rails voodoo should be able to get it
var map = { var map = {
'defer/html-sanitizer-bundle': <%= asset_path('defer/html-sanitizer-bundle').inspect.html_safe %>
}; };
var assetPath = function(asset){ var assetPath = function(asset){

2
config/application.rb
View File

@ -30,7 +30,7 @@ module Discourse
config.assets.paths += %W(#{config.root}/config/locales) config.assets.paths += %W(#{config.root}/config/locales)
config.assets.precompile += [ 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. # Activate observers that should always be running.