Merge commit 'bac8667fb4d0103b975dacc261ed1da08f455e49' into no_rails_integration

This commit is contained in:
Chris Eppstein 2012-01-30 21:07:10 -08:00
commit e3d50c19e5
2 changed files with 13 additions and 5 deletions

View File

@ -174,10 +174,13 @@ You may also see some real manifest files here:
### Manifest Declarations ### Manifest Declarations
**Easy Mode:** If you just have some basic files and nothing fancy going on, simply place this line in your manifest: **Easy Mode:** If you just have some basic files and nothing fancy going on, simply place this line in your manifest:
discover :all discover :all
If the file is missing `discover :all` is the default
This will cause compass to find all the files in your template and use the files' extension to determine where they should go. Alternatively, you can request that compass only discover files of a certain type. For example, the following will only discover javascript and image assets, you could then declare other file types on your own. This will cause compass to find all the files in your template and use the files' extension to determine where they should go. Alternatively, you can request that compass only discover files of a certain type. For example, the following will only discover javascript and image assets, you could then declare other file types on your own.
discover :javascripts discover :javascripts

View File

@ -141,11 +141,16 @@ module Compass
# evaluated in a Manifest instance context # evaluated in a Manifest instance context
def parse(manifest_file) def parse(manifest_file)
with_manifest(manifest_file) do with_manifest(manifest_file) do
if File.exists?(manifest_file)
open(manifest_file) do |f| open(manifest_file) do |f|
eval(f.read, instance_binding, manifest_file) eval(f.read, instance_binding, manifest_file)
end end
else
eval("discover :all", instance_binding, manifest_file)
end end
end end
end
def instance_binding def instance_binding
binding binding