Rename the wiki toolbar's JavaScript variable, 'toolbar' conflicts with

the browser's variable.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2927 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/wiki_formatting/textile/helper.rb b/lib/redmine/wiki_formatting/textile/helper.rb
index c4bde572bc3be4f60907dbce5577d2fa8a6942e2..397206b5a3304c70699e18520046335efc7bcab4 100644 (file)
--- a/lib/redmine/wiki_formatting/textile/helper.rb
+++ b/lib/redmine/wiki_formatting/textile/helper.rb
@@ -30,7 +30,7 @@ module Redmine
           javascript_include_tag('jstoolbar/jstoolbar') +
             javascript_include_tag('jstoolbar/textile') +
             javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language}") +
-          javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.setHelpLink('#{help_link}'); toolbar.draw();")
+          javascript_tag("var wikiToolbar = new jsToolBar($('#{field_id}')); wikiToolbar.setHelpLink('#{help_link}'); wikiToolbar.draw();")
         end
       
         def initial_page_content(page)