Merge branch 'master' into routing

[rails.git] / config / initializers / assets.rb

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 209eaabf4c0789df3e76f1e63527ba211cee70a9..ef7efcbb95fd8b254192a080cf0c332e5b3971ed 100644 (file)
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -3,16 +3,21 @@
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 Rails.application.config.assets.precompile += %w( index.js browse.js welcome.js fixthemap.js )
-Rails.application.config.assets.precompile += %w( user.js diary_entry.js swfobject.js )
+Rails.application.config.assets.precompile += %w( user.js diary_entry.js )
+Rails.application.config.assets.precompile += %w( routing.js )
 Rails.application.config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
 Rails.application.config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
 Rails.application.config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )
 Rails.application.config.assets.precompile += %w( embed.js embed.css )
 Rails.application.config.assets.precompile += %w( html5shiv.js )
 Rails.application.config.assets.precompile += %w( images/marker-*.png img/*-handle.png )
+Rails.application.config.assets.precompile += %w( swfobject.js expressInstall.swf )
 Rails.application.config.assets.precompile += %w( potlatch2.swf )
 Rails.application.config.assets.precompile += %w( potlatch2/assets.zip )
 Rails.application.config.assets.precompile += %w( potlatch2/FontLibrary.swf )