Changeset 1206

Show
Ignore:
Timestamp:
01/08/08 17:27:08 (11 months ago)
Author:
e.@brainspl.at
Message:

small refactoring. you ca˜no longer use .herb .jer or .xerb or rhtml template extensions

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/mixins/render.rb

    r1100 r1206  
    227227        Merb.response_headers[tmpl_fmt].each do |key,value| 
    228228          headers[key.to_s] = value 
    229         end if Merb.response_headers[tmpl_fmt] 
     229        end 
    230230         
    231231      end 

  • trunk/lib/merb/mixins/responder.rb

    r1022 r1206  
    371371       
    372372      TYPES = {} 
    373       RESPONSE_HEADERS = {} 
     373      RESPONSE_HEADERS = Hash.new([]) 
    374374      TRANSFORM_METHODS = {} 
    375375      TRANSFORM_METHOD_DEFAULTS = {} 

  • trunk/lib/merb/template.rb

    r765 r1206  
    2828    # If these are declared inside the template engine then 
    2929    # they will never be found :( 
    30     register_extensions( :Erubis, %w[erb herb jerb rhtml]) 
     30    register_extensions( :Erubis, %w[erb]) 
    3131    register_extensions( :Haml, %w[haml]) 
    3232    register_extensions( :Markaby, %w[mab]) 
    33     register_extensions( :XMLBuilder, %w[builder rxml xerb]) 
     33    register_extensions( :XMLBuilder, %w[builder]) 
    3434     
    3535  end