Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 8368

Show
Ignore:
Timestamp:
12/10/07 09:12:50 (7 months ago)
Author:
bitsweat
Message:

Fix javascript_tag method name collision. Closes #10337.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/CHANGELOG

    r8366 r8368  
    11*SVN* 
    22 
    3 * Ensure asset cache directories are automatically created.  #10337 [Josh Peek] 
     3* Ensure asset cache directories are automatically created.  #10337 [Josh Peek, Chu Yeow] 
    44 
    55* render :xml and :json preserve custom content types.  #10388 [jmettraux, Chu Yeow] 

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

    r8366 r8368  
    203203 
    204204          write_asset_file_contents(joined_javascript_path, compute_javascript_paths(sources)) 
    205           javascript_tag(joined_javascript_name, options) 
     205          javascript_src_tag(joined_javascript_name, options) 
    206206        else 
    207           expand_javascript_sources(sources).collect { |source| javascript_tag(source, options) }.join("\n") 
     207          expand_javascript_sources(sources).collect { |source| javascript_src_tag(source, options) }.join("\n") 
    208208        end 
    209209      end 
    …… 
    462462        end 
    463463 
    464         def javascript_tag(source, options) 
     464        def javascript_src_tag(source, options) 
    465465          content_tag("script", "", { "type" => Mime::JS, "src" => path_to_javascript(source) }.merge(options)) 
    466466        end