summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-28 15:58:54 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-28 15:58:54 +0000
commita7a0d47f2ef7c16a75993eff3790d896e8348fc8 (patch)
treedfcf5a49e0b91c91188ab240505dd5195c798be8 /lib
parent93a65c3c8227b9a5dd6f74c657ac188862b801c5 (diff)
downloadredmine-a7a0d47f2ef7c16a75993eff3790d896e8348fc8.tar.gz
redmine-a7a0d47f2ef7c16a75993eff3790d896e8348fc8.zip
Merged and minified jstoolbar.js and textile.js.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10095 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/wiki_formatting/textile/helper.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/redmine/wiki_formatting/textile/helper.rb b/lib/redmine/wiki_formatting/textile/helper.rb
index 24c621bce..da5788014 100644
--- a/lib/redmine/wiki_formatting/textile/helper.rb
+++ b/lib/redmine/wiki_formatting/textile/helper.rb
@@ -36,8 +36,7 @@ module Redmine
def heads_for_wiki_formatter
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/jstoolbar-textile.min') +
javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") +
stylesheet_link_tag('jstoolbar')
end