WiP: Bundle up admin javascript using the asset pipeline

9 files changed, 16 insertions, 33 deletions

diff --git a/Gemfile b/Gemfile
index 9250a374b..4d2a97892 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,6 +53,7 @@ gem 'unidecode'
 
 group :assets do
   gem 'sass-rails', "= 3.1.4"
+  gem 'coffee-rails', "~> 3.1"
   gem 'uglifier'
   gem 'therubyracer'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f1853a3d..554c0dd86 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,6 +60,13 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     charlock_holmes (0.6.9.4)
     chunky_png (1.2.8)
+    coffee-rails (3.1.1)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.1.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.6.3)
     colorize (0.5.8)
     columnize (0.3.6)
     compass (0.12.2)
@@ -271,6 +278,7 @@ DEPENDENCIES
   bootstrap-sass
   capistrano
   charlock_holmes
+  coffee-rails (~> 3.1)
   compass
   coveralls
   debugger
diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
new file mode 100644
index 000000000..6e4d3a98c
--- /dev/null
+++ b/app/assets/javascripts/admin.js
@@ -0,0 +1,6 @@
+// ...
+//= require jquery
+//= require admin/jquery-ui.min
+//= require admin/bootstrap-collapse
+//= require admin/admin
+//= require jquery_ujs
diff --git a/public/admin/javascripts/admin.coffee b/app/assets/javascripts/admin/admin.js.coffee
index 3d39369a4..3d39369a4 100644
--- a/public/admin/javascripts/admin.coffee
+++ b/app/assets/javascripts/admin/admin.js.coffee
diff --git a/public/admin/javascripts/bootstrap-collapse.js b/app/assets/javascripts/admin/bootstrap-collapse.js
index 9a364468b..9a364468b 100644
--- a/public/admin/javascripts/bootstrap-collapse.js
+++ b/app/assets/javascripts/admin/bootstrap-collapse.js
diff --git a/public/admin/javascripts/bootstrap-tab.js b/app/assets/javascripts/admin/bootstrap-tab.js
index 26c9ece75..26c9ece75 100644
--- a/public/admin/javascripts/bootstrap-tab.js
+++ b/app/assets/javascripts/admin/bootstrap-tab.js
diff --git a/public/admin/javascripts/jquery-ui.min.js b/app/assets/javascripts/admin/jquery-ui.min.js
index f00a62f13..f00a62f13 100644
--- a/public/admin/javascripts/jquery-ui.min.js
+++ b/app/assets/javascripts/admin/jquery-ui.min.js
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 7722efad4..3c3870524 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -4,7 +4,7 @@
       <meta http-equiv="content-type" content="text/html;charset=UTF-8" >
       <title><%= site_name %> admin<%= @title ? ":" : "" %> <%=@title%></title>
 
-      <%= javascript_include_tag '/javascripts/jquery.js', '/admin/javascripts/jquery-ui.min.js', '/admin/javascripts/bootstrap-collapse', '/admin/javascripts/bootstrap-tab', '/admin/javascripts/admin', '/javascripts/jquery_ujs' %>
+      <%= javascript_include_tag "admin" %>
       <%= stylesheet_link_tag 'admin-theme/jquery-ui-1.8.15.custom.css', :rel => 'stylesheet'%>
       <%= stylesheet_link_tag "/admin/stylesheets/admin", :title => "Main", :rel => "stylesheet" %>
 
diff --git a/public/admin/javascripts/admin.js b/public/admin/javascripts/admin.js
deleted file mode 100644
index 9daa51459..000000000
--- a/public/admin/javascripts/admin.js
+++ /dev/null
@@ -1,32 +0,0 @@
-(function() {
-  jQuery(function() {
-    $('.locales a:first').tab('show');
-    $('.accordion-body').on('hidden', function() {
-      return $(this).prev().find('i').first().removeClass().addClass('icon-chevron-right');
-    });
-    $('.accordion-body').on('shown', function() {
-      return $(this).prev().find('i').first().removeClass().addClass('icon-chevron-down');
-    });
-    $('.toggle-hidden').live('click', function() {
-      $(this).parents('td').find('div:hidden').show();
-      return false;
-    });
-    return $('#request_hidden_user_explanation_reasons input').live('click', function() {
-      var info_request_id, reason;
-      $('#request_hidden_user_subject, #request_hidden_user_explanation, #request_hide_button').show();
-      info_request_id = $('#hide_request_form').attr('data-info-request-id');
-      reason = $(this).val();
-      $('#request_hidden_user_explanation_field').attr("value", "[loading default text...]");
-      return $.ajax("/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id, {
-        type: "GET",
-        dataType: "text",
-        error: function(data, textStatus, jqXHR) {
-          return $('#request_hidden_user_explanation_field').attr("value", "Error: " + textStatus);
-        },
-        success: function(data, textStatus, jqXHR) {
-          return $('#request_hidden_user_explanation_field').attr("value", data);
-        }
-      });
-    });
-  });
-}).call(this);