From 9cb4feefceaa39a2fb5a5ba096797c593ddc7c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Scha=CC=88fer?= <f.schaefer@finn.de>
Date: Sat, 14 May 2011 17:53:29 +0200
Subject: [PATCH 1/9] Update the watcher list on click on "watch". #311

Based on a patch contributed by Price M.
---
 app/controllers/watchers_controller.rb | 7 ++++++-
 app/views/issues/_action_menu.rhtml    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index ad8d8be2..11699c35 100644
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -90,7 +90,12 @@ private
       format.js do
         render(:update) do |page|
           replace_ids.each do |replace_id|
-            page.replace_html replace_id, watcher_link(@watched, user, :replace => replace_ids)
+            case replace_id
+            when 'watchers'
+              page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
+            else
+              page.replace_html replace_id, watcher_link(@watched, user, :replace => replace_ids)
+            end
           end
         end
       end
diff --git a/app/views/issues/_action_menu.rhtml b/app/views/issues/_action_menu.rhtml
index 3f4d89e2..0ec82ecd 100644
--- a/app/views/issues/_action_menu.rhtml
+++ b/app/views/issues/_action_menu.rhtml
@@ -2,7 +2,7 @@
 <%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue}, :class => 'icon icon-time-add' %>
 <% replace_watcher ||= 'watcher' %>
-<%= watcher_tag(@issue, User.current, {:id => replace_watcher, :replace => ['watcher','watcher2']}) %>
+<%= watcher_tag(@issue, User.current, {:id => replace_watcher, :replace => ['watchers','watcher','watcher2']}) %>
 <%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %>
 <%= link_to_if_authorized l(:button_copy), {:controller => 'issue_moves', :action => 'new', :id => @issue, :copy_options => {:copy => 't'}}, :class => 'icon icon-copy' %>
 <%= link_to_if_authorized l(:button_move), {:controller => 'issue_moves', :action => 'new', :id => @issue}, :class => 'icon icon-move' %>

