Changeset 1151

Show
Ignore:
Timestamp:
01/02/08 23:34:54 (11 months ago)
Author:
wyca..@gmail.com
Message:

Closes #307; Haml and other partials now reload

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/server.rb

    r1148 r1151  
    364364        # First we collect all files in the project (this will also grab newly added files) 
    365365        project_files = MERB_PATHS.map { |path| Dir[@@merb_opts[:merb_root] + path] }.flatten.uniq 
    366         erb_partials = template_paths("_*.erb").map { |path| Dir[path] }.flatten.uniq 
    367         project_mtime = max_mtime(project_files + erb_partials) # Latest changed time of all project files 
     366        partials = template_paths("_*.*").map { |path| Dir[path] }.flatten.uniq 
     367        project_mtime = max_mtime(project_files + partials) # Latest changed time of all project files 
    368368 
    369369        return if @mtime.nil? || @mtime >= project_mtime   # Only continue if a file has changed