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
2012-07-28 15:58:54 +00:00 · 2012-07-28 15:58:54 +00:00 · a7a0d47f2e
parent 93a65c3c82
commit a7a0d47f2e
2 changed files with 2 additions and 2 deletions
--- 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
--- a/public/javascripts/jstoolbar/jstoolbar-textile.min.js
+++ b/public/javascripts/jstoolbar/jstoolbar-textile.min.js