From 508b23cf41f345d82ab76eb0e66375fc10b2d1bd Mon Sep 17 00:00:00 2001
From: Gregor Schmidt <ruby@schmidtwisser.de>
Date: Tue, 17 May 2011 18:15:34 +0200
Subject: [PATCH 2/9] [#416] Watcher links work using of css selectors instead
 of ids

---
 app/controllers/watchers_controller.rb | 36 ++++++++++++++++++++------
 app/helpers/watchers_helper.rb         | 36 ++++++++++++--------------
 app/views/boards/show.rhtml            |  2 +-
 app/views/issues/_action_menu.rhtml    |  3 +--
 app/views/messages/show.rhtml          |  2 +-
 app/views/wiki/date_index.html.erb     |  2 +-
 app/views/wiki/index.html.erb          |  2 +-
 app/views/wiki/show.rhtml              |  2 +-
 8 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index 11699c35..a7a9abfd 100644
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -78,23 +78,43 @@ private
     @watched.set_watcher(user, watching)
     if params[:replace].present?
       if params[:replace].is_a? Array
-        replace_ids = params[:replace]
+        replace_selectors = params[:replace]
       else
-        replace_ids = [params[:replace]]
+        replace_selectors = params[:replace].split(',').map(&:strip)
       end
     else
-      replace_ids = ['watcher']
+      replace_selectors = ['#watcher']
     end
+
+    watcher_partial = lambda do
+      render_to_string(:partial => 'watchers/watchers', :locals => {:watched => @watched})
+    end
+
     respond_to do |format|
       format.html { redirect_to :back }
       format.js do
         render(:update) do |page|
-          replace_ids.each do |replace_id|
-            case replace_id
-            when 'watchers'
-              page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
+          replace_selectors.each do |selector|
+            next if selector.blank?
+
+            case selector
+            when '#watchers'
+              page.select('#watchers').each do |node|
+                node.update watcher_partial.call
+              end
             else
-              page.replace_html replace_id, watcher_link(@watched, user, :replace => replace_ids)
+              page.select(selector).each do |node|
+                options = {:replace => replace_selectors}
+
+                last_selector = selector.split(' ').last
+                if last_selector.starts_with? '.'
+                  options[:class] = last_selector[1..-1]
+                elsif last_selector.starts_with? '#'
+                  options[:id] = last_selector[1..-1]
+                end
+
+                node.replace watcher_link(@watched, user, options)
+              end
             end
           end
         end
diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index 2695ce9f..b336233d 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -17,32 +17,28 @@
 
 module WatchersHelper
 
-  # Valid options
-  # * :id - the element id
-  # * :replace - a string or array of element ids that will be
-  #   replaced
-  def watcher_tag(object, user, options={:replace => 'watcher'})
-    id = options[:id]
-    id ||= options[:replace] if options[:replace].is_a? String
-    content_tag("span", watcher_link(object, user, options), :id => id)
-  end
-  
-  # Valid options
-  # * :replace - a string or array of element ids that will be
-  #   replaced
-  def watcher_link(object, user, options={:replace => 'watcher'})
+  # Create a link to watch/unwatch object
+  #
+  # * :replace - a string or array of strings with css selectors that will be updated, whenever the watcher status is changed
+  def watcher_link(object, user, options = {:replace => '.watcher_link', :class => 'watcher_link'})
+    options = options.with_indifferent_access
+    raise ArgumentError, 'Missing :replace option in options hash' if options['replace'].blank?
+
     return '' unless user && user.logged? && object.respond_to?('watched_by?')
+
     watched = object.watched_by?(user)
     url = {:controller => 'watchers',
            :action => (watched ? 'unwatch' : 'watch'),
            :object_type => object.class.to_s.underscore,
            :object_id => object.id,
-           :replace => options[:replace]}
-    link_to_remote((watched ? l(:button_unwatch) : l(:button_watch)),
-                   {:url => url},
-                   :href => url_for(url),
-                   :class => (watched ? 'icon icon-fav' : 'icon icon-fav-off'))
-  
+           :replace => options.delete('replace')}
+
+    url_options = {:url => url}
+
+    html_options = options.merge(:href => url_for(url))
+    html_options[:class] += watched ? ' icon icon-fav' : ' icon icon-fav-off'
+
+    link_to_remote((watched ? l(:button_unwatch) : l(:button_watch)), url_options, html_options)
   end
   
   # Returns a comma separated list of users watching the given object
diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml
index c4a08b29..595038e8 100644
--- a/app/views/boards/show.rhtml
+++ b/app/views/boards/show.rhtml
@@ -5,7 +5,7 @@
                           {:controller => 'messages', :action => 'new', :board_id => @board},
                           :class => 'icon icon-add',
                           :onclick => 'Element.show("add-message"); Form.Element.focus("message_subject"); return false;' %>
-<%= watcher_tag(@board, User.current) %>
+  <%= watcher_link(@board, User.current) %>
 </div>
 
 <div id="add-message" style="display:none;">
diff --git a/app/views/issues/_action_menu.rhtml b/app/views/issues/_action_menu.rhtml
index 0ec82ecd..b1af5785 100644
--- a/app/views/issues/_action_menu.rhtml
+++ b/app/views/issues/_action_menu.rhtml
@@ -1,8 +1,7 @@
 <div class="contextual">
 <%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue}, :class => 'icon icon-time-add' %>
-<% replace_watcher ||= 'watcher' %>
-<%= watcher_tag(@issue, User.current, {:id => replace_watcher, :replace => ['watchers','watcher','watcher2']}) %>
+<%= watcher_link(@issue, User.current, {:class => 'watcher_link', :replace => ['#watchers', '.watcher_link']}) %>
 <%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %>
 <%= link_to_if_authorized l(:button_copy), {:controller => 'issue_moves', :action => 'new', :id => @issue, :copy_options => {:copy => 't'}}, :class => 'icon icon-copy' %>
 <%= link_to_if_authorized l(:button_move), {:controller => 'issue_moves', :action => 'new', :id => @issue}, :class => 'icon icon-move' %>
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index a27b5d11..1f3c7a1c 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -2,7 +2,7 @@
                link_to(h(@board.name), {:controller => 'boards', :action => 'show', :project_id => @project, :id => @board}) %>
 
 <div class="contextual">
