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

pull/1186/head
Martin Linkhorst 12 years ago
parent e2186e2dad
commit fb6b89586b
  1. 1
      app/assets/javascripts/application.js
  2. 2
      app/assets/javascripts/jstoolbar.js
  3. 2
      config/environments/production.rb
  4. 2
      lib/redmine/wiki_formatting/textile/helper.rb

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

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

@ -51,7 +51,7 @@ OpenProject::Application.configure do
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) # 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 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 # Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false # config.action_mailer.raise_delivery_errors = false

@ -32,8 +32,6 @@ module Redmine
def heads_for_wiki_formatter def heads_for_wiki_formatter
unless @heads_for_wiki_formatter_included unless @heads_for_wiki_formatter_included
content_for :header_tags do 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}") javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}")
end end
@heads_for_wiki_formatter_included = true @heads_for_wiki_formatter_included = true

Loading…
Cancel
Save