always include the jstoolbar css and js. but keep loading the correct locale file conditionally.

app/assets/javascripts/application.js

@@ -23,6 +23,7 @@
 //= require breadcrumb
 //= require chosen
 //= require context_menu
+//= require jstoolbar
 
 //source: http://stackoverflow.com/questions/8120065/jquery-and-prototype-dont-work-together-with-array-prototype-reverse
 if (typeof []._reverse == 'undefined') {

app/assets/javascripts/jstoolbar.js

@@ -0,0 +1,2 @@
+//= require jstoolbar/jstoolbar
+//= require jstoolbar/textile

config/environments/production.rb

@@ -51,7 +51,7 @@ OpenProject::Application.configure do
 
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
   config.assets.precompile += %w( default.css select_list_move.js copy_issue_actions.js repository_navigation.js
-                                  jstoolbar/jstoolbar.js jstoolbar/textile.js jstoolbar/lang/*.js )
+                                  jstoolbar/lang/*.js )
 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false

lib/redmine/wiki_formatting/textile/helper.rb

@@ -32,8 +32,6 @@ 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/lang/jstoolbar-#{current_language.to_s.downcase}")
             end
             @heads_for_wiki_formatter_included = true