From 8a46f04897995cc0ec80dd6f07567159e947ceb5 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Fri, 8 Jul 2011 18:05:29 +0200 Subject: [PATCH] js 3.1 --- app/assets/javascripts/admin/admin.js | 12 ++++++------ .../{jquery-rejectjs => jquery-reject.js} | 0 2 files changed, 6 insertions(+), 6 deletions(-) rename vendor/assets/javascripts/{jquery-rejectjs => jquery-reject.js} (100%) diff --git a/app/assets/javascripts/admin/admin.js b/app/assets/javascripts/admin/admin.js index d1cc668..a1517a3 100644 --- a/app/assets/javascripts/admin/admin.js +++ b/app/assets/javascripts/admin/admin.js @@ -1,13 +1,13 @@ /* *= require jquery -*= require jquery-ui.min +*= require jquery-ui *= 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 jquery-reject +*=require tiny_mce/jquery.tinymce.js +*= require jquery-fileupload-ui +*=require jquery-activity-indicator +*=require jquery-fileupload *= require_tree . */ diff --git a/vendor/assets/javascripts/jquery-rejectjs b/vendor/assets/javascripts/jquery-reject.js similarity index 100% rename from vendor/assets/javascripts/jquery-rejectjs rename to vendor/assets/javascripts/jquery-reject.js