Changeset 7970

Timestamp:

10/19/07 00:52:55 (2 years ago)

Author:

nzkoz

Message:

Rename image_path path_to_image to avoid conflicting with named routes. Closes #9924 [gbuesing]

Files:

• trunk/actionpack/lib/action_view/helpers/asset_tag_helper.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_view/helpers/form_tag_helper.rb (modified) (1 diff)
• trunk/actionpack/test/template/asset_tag_helper_test.rb (modified) (1 diff)

trunk/actionpack/lib/action_view/helpers/asset_tag_helper.rb

@@ -327 +327 @@
-        compute_public_path(source, 'images')
-      end
+      alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
-
-      # Returns an html image tag for the +source+. The +source+ can be a full
@@ -357 +358 @@
-        options.symbolize_keys!
-
-image_path
+path_to_image
-        options[:alt] ||= File.basename(options[:src], '.*').split('.').first.capitalize
-

trunk/actionpack/lib/action_view/helpers/form_tag_helper.rb

@@ -362 +362 @@
-      #   # => <input class="agree-disagree-button" disabled="disabled" src="/images/agree.png" type="image" />
-      def image_submit_tag(source, options = {})
-image_path
+path_to_image
-      end
-

trunk/actionpack/test/template/asset_tag_helper_test.rb

@@ -159 +159 @@
-  end
-  
+  def test_path_to_image_alias_for_image_path
+    ImagePathToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+  end
+
-  def test_image_tag
-    ImageLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }