Moves jstoolbar script include tags to head.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5238 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
393df388fc
commit
70d765e906
|
@ -27,9 +27,6 @@ module Redmine
|
|||
link_to(l(:label_help), url,
|
||||
:onclick => "window.open(\"#{ url }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;")
|
||||
|
||||
javascript_include_tag('jstoolbar/jstoolbar') +
|
||||
javascript_include_tag('jstoolbar/textile') +
|
||||
javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") +
|
||||
javascript_tag("var wikiToolbar = new jsToolBar($('#{field_id}')); wikiToolbar.setHelpLink('#{help_link}'); wikiToolbar.draw();")
|
||||
end
|
||||
|
||||
|
@ -38,7 +35,11 @@ module Redmine
|
|||
end
|
||||
|
||||
def heads_for_wiki_formatter
|
||||
stylesheet_link_tag 'jstoolbar'
|
||||
@@heads_for_wiki_formatter ||=
|
||||
javascript_include_tag('jstoolbar/jstoolbar') +
|
||||
javascript_include_tag('jstoolbar/textile') +
|
||||
javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") +
|
||||
stylesheet_link_tag('jstoolbar')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -37,4 +37,13 @@ class LayoutTest < ActionController::IntegrationTest
|
|||
assert_select "#quick-search"
|
||||
end
|
||||
end
|
||||
|
||||
def test_wiki_formatter_header_tags
|
||||
Role.anonymous.add_permission! :add_issues
|
||||
|
||||
get '/projects/ecookbook/issues/new'
|
||||
assert_tag :script,
|
||||
:attributes => {:src => %r{^/javascripts/jstoolbar/textile.js}},
|
||||
:parent => {:tag => 'head'}
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue