diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-04-07 13:22:01 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-04-07 13:22:01 +0100 |
| commit | 39a69a0626c55331ae827b5967bfb8927dd7a1a7 (patch) | |
| tree | bd0d157efd025d16410992b054b0af2ef97afa23 /config/application.rb | |
| parent | 715643868b8c198e0310c596c9cb0972cde9f947 (diff) | |
| parent | e6d9a0ecdf291ea2f68b9e65781537bfda59ee1c (diff) | |
Merge branch 'issues/1360-fancybox' into rails-3-develop
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/application.rb b/config/application.rb index 6b7d1b976..a944af928 100644 --- a/config/application.rb +++ b/config/application.rb @@ -92,16 +92,16 @@ module Alaveteli # Change the path that assets are served from # config.assets.prefix = "/assets" - # These additional precompiled Javascript files are actually - # manifests that require the real javascript files: + # These additional precompiled asset files are actually + # manifests that require the real asset files: config.assets.precompile += ['admin.js', 'profile-photos.js', - 'stats.js'] + 'stats.js', + 'fancybox.css', + 'fancybox.js'] # ... while these are individual files that can't easily be # grouped: - config.assets.precompile += ['jquery.fancybox-1.3.4.pack.js', - 'jquery.fancybox-1.3.4.css', - 'jquery.Jcrop.css', + config.assets.precompile += ['jquery.Jcrop.css', 'excanvas.min.js', 'select-authorities.js', 'jquery_ujs.js', |