nicolas/boissier_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pipeline asset bug

Browse Source
This commit is contained in:
Nicolas Bally 2011-07-06 16:04:42 +02:00
parent ed678570ad
commit 6c17bd213d
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/assets/javascripts/admin/admin.js
View File

@ -1,12 +1,16 @@
//= require jquery /*
//= require jquery-ui.min
//= require jquery_ujs *= require jquery
//=require jquery.reject.min *= require jquery-ui.min
//=require tiny_mce/jquery.tinymce *= require jquery_ujs
//= require jquery.fileupload-ui *=require jquery.reject.min
//=require jquery.activity-indicator-1.0.0.min *=require tiny_mce/jquery.tinymce
//=require jquery.fileupload *= require jquery.fileupload-ui
//= require_tree . *=require jquery.activity-indicator-1.0.0.min
*=require jquery.fileupload
*= require_tree .
*/

6
app/assets/javascripts/public/public.js
View File

@ -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
//= require jquery_ujs //= require jquery_ujs
//= require jquery.easing.compatibility
//= require jquery.prettyPhoto //= require jquery.prettyPhoto
//= require jcarousellite_1.0.1.min //= require jcarousellite_1.0.1.min
//= require jquery.easing.compatibility
//= require_tree . //= require_tree .
function blink() { function blink() {

2
app/views/layouts/admin.html.haml
View File

@ -15,7 +15,7 @@
=javascript_include_tag 'admin/admin' =javascript_include_tag 'admin/admin', :debug => true