-    <%= watcher_tag(@topic, User.current) %>
+    <%= watcher_link(@topic, User.current) %>
     <%= link_to_remote_if_authorized(l(:button_quote), { :url => {:action => 'quote', :id => @topic} }, :class => 'icon icon-comment') unless @topic.locked? %>
     <%= link_to(l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'icon icon-edit') if @message.editable_by?(User.current) %>
     <%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') if @message.destroyable_by?(User.current) %>
diff --git a/app/views/wiki/date_index.html.erb b/app/views/wiki/date_index.html.erb
index a0327cf4..611f18b2 100644
--- a/app/views/wiki/date_index.html.erb
+++ b/app/views/wiki/date_index.html.erb
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= watcher_tag(@wiki, User.current) %>
+  <%= watcher_link(@wiki, User.current) %>
 </div>
 
 <h2><%= l(:label_index_by_date) %></h2>
diff --git a/app/views/wiki/index.html.erb b/app/views/wiki/index.html.erb
index d42ee966..e5420852 100644
--- a/app/views/wiki/index.html.erb
+++ b/app/views/wiki/index.html.erb
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= watcher_tag(@wiki, User.current) %>
+  <%= watcher_link(@wiki, User.current) %>
 </div>
 
 <h2><%= l(:label_index_by_title) %></h2>
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index c17dd482..dd3d00d0 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -1,7 +1,7 @@
 <div class="contextual">
 <% if @editable %>
 <%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.version == @page.content.version %>
-<%= watcher_tag(@page, User.current) %>
+<%= watcher_link(@page, User.current) %>
 <%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
 <%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
 <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>

