From 7b3fb1d43f57d6ebe3edb75434cae01e140483d0 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Fri, 22 May 2009 17:07:40 -0700
Subject: Got controller/render_js_test.rb to pass on new base

---
 actionpack/lib/action_controller/new_base/base.rb           |  1 +
 actionpack/lib/action_controller/new_base/render_options.rb | 10 ++++++++++
 2 files changed, 11 insertions(+)

(limited to 'actionpack/lib/action_controller/new_base')

diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index e321d97ac1..adb760ea7e 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -12,6 +12,7 @@ module ActionController
     include ActionController::Redirector
     include ActionController::Renderer
     include ActionController::Renderers::Json
+    include ActionController::Renderers::Js
     include ActionController::Renderers::Xml
     include ActionController::Renderers::Rjs
     include ActionController::Layouts
diff --git a/actionpack/lib/action_controller/new_base/render_options.rb b/actionpack/lib/action_controller/new_base/render_options.rb
index 2ce9d0c7ae..33f8957f6e 100644
--- a/actionpack/lib/action_controller/new_base/render_options.rb
+++ b/actionpack/lib/action_controller/new_base/render_options.rb
@@ -62,6 +62,16 @@ module ActionController
       end      
     end
 
+    module Js
+      include RenderOption
+      register_renderer :js
+
+      def _render_js(js, options)
+        response.content_type ||= Mime::JS
+        self.response_body = js
+      end
+    end
+
     module Xml
       include RenderOption
       register_renderer :xml
-- 
cgit v1.2.3