[#416] introducing separate rjs view to reduce controller code

a5b43954 · Gregor Schmidt · ae76abd1 · a5b43954 · a5b43954
Commit a5b43954 authored May 17, 2011 by Gregor Schmidt
Hide whitespace changes
Inline Side-by-side

Showing with 32 additions and 30 deletions

watchers_controller.rb app/controllers/watchers_controller.rb +10 -30

replace_selectors.rjs app/views/watchers/replace_selectors.rjs +22 -0

No files found.
--- 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

--- a/app/views/watchers/replace_selectors.rjs
+++ b/app/views/watchers/replace_selectors.rjs
+@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
+