Major refactoring of the batch actions UI code. More to come.

moregg · May 3, 2012 · 1538d08 · 1538d08
1 parent 6cbe3a1
commit 1538d08
Show file tree

Hide file tree

Showing 26 changed files with 497 additions and 462 deletions.
diff --git a/Guardfile b/Guardfile
@@ -5,11 +5,3 @@ guard 'rspec', :all_on_start => false, :version => 2 do
   watch(%r{^lib/active_admin/(.+)\.rb$})     { |m| "spec/unit/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec/" }
 end
-
-guard 'coffeescript', :output => 'spec/javascripts/compiled', :all_on_start => true  do
-  watch(%r{spec/javascripts/coffeescripts/(.*)\.coffee})
-end
-
-guard 'sprockets', :destination => "app/assets/javascripts/active_admin/", :asset_paths => ['app/assets/javascripts/active_admin/coffeescripts/'] do
-  watch(%r{^app/assets/javascripts/active_admin/coffeescripts/.+$})
-end
diff --git a/app/assets/javascripts/active_admin/application.js b/app/assets/javascripts/active_admin/application.js
diff --git a/app/assets/javascripts/active_admin/base.js b/app/assets/javascripts/active_admin/base.js
@@ -1,5 +1,8 @@
 //= require jquery
 //= require jquery-ui
 //= require jquery_ujs
-//= require active_admin/application
 
+//= require_tree  ./lib/
+//= require_tree  ./components/
+//= require_tree  ./pages/
+//= require_directory ./
diff --git a/app/assets/javascripts/active_admin/coffeescripts/application.js b/app/assets/javascripts/active_admin/coffeescripts/application.js
diff --git a/app/assets/javascripts/active_admin/coffeescripts/pages/batch_actions.js.coffee b/app/assets/javascripts/active_admin/coffeescripts/pages/batch_actions.js.coffee
diff --git a/...ents/jquery.aa.checkbox-toggler.js.coffee → ...ents/jquery.aa.checkbox-toggler.js.coffee b/...ents/jquery.aa.checkbox-toggler.js.coffee → ...ents/jquery.aa.checkbox-toggler.js.coffee