From 292105bdf197ba26a5aba977c75d65e988569670 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Mon, 6 Aug 2012 17:34:00 +0800 Subject: [PATCH] Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie --- Gemfile | 2 +- app/assets/javascripts/new_admin.js | 2 +- app/views/admin/assets/file_upload.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 6e07eafa..7b12d5c0 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem 'mysql2' gem 'nokogiri' gem 'radius' gem 'rake' -gem 'remotipart' +# gem 'remotipart' gem 'resque' # background jobs gem 'resque-scheduler' # job scheduling gem 'resque-restriction' diff --git a/app/assets/javascripts/new_admin.js b/app/assets/javascripts/new_admin.js index 0c9f30df..949753a9 100644 --- a/app/assets/javascripts/new_admin.js +++ b/app/assets/javascripts/new_admin.js @@ -17,4 +17,4 @@ //= require side_bar_history //= require rss //= require ajax_form -//= require jquery.remotipart +//= require inc/ajax_setting diff --git a/app/views/admin/assets/file_upload.html.erb b/app/views/admin/assets/file_upload.html.erb index 2881d5f9..8ea1416f 100644 --- a/app/views/admin/assets/file_upload.html.erb +++ b/app/views/admin/assets/file_upload.html.erb @@ -53,7 +53,7 @@