Changeset 8956

Timestamp:

02/29/08 18:09:23 (4 months ago)

Author:

david

Message:

Added that requests with JavaScript as the priority mime type in the accept header and no format extension in the parameters will be treated as though their format was :js when it comes to determining which template to render. This makes it possible for JS requests to automatically render action.js.rjs files without an explicit respond_to block [DHH]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/base.rb (modified) (1 diff)
• trunk/actionpack/test/controller/new_render_test.rb (modified) (1 diff)
• trunk/actionpack/test/fixtures/test/greeting.js.rjs (added)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added that requests with JavaScript as the priority mime type in the accept header and no format extension in the parameters will be treated as though their format was :js when it comes to determining which template to render. This makes it possible for JS requests to automatically render action.js.rjs files without an explicit respond_to block  [DHH]
-
-* Tests for distance_of_time_in_words with TimeWithZone instances. Closes #10914 [ernesto.jimenez]

trunk/actionpack/lib/action_view/base.rb

@@ -345 +345 @@
-
-    # symbolized version of the :format parameter of the request, or :html by default.
+    #
+    # EXCEPTION: If the :format parameter is not set, the Accept header will be examined for
+    # whether it contains the JavaScript mime type as its first priority. If that's the case,
+    # it will be used. This ensures that Ajax applications can use the same URL to support both
+    # JavaScript and non-JavaScript users.
-    def template_format
-      return @template_format if @template_format
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    end
-

trunk/actionpack/test/controller/new_render_test.rb

@@ -551 +551 @@
-  end
-
+  def test_render_with_default_from_accept_header
+    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    get :greeting
+    assert_equal "$(\"body\").visualEffect(\"highlight\");", @response.body
+  end
+
-  def test_render_rjs_with_default
-    get :delete_with_js