Merge pull request activeadmin#1056 from marcusmateus/helpers_on_prec…

…ompile Fix for activeadmin#474: Loads AA SASS helpers in railtie to enable precompile w/o initialization
sur · Feb 21, 2012 · 91afd09 · 91afd09
2 parents 838b568 + 558a38b
commit 91afd09
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/lib/active_admin.rb b/lib/active_admin.rb
@@ -6,6 +6,8 @@
 require 'sass'
 require 'inherited_resources'
 require 'jquery-rails'
+require 'active_admin/dependency_checker' 
+require 'active_admin/sass/helpers'
 require 'active_admin/arbre'
 require 'active_admin/engine'
 
@@ -21,7 +23,6 @@ module ActiveAdmin
   autoload :ControllerAction,         'active_admin/controller_action'
   autoload :CSVBuilder,               'active_admin/csv_builder'
   autoload :Dashboards,               'active_admin/dashboards'
-  autoload :DependencyChecker,        'active_admin/dependency_checker'
   autoload :Deprecation,              'active_admin/deprecation'
   autoload :Devise,                   'active_admin/devise'
   autoload :DSL,                      'active_admin/dsl'

diff --git a/lib/active_admin/application.rb b/lib/active_admin/application.rb
@@ -255,10 +255,6 @@ def attach_reloader
     end
 
     def generate_stylesheets
-      # This must be required after initialization
-      require 'sass/plugin'
-      require 'active_admin/sass/helpers'
-
       # Create our own asset pipeline in Rails 3.0
       if ActiveAdmin.use_asset_pipeline?
         # Add our mixins to the load path for SASS

diff --git a/lib/active_admin/dependency_checker.rb b/lib/active_admin/dependency_checker.rb
@@ -25,7 +25,7 @@ def meta_search_1_1?
 
       def sass_rails_3_1?
         require 'sass/rails/version'
-        Sass::Rails::VERSION >= "3.1"
+        ::Sass::Rails::VERSION >= "3.1"
       rescue LoadError
         false
       end