Don't deprecate HTML options, just delete :event_name

tristang · Oct 14, 2017 · 629953f · 629953f
1 parent 11243fa
commit 629953f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/app/views/render_async/_render_async.html.erb b/app/views/render_async/_render_async.html.erb
@@ -17,7 +17,7 @@
           document.getElementById("<%= container_id %>").outerHTML = request.responseText;
 
           <% if event_name.present? %>
-            document.dispatchEvent(new Event("<%= event_name %>", response));
+            document.dispatchEvent(new Event("<%= event_name %>"));
           <% end %>
         }
       };

diff --git a/lib/render_async/view_helper.rb b/lib/render_async/view_helper.rb
@@ -19,12 +19,13 @@ def render_async_cache(path, options = {})
 
     def render_async(path, options = {}, &placeholder)
       container_id = "render_async_#{SecureRandom.hex(5)}#{Time.now.to_i}"
+      event_name = options.delete(:event_name)
       placeholder = capture(&placeholder) if block_given?
 
       render 'render_async/render_async', container_id: container_id,
                                           path: path,
-                                          html_options: options[:html],
-                                          event_name: options[:event_name],
+                                          html_options: options,
+                                          event_name: event_name,
                                           placeholder: placeholder
     end
 

diff --git a/spec/render_async/view_helper_spec.rb b/spec/render_async/view_helper_spec.rb
@@ -45,6 +45,7 @@
             :container_id => /render_async_/,
             :path => "users",
             :html_options => {},
+            :event_name => nil,
             :placeholder => nil
           }
         )
@@ -66,7 +67,7 @@
           {
             :container_id => /render_async_/,
             :path => "users",
-            :html_options => nil,
+            :html_options => {},
             :event_name => nil,
             :placeholder => nil
           }
@@ -89,7 +90,7 @@
           }
         )
 
-        helper.render_async("users", :html => { :nonce => "jkg1935safd" })
+        helper.render_async("users", :nonce => "jkg1935safd")
       end
     end
 
@@ -100,7 +101,7 @@
           {
             :container_id => /render_async_/,
             :path => "users",
-            :html_options => nil,
+            :html_options => {},
             :event_name => "render_async_done",
             :placeholder => nil
           }
@@ -123,7 +124,7 @@
           {
             :container_id => /render_async_/,
             :path => "users",
-            :html_options => nil,
+            :html_options => {},
             :event_name => nil,
             :placeholder => placeholder
           }