lib/merb/mixins/responder_mixin.rb in merb-0.0.7 vs lib/merb/mixins/responder_mixin.rb in merb-0.0.8

@@ -22,10 +22,11 @@
 
       TYPES = { 
         :yaml => %w[application/yaml text/yaml],
         :text => %w[text/plain],
         :html => %w[text/html */* application/html],
-        :xml  => %w[application/xml]
+        :xml  => %w[application/xml],
+        :js   => %w[application/json text/x-json]
       }
 
       def method_missing(method, *args)
         if TYPES[method] && @accept =~ Regexp.union(*TYPES[method])
           @content_type = TYPES[method].first 
\ No newline at end of file