From 0ef11f76afad426dda5a21776e25e247ca84d9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Tue, 27 May 2014 10:18:13 +0200 Subject: [PATCH] #258 Jquery conflict with Redmine --- app/views/dmsf/show.html.erb | 4 +- app/views/dmsf/trash.html.erb | 4 +- app/views/dmsf_files/show.html.erb | 4 +- assets/javascripts/jquery-1.6.1.min.js | 18 - assets/javascripts/jquery-ui-1.8.13.min.js | 784 --------------------- 5 files changed, 3 insertions(+), 811 deletions(-) delete mode 100644 assets/javascripts/jquery-1.6.1.min.js delete mode 100644 assets/javascripts/jquery-ui-1.8.13.min.js diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb index e8794cbc..6d83c4f0 100644 --- a/app/views/dmsf/show.html.erb +++ b/app/views/dmsf/show.html.erb @@ -229,9 +229,7 @@ <% content_for :header_tags do %> <%= stylesheet_link_tag 'plupload/jquery.ui.plupload.css', :plugin => 'redmine_dmsf' %> - <%= stylesheet_link_tag 'jquery.dataTables/jquery-ui.dataTables.css', :plugin => 'redmine_dmsf' %> - <%= javascript_include_tag 'jquery-1.6.1.min.js', :plugin => 'redmine_dmsf' %> - <%= javascript_include_tag 'jquery-ui-1.8.13.min.js', :plugin => 'redmine_dmsf' %> + <%= stylesheet_link_tag 'jquery.dataTables/jquery-ui.dataTables.css', :plugin => 'redmine_dmsf' %> <%= javascript_include_tag 'jquery.dataTables/jquery.dataTables.min.js', :plugin => 'redmine_dmsf' %>