From 9790233dfda048f80bf5bb4ffe8b89c04723c9aa Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 14 Mar 2005 00:18:12 +0000
Subject: Moved image_tag to AssetTagHelper

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@899 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 .../lib/action_view/helpers/asset_tag_helper.rb    | 25 +++++++++++++++++++++
 actionpack/lib/action_view/helpers/tag_helper.rb   | 26 ----------------------
 2 files changed, 25 insertions(+), 26 deletions(-)

(limited to 'actionpack/lib/action_view/helpers')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 2f3bd71d5a..6328ff6f71 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -54,6 +54,31 @@ module ActionView
           tag("link", "rel" => "Stylesheet", "type" => "text/css", "media" => "screen", "href" => source)
         }.join("\n")
       end
+
+      # Returns an image tag converting the +options+ instead html options on the tag, but with these special cases:
+      #
+      # * <tt>:alt</tt>  - If no alt text is given, the file name part of the +src+ is used (capitalized and without the extension)
+      # * <tt>:size</tt> - Supplied as "XxY", so "30x45" becomes width="30" and height="45"
+      #
+      # The +src+ can be supplied as a...
+      # * full path, like "/my_images/image.gif"
+      # * file name, like "rss.gif", that gets expanded to "/images/rss.gif"
+      # * file name without extension, like "logo", that gets expanded to "/images/logo.png"
+      def image_tag(src, options = {})
+        options.symbolize_keys
+
+        options.update({ :src => src.include?("/") ? src : "/images/#{src}" })
+        options[:src] += ".png" unless options[:src].include?(".")
+
+        options[:alt] ||= src.split("/").last.split(".").first.capitalize
+        
+        if options[:size]
+          options[:width], options[:height] = options[:size].split("x")
+          options.delete :size
+        end
+
+        tag("img", options)
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index eb8af0c098..895a44eab5 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -22,32 +22,6 @@ module ActionView
         "<#{name}#{tag_options(options)}>#{content}</#{name}>"
       end
 
-
-      # Returns an image tag converting the +options+ instead html options on the tag, but with these special cases:
-      #
-      # * <tt>:alt</tt>  - If no alt text is given, the file name part of the +src+ is used (capitalized and without the extension)
-      # * <tt>:size</tt> - Supplied as "XxY", so "30x45" becomes width="30" and height="45"
-      #
-      # The +src+ can be supplied as a...
-      # * full path, like "/my_images/image.gif"
-      # * file name, like "rss.gif", that gets expanded to "/images/rss.gif"
-      # * file name without extension, like "logo", that gets expanded to "/images/logo.png"
-      def image_tag(src, options = {})
-        options.symbolize_keys
-  
-        options.update({ :src => src.include?("/") ? src : "/images/#{src}" })
-        options[:src] += ".png" unless options[:src].include?(".")
-
-        options[:alt] ||= src.split("/").last.split(".").first.capitalize
-        
-        if options[:size]
-          options[:width], options[:height] = options[:size].split("x")
-          options.delete :size
-        end
-
-        tag("img", options)
-      end
-
       private
         def tag_options(options)
           unless options.empty?
-- 
cgit v1.2.3