| @@ -27,9 +27,6 module Redmine | |||||
| 27 | link_to(l(:label_help), url, |
|
27 | link_to(l(:label_help), url, | |
| 28 | :onclick => "window.open(\"#{ url }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;") |
|
28 | :onclick => "window.open(\"#{ url }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;") | |
| 29 |
|
29 | |||
| 30 | javascript_include_tag('jstoolbar/jstoolbar') + |
|
|||
| 31 | javascript_include_tag('jstoolbar/textile') + |
|
|||
| 32 | javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") + |
|
|||
| 33 | javascript_tag("var wikiToolbar = new jsToolBar($('#{field_id}')); wikiToolbar.setHelpLink('#{help_link}'); wikiToolbar.draw();") |
|
30 | javascript_tag("var wikiToolbar = new jsToolBar($('#{field_id}')); wikiToolbar.setHelpLink('#{help_link}'); wikiToolbar.draw();") | |
| 34 | end |
|
31 | end | |
| 35 |
|
32 | |||
| @@ -38,7 +35,11 module Redmine | |||||
| 38 | end |
|
35 | end | |
| 39 |
|
36 | |||
| 40 | def heads_for_wiki_formatter |
|
37 | def heads_for_wiki_formatter | |
| 41 | stylesheet_link_tag 'jstoolbar' |
|
38 | @@heads_for_wiki_formatter ||= | |
|
|
39 | javascript_include_tag('jstoolbar/jstoolbar') + | |||
|
|
40 | javascript_include_tag('jstoolbar/textile') + | |||
|
|
41 | javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") + | |||
|
|
42 | stylesheet_link_tag('jstoolbar') | |||
| 42 | end |
|
43 | end | |
| 43 | end |
|
44 | end | |
| 44 | end |
|
45 | end | |
| @@ -37,4 +37,13 class LayoutTest < ActionController::IntegrationTest | |||||
| 37 | assert_select "#quick-search" |
|
37 | assert_select "#quick-search" | |
| 38 | end |
|
38 | end | |
| 39 | end |
|
39 | end | |
|
|
40 | ||||
|
|
41 | def test_wiki_formatter_header_tags | |||
|
|
42 | Role.anonymous.add_permission! :add_issues | |||
|
|
43 | ||||
|
|
44 | get '/projects/ecookbook/issues/new' | |||
|
|
45 | assert_tag :script, | |||
|
|
46 | :attributes => {:src => %r{^/javascripts/jstoolbar/textile.js}}, | |||
|
|
47 | :parent => {:tag => 'head'} | |||
|
|
48 | end | |||
| 40 | end |
|
49 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now