From bf58ad61e57adcb9ec83af83c030420f1a84973e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 28 Mar 2011 19:59:35 +0000
Subject: [PATCH] Load scripts and css for wiki formatter toolbar when needed.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5239 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/layouts/base.rhtml                  |  1 -
 lib/redmine/wiki_formatting/textile/helper.rb | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 7e9e4e1e..c6822146 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -11,7 +11,6 @@
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= heads_for_theme %>
-<%= heads_for_wiki_formatter %>
 <!--[if IE 6]>
     <style type="text/css">
       * html body{ width: expression( document.documentElement.clientWidth < 900 ? '900px' : '100%' ); }
diff --git a/lib/redmine/wiki_formatting/textile/helper.rb b/lib/redmine/wiki_formatting/textile/helper.rb
index d6d779af..639e1592 100644
--- a/lib/redmine/wiki_formatting/textile/helper.rb
+++ b/lib/redmine/wiki_formatting/textile/helper.rb
@@ -20,6 +20,7 @@ module Redmine
     module Textile
       module Helper
         def wikitoolbar_for(field_id)
+          heads_for_wiki_formatter
           # Is there a simple way to link to a public resource?
           url = "#{Redmine::Utils.relative_url_root}/help/wiki_syntax.html"
           
@@ -35,11 +36,15 @@ module Redmine
         end
       
         def heads_for_wiki_formatter
-          @@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')
+          unless @heads_for_wiki_formatter_included
+            content_for :header_tags do
+              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
+            @heads_for_wiki_formatter_included = true
+          end
         end
       end
     end
-- 
2.11.0