From 6a2ca5e0342751b6d38a1a05ad25b5c0002d6e46 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 22 Jul 2012 13:29:26 +0000 Subject: JQuery in, Prototype/Scriptaculous out (#11445). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10068 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/members/create.js.erb | 4 ++-- app/views/members/destroy.js.erb | 2 +- app/views/members/update.js.erb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/views/members') diff --git a/app/views/members/create.js.erb b/app/views/members/create.js.erb index c56390fd4..7ca4930b5 100644 --- a/app/views/members/create.js.erb +++ b/app/views/members/create.js.erb @@ -1,9 +1,9 @@ -Element.update('tab-content-members', '<%= escape_javascript(render :partial => 'projects/settings/members') %>'); +$('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>'); hideOnLoad(); <% if @members.present? && @members.all? {|m| m.valid? } %> <% @members.each do |member| %> - new Effect.Highlight("member-<%= member.id %>"); + $("#member-<%= member.id %>").effect("highlight"); <% end %> <% else %> <% errors = @members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ') %> diff --git a/app/views/members/destroy.js.erb b/app/views/members/destroy.js.erb index ad7ac38d1..17beff44c 100644 --- a/app/views/members/destroy.js.erb +++ b/app/views/members/destroy.js.erb @@ -1,2 +1,2 @@ -Element.update('tab-content-members', '<%= escape_javascript(render :partial => 'projects/settings/members') %>'); +$('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>'); hideOnLoad(); diff --git a/app/views/members/update.js.erb b/app/views/members/update.js.erb index 01eac2bcd..245828aac 100644 --- a/app/views/members/update.js.erb +++ b/app/views/members/update.js.erb @@ -1,3 +1,3 @@ -Element.update('tab-content-members', '<%= escape_javascript(render :partial => 'projects/settings/members') %>'); +$('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>'); hideOnLoad(); -new Effect.Highlight("member-<%= @member.id %>"); +$("#member-<%= @member.id %>").effect("highlight"); -- cgit v1.2.3