From 6c17bd213d63da75c36c0c61a35c5e7daaa2a345 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <n.bally@quartz-agence.com>
Date: Wed, 6 Jul 2011 16:04:42 +0200
Subject: [PATCH] pipeline asset bug

---
 app/assets/javascripts/admin/admin.js   | 22 +++++++++++++---------
 app/assets/javascripts/public/public.js |  6 +-----
 app/views/layouts/admin.html.haml       |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/admin/admin.js b/app/assets/javascripts/admin/admin.js
index d31c85f..d1cc668 100644
--- a/app/assets/javascripts/admin/admin.js
+++ b/app/assets/javascripts/admin/admin.js
@@ -1,12 +1,16 @@
-//= require jquery
-//= require jquery-ui.min
-//= require jquery_ujs
-//=require jquery.reject.min
-//=require tiny_mce/jquery.tinymce
-//= require jquery.fileupload-ui
-//=require jquery.activity-indicator-1.0.0.min
-//=require jquery.fileupload
-//= require_tree .
+/*
+
+*= require jquery
+*= require jquery-ui.min
+*= require jquery_ujs
+*=require jquery.reject.min
+*=require tiny_mce/jquery.tinymce
+*= require jquery.fileupload-ui
+*=require jquery.activity-indicator-1.0.0.min
+*=require jquery.fileupload
+*= require_tree .
+
+*/
 
 
 
diff --git a/app/assets/javascripts/public/public.js b/app/assets/javascripts/public/public.js
index 2034d10..0b283bc 100644
--- a/app/assets/javascripts/public/public.js
+++ b/app/assets/javascripts/public/public.js
@@ -1,12 +1,8 @@
-// FIXME: Tell people that this is a manifest file, real code should go into discrete files
-// FIXME: Tell people how Sprockets and CoffeeScript works
-//
 //= require jquery
 //= require jquery_ujs
-//= require jquery.easing.compatibility
 //= require jquery.prettyPhoto
 //= require jcarousellite_1.0.1.min
-
+//= require jquery.easing.compatibility
 //= require_tree .
 
 function blink() {
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 6f0590e..c6325cc 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -15,7 +15,7 @@
 	
 		
 		
-		=javascript_include_tag 'admin/admin'
+		=javascript_include_tag 'admin/admin', :debug => true