Changeset 368

Show
Ignore:
Timestamp:
08/01/07 15:11:21 (1 year ago)
Author:
e.@brainspl.at
Message:

removing stateful mixin. This kind of stuff belongs in plugins

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/merb_controller.rb

    r366 r368  
    2020    include Merb::ControllerMixin 
    2121    include Merb::ResponderMixin 
    22     extend Merb::StatefulMixin 
    2322    
    2423    class << self 

  • trunk/lib/merb/merb_dispatcher.rb

    r366 r368  
    2626       
    2727        klass = resolve_controller(route[:controller]) 
    28         controller= klass.build(request.body, request.params, route, response) 
     28        controller = klass.build(request.body, request.params, route, response) 
    2929       
    3030        if rest 

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

    r355 r368  
    107107          @_merb_partial_locals = opts[:locals] 
    108108        end 
    109         opts[:clean_context] = true 
     109        #opts[:clean_context] = true 
    110110      when js = opts[:js] 
    111111        headers['Content-Type'] = "text/javascript" 
    …… 
    127127          return xml 
    128128        when Symbol 
    129           template = find_template(:action => xml, :ext => 'xerb') 
    130         else 
    131           template = find_template(:action => action, :ext => 'xerb') 
     129          template = find_template(:action => xml, :ext => 'rxml,xerb,builder') 
     130        else 
     131          template = find_template(:action => action, :ext => 'rxml,xerb,builder') 
    132132        end 
    133133      when template = opts[:template] 

  • trunk/lib/merb/template/erubis.rb

    r270 r368  
    55    # Your template must end in .herb (HTML and ERb), .jerb (JavaScript ERb), .erb (Embedded Ruby), or .rhtml (Ruby HTML) for Merb to use it. 
    66    module Erubis 
    7       ::Merb::AbstractController.register_engine self, %w[ herb jerb erb rhtml ] 
     7      ::Merb::AbstractController.register_engine self, %w[ herb jerb erb rhtml html.erb js.erb ] 
    88      class << self 
    99