From 2c2ed95866dfaa3006b3a79b2cfa1245c9cff047 Mon Sep 17 00:00:00 2001
From: Gregor Schmidt <ruby@schmidtwisser.de>
Date: Tue, 17 May 2011 19:00:38 +0200
Subject: [PATCH 3/9] [#416] Re-Adding watcher_tag for backwards compatibility

adding deprecation warning
---
 app/helpers/watchers_helper.rb             | 13 ++++++
 test/unit/helpers/watchers_helpers_test.rb | 49 ++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 test/unit/helpers/watchers_helpers_test.rb

diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index b336233d..bd716d37 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -17,6 +17,19 @@
 
 module WatchersHelper
 
+  # Deprecated method. Use watcher_link instead
+  #
+  # This method will be removed in ChiliProject 3.0 or later
+  def watcher_tag(object, user, options={:replace => 'watcher'})
+    ActiveSupport::Deprecation.warn "The WatchersHelper#watcher_tag is deprecated and will be removed in ChiliProject 3.0. Please use WatchersHelper#watcher_link instead. Please also note the differences between the APIs.", caller
+
+    options[:id] ||= options[:replace] if options[:replace].is_a? String
+
+    options[:replace] = Array(options[:replace]).map { |id| "##{id}" }
+
+    watcher_link(object, user, options)
+  end
+
   # Create a link to watch/unwatch object
   #
   # * :replace - a string or array of strings with css selectors that will be updated, whenever the watcher status is changed
diff --git a/test/unit/helpers/watchers_helpers_test.rb b/test/unit/helpers/watchers_helpers_test.rb
new file mode 100644
index 00000000..2ba21cbf
--- /dev/null
+++ b/test/unit/helpers/watchers_helpers_test.rb
@@ -0,0 +1,49 @@
+require File.expand_path('../../../test_helper', __FILE__)
+
+class WatchersHelperTest < HelperTestCase
+  include WatchersHelper
+
+  # tested for backwards compatibility
+  context '#watcher_tag' do
+    setup do
+      # mocking watcher_link to make sure, that new API is properly called from
+      # the old one.
+      def self.watcher_link(*args)
+        @watcher_link_args = args
+        nil
+      end
+
+      # silencing deprecation warnings while testing the deprecated behavior
+      def self.watcher_tag(*args)
+        ActiveSupport::Deprecation.silence { super }
+      end
+    end
+
+    context 'without options' do
+      should "call watcher_link with object, user and {:id => 'watcher', :replace => '#watcher'}" do
+        watcher_tag(:object, :user)
+        assert_equal :object, @watcher_link_args.first
+        assert_equal :user, @watcher_link_args.second
+        assert_equal({:id => 'watcher', :replace => ['#watcher']}, @watcher_link_args.third)
+      end
+    end
+
+    context 'with replace, without id option' do
+      should "set id to replace value and prefix replace with a # to make it a valid css selectors" do
+        watcher_tag(:object, :user, :replace => 'abc')
+        assert_equal :object, @watcher_link_args.first
+        assert_equal :user, @watcher_link_args.second
+        assert_equal({:id => 'abc', :replace => ['#abc']}, @watcher_link_args.third)
+      end
+    end
+
+    context 'with all options' do
+      should "prefix all elements in replace with a # to make them valid css selectors" do
+        watcher_tag(:object, :user, :id => 'abc', :replace => ['abc', 'def'])
+        assert_equal :object, @watcher_link_args.first
+        assert_equal :user, @watcher_link_args.second
+        assert_equal({:id => 'abc', :replace => ['#abc', '#def']}, @watcher_link_args.third)
+      end
+    end
+  end
+end

From e3f54d470c2d258bd38d5aaaa1c16ba09b27ca31 Mon Sep 17 00:00:00 2001
From: Gregor Schmidt <ruby@schmidtwisser.de>
Date: Tue, 17 May 2011 19:03:20 +0200
Subject: [PATCH 4/9] [#416] :class might be nil or a symbol - then + will not
 work as expected

---
 app/helpers/watchers_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index bd716d37..5c00bff0 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -49,7 +49,7 @@ module WatchersHelper
     url_options = {:url => url}
 
     html_options = options.merge(:href => url_for(url))
-    html_options[:class] += watched ? ' icon icon-fav' : ' icon icon-fav-off'
+    html_options[:class] = html_options[:class].to_s + (watched ? ' icon icon-fav' : ' icon icon-fav-off')
 
     link_to_remote((watched ? l(:button_unwatch) : l(:button_watch)), url_options, html_options)
   end

From 4635a8c2a4d4e9347a46049295553fd4466c80fd Mon Sep 17 00:00:00 2001
From: Gregor Schmidt <ruby@schmidtwisser.de>
Date: Tue, 17 May 2011 19:30:06 +0200
Subject: [PATCH 5/9] [#416] using a simpler approach to replace node with
 partial

---
 app/controllers/watchers_controller.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index a7a9abfd..617b92da 100644
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -86,10 +86,6 @@ private
       replace_selectors = ['#watcher']
     end
 
-    watcher_partial = lambda do
-      render_to_string(:partial => 'watchers/watchers', :locals => {:watched => @watched})
-    end
-
     respond_to do |format|
       format.html { redirect_to :back }
       format.js do
@@ -99,9 +95,7 @@ private
 
             case selector
             when '#watchers'
-              page.select('#watchers').each do |node|
-                node.update watcher_partial.call
-              end
+              page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
             else
               page.select(selector).each do |node|
                 options = {:replace => replace_selectors}

From ae76abd1400eae782116ba2728cafa20a8bf4c91 Mon Sep 17 00:00:00 2001
From: Gregor Schmidt <ruby@schmidtwisser.de>
Date: Tue, 17 May 2011 19:31:56 +0200
Subject: [PATCH 6/9] [#416] updating watcher controller tests to new
 functionality

unfortunately assert_select_rjs is not too clever - therefor we need to fall back to string matching for the more complex cases
---
 test/functional/watchers_controller_test.rb | 43 +++++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/test/functional/watchers_controller_test.rb b/test/functional/watchers_controller_test.rb
index 41cc9fda..abc92b64 100644
--- a/test/functional/watchers_controller_test.rb
+++ b/test/functional/watchers_controller_test.rb
@@ -43,7 +43,8 @@ class WatchersControllerTest < ActionController::TestCase
     assert_difference('Watcher.count') do
       xhr :post, :watch, :object_type => 'issue', :object_id => '1'
       assert_response :success
-      assert_select_rjs :replace_html, 'watcher'
+      assert @response.body.include? "$$(\"#watcher\").each"
+      assert @response.body.include? "value.replace"
     end
     assert Issue.find(1).watched_by?(User.find(3))
   end
@@ -60,10 +61,22 @@ class WatchersControllerTest < ActionController::TestCase
   def test_watch_with_multiple_replacements
     @request.session[:user_id] = 3
     assert_difference('Watcher.count') do
-      xhr :post, :watch, :object_type => 'issue', :object_id => '1', :replace => ['watch_item_1','watch_item_2']
+      xhr :post, :watch, :object_type => 'issue', :object_id => '1', :replace => ['#watch_item_1','.watch_item_2']
       assert_response :success
-      assert_select_rjs :replace_html, 'watch_item_1'
-      assert_select_rjs :replace_html, 'watch_item_2'
+      assert @response.body.include? "$$(\"#watch_item_1\").each"
+      assert @response.body.include? "$$(\".watch_item_2\").each"
+      assert @response.body.include? "value.replace"
+    end
+  end
+
+  def test_watch_with_watchers_special_logic
+    @request.session[:user_id] = 3
+    assert_difference('Watcher.count') do
+      xhr :post, :watch, :object_type => 'issue', :object_id => '1', :replace => ['#watchers', '.watcher']
+      assert_response :success
+      assert_select_rjs :replace_html, 'watchers'
+      assert @response.body.include? "$$(\".watcher\").each"
+      assert @response.body.include? "value.replace"
     end
   end
   
@@ -72,7 +85,8 @@ class WatchersControllerTest < ActionController::TestCase
     assert_difference('Watcher.count', -1) do
       xhr :post, :unwatch, :object_type => 'issue', :object_id => '2'
       assert_response :success
-      assert_select_rjs :replace_html, 'watcher'
+      assert @response.body.include? "$$(\"#watcher\").each"
+      assert @response.body.include? "value.replace"
     end
     assert !Issue.find(1).watched_by?(User.find(3))
   end
@@ -80,10 +94,23 @@ class WatchersControllerTest < ActionController::TestCase
   def test_unwatch_with_multiple_replacements
     @request.session[:user_id] = 3
     assert_difference('Watcher.count', -1) do
-      xhr :post, :unwatch, :object_type => 'issue', :object_id => '2', :replace => ['watch_item_1', 'watch_item_2']
+      xhr :post, :unwatch, :object_type => 'issue', :object_id => '2', :replace => ['#watch_item_1', '.watch_item_2']
       assert_response :success
-      assert_select_rjs :replace_html, 'watch_item_1'
-      assert_select_rjs :replace_html, 'watch_item_2'
+      assert @response.body.include? "$$(\"#watch_item_1\").each"
+      assert @response.body.include? "$$(\".watch_item_2\").each"
+      assert @response.body.include? "value.replace"
+    end
+    assert !Issue.find(1).watched_by?(User.find(3))
+  end
+
+  def test_unwatch_with_watchers_special_logic
+    @request.session[:user_id] = 3
+    assert_difference('Watcher.count', -1) do
+      xhr :post, :unwatch, :object_type => 'issue', :object_id => '2', :replace => ['#watchers', '.watcher']
+      assert_response :success
+      assert_select_rjs :replace_html, 'watchers'
+      assert @response.body.include? "$$(\".watcher\").each"
+      assert @response.body.include? "value.replace"
     end
     assert !Issue.find(1).watched_by?(User.find(3))
   end

From a5b439544aeb15d86dc45c81315d5d407bb38512 Mon Sep 17 00:00:00 2001
From: Gregor Schmidt <ruby@schmidtwisser.de>
Date: Tue, 17 May 2011 19:51:17 +0200
Subject: [PATCH 7/9] [#416] introducing separate rjs view to reduce controller
 code

---
 app/controllers/watchers_controller.rb   | 40 ++++++------------------
 app/views/watchers/replace_selectors.rjs | 22 +++++++++++++
 2 files changed, 32 insertions(+), 30 deletions(-)
 create mode 100644 app/views/watchers/replace_selectors.rjs

diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index 617b92da..1efa91f0 100644
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -76,42 +76,22 @@ private
   
   def set_watcher(user, watching)
     @watched.set_watcher(user, watching)
-    if params[:replace].present?
-      if params[:replace].is_a? Array
-        replace_selectors = params[:replace]
-      else
-        replace_selectors = params[:replace].split(',').map(&:strip)
-      end
-    else
-      replace_selectors = ['#watcher']
-    end
 
     respond_to do |format|
       format.html { redirect_to :back }
       format.js do
-        render(:update) do |page|
-          replace_selectors.each do |selector|
-            next if selector.blank?
-
-            case selector
-            when '#watchers'
-              page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
-            else
-              page.select(selector).each do |node|
-                options = {:replace => replace_selectors}
-
-                last_selector = selector.split(' ').last
-                if last_selector.starts_with? '.'
-                  options[:class] = last_selector[1..-1]
-                elsif last_selector.starts_with? '#'
-                  options[:id] = last_selector[1..-1]
-                end
-
-                node.replace watcher_link(@watched, user, options)
-              end
-            end
+        if params[:replace].present?
+          if params[:replace].is_a? Array
+            @replace_selectors = params[:replace]
+          else
+            @replace_selectors = params[:replace].split(',').map(&:strip)
           end
+        else
+          @replace_selectors = ['#watcher']
         end
+        @user = user
+
+        render :action => 'replace_selectors'
       end
     end
   rescue ::ActionController::RedirectBackError
diff --git a/app/views/watchers/replace_selectors.rjs b/app/views/watchers/replace_selectors.rjs
new file mode 100644
index 00000000..ae3b7ccd
--- /dev/null
+++ b/app/views/watchers/replace_selectors.rjs
@@ -0,0 +1,22 @@
+@replace_selectors.each do |selector|
+  next if selector.blank?
+
+  case selector
+  when '#watchers'
+    page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
+  else
+    page.select(selector).each do |node|
+      options = {:replace => @replace_selectors}
+
+      last_selector = selector.split(' ').last
+      if last_selector.starts_with? '.'
+        options[:class] = last_selector[1..-1]
+      elsif last_selector.starts_with? '#'
+        options[:id] = last_selector[1..-1]
+      end
+
+      node.replace watcher_link(@watched, @user, options)
+    end
+  end
+end
+

From 4fff430846ebf98adae7a76086960c995f8064b1 Mon Sep 17 00:00:00 2001
From: Gregor Schmidt <ruby@schmidtwisser.de>
Date: Tue, 17 May 2011 19:53:06 +0200
Subject: [PATCH 8/9] [#416] removing reference to now unused local variable

---
 app/views/issues/show.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index afb08747..8ff405bb 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -98,7 +98,7 @@
 
 
 <div style="clear: both;"></div>
-<%= render :partial => 'action_menu', :locals => {:replace_watcher => 'watcher2' } %>
+<%= render :partial => 'action_menu' %>
 
 <div style="clear: both;"></div>
 <% if authorize_for('issues', 'edit') %>

From 3893ef9f7df5e7155bf32c1f8e5cc0b155ccb961 Mon Sep 17 00:00:00 2001
From: Gregor Schmidt <ruby@schmidtwisser.de>
Date: Tue, 17 May 2011 20:22:05 +0200
Subject: [PATCH 9/9] [#416] updating watcher_tag in news/show to use
 watcher_link

---
 app/views/news/show.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index 28db44e9..7f05079e 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= watcher_tag(@news, User.current) %>
+<%= watcher_link(@news, User.current) %>
 <%= link_to(l(:button_edit), 
       edit_news_path(@news),
       :class => 'icon icon-edit',