Skip to content

Commit 6cc8f44

Browse files
committed
bring back in the Rails 3.0 railtie, and use it if we should
1 parent ebff14f commit 6cc8f44

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

lib/jquery-rails.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module Jquery
22
module Rails
33

4-
class Engine < ::Rails::Engine
5-
config.before_configuration do
6-
require "jquery-rails/assert_select_jquery" if ::Rails.env.test?
7-
end
4+
if ::Rails.version < "3.1"
5+
require 'jquery-rails/railtie'
6+
else
7+
require 'jquery-rails/engine'
88
end
99

1010
end

lib/jquery-rails/railtie.rb

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Configure Rails 3.0 to use public/javascripts/jquery et al
2+
module Jquery
3+
module Rails
4+
5+
class Railtie < ::Rails::Railtie
6+
config.before_configuration do
7+
require "jquery-rails/assert_select_jquery" if ::Rails.env.test?
8+
9+
if ::Rails.root.join("public/javascripts/jquery-ui.min.js").exist?
10+
jq_defaults = %w(jquery jquery-ui)
11+
jq_defaults.map!{|a| a + ".min" } if ::Rails.env.production?
12+
else
13+
jq_defaults = ::Rails.env.production? ? %w(jquery.min) : %w(jquery)
14+
end
15+
16+
config.action_view.javascript_expansions[:defaults] = jq_defaults + %w(rails)
17+
end
18+
end
19+
20+
end
21+
end

0 commit comments

Comments
 (0)