nested_form_fields 0.6 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6db5cc91c0cef2549bf50762a6d4b383f9730b26
-  data.tar.gz: cd22dfe2aeb9c8731d879b14ade9cfb8035da3a3
+  metadata.gz: af179df78241f65dc54725b434303052e162b93a
+  data.tar.gz: f4a8b1c8590a307cf7518ac56c0914390ea3ca5b
 SHA512:
-  metadata.gz: 176410133dfd4a1d4bbde0c2bb84b19bb342e95767c3356e56e88d23a8fbd7546ef1ff7c92ab11ade79faa87d945ba7f86a8996144dccf19141d87ef07129992
-  data.tar.gz: 38c5f5147af0c38d614adf68ce07afd9160158db7f73acb869994f52d743613dd88bb9f16dae1258e2ea97cbe0e06ebaba888d3df38f32f040ba64c6ef8d2d4c
+  metadata.gz: a84704f681204e122cd58e285af477ed0f87eb531d352a420dfe43ffa8002fdb74844b7ed15493340da51eaa760f39a1063a17cb35d268e6023f924ab2f52c9a
+  data.tar.gz: 2c7d7d4ec8c595bf1fe6f24826e1001e8cfbd7f18828da8d08d428c1385509a283be80634971529fbf027e2c6e976a2da3d4ca769dc4fb946354fa3b5a3cf1ba

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
-  - 1.9.3
+  - 2.1.3
 before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"

data/README.md

@@ -58,12 +58,12 @@ You can change the link text of *remove_nested_fields_link* and *add_nested_fiel
       ...
     f.add_nested_fields_link :videos, 'Add another funtastic video'
 
-You can add classes to the  *remove_nested_fields_link* and *add_nested_fields_link* like this:
+You can add classes/attributes to the  *remove_nested_fields_link* and *add_nested_fields_link* like this:
 
     ...
-      ff.remove_nested_fields_link 'Remove me', class: 'btn btn-danger'
+      ff.remove_nested_fields_link 'Remove me', class: 'btn btn-danger', role: 'button'
       ...
-    f.add_nested_fields_link :videos, 'Add another funtastic video', class: 'btn btn-primary'
+    f.add_nested_fields_link :videos, 'Add another funtastic video', class: 'btn btn-primary', role: 'button'
 
 You can change the type of the element wrapping the nested fields using the *wrapper_tag* option:
 
@@ -101,5 +101,4 @@ CoffeeScript sample:
 
 ## Contributers
 
-- [Tom Riley](https://github.com/tomriley)
-- [Levente Tamas](https://github.com/tamisoft)
+https://github.com/ncri/nested_form_fields/graphs/contributors

data/lib/assets/javascripts/nested_form_fields.js.coffee

@@ -5,15 +5,16 @@ nested_form_fields.bind_nested_forms_links = () ->
   $('body').on 'click', '.add_nested_fields_link', ->
     $link = $(this)
     object_class = $link.data('object-class')
-    $.event.trigger("fields_adding.nested_form_fields",{object_class: object_class});
     association_path = $link.data('association-path')
+    added_index = $(".nested_#{association_path}").length
+    $.event.trigger("fields_adding.nested_form_fields",{object_class: object_class, added_index: added_index, association_path: association_path});
     $template = $("##{association_path}_template")
 
     template_html = $template.html()
 
     # insert association indexes
     index_placeholder = "__#{association_path}_index__"
-    template_html = template_html.replace(new RegExp(index_placeholder,"g"), $(".nested_#{association_path}").length)
+    template_html = template_html.replace(new RegExp(index_placeholder,"g"), added_index)
 
     # replace child template div tags with script tags to avoid form submission of templates
     $parsed_template = $(template_html)
@@ -23,20 +24,21 @@ nested_form_fields.bind_nested_forms_links = () ->
       $child.replaceWith($("<script id='#{$child.attr('id')}' type='text/html' />").html($child.html()))
 
     $template.before( $parsed_template )
-    $.event.trigger("fields_added.nested_form_fields",{object_class: object_class});
+    $.event.trigger("fields_added.nested_form_fields",{object_class: object_class, added_index: added_index, association_path: association_path});
     false
 
   $('body').off("click", '.remove_nested_fields_link')
   $('body').on 'click', '.remove_nested_fields_link', ->
     $link = $(this)
     object_class = $link.data('object-class')
-    $.event.trigger("fields_removing.nested_form_fields",{object_class: object_class});
     delete_association_field_name = $link.data('delete-association-field-name')
+    removed_index = parseInt(delete_association_field_name.match('(\\d+\\]\\[_destroy])')[0][0])
+    $.event.trigger("fields_removing.nested_form_fields",{object_class: object_class, delete_association_field_name: delete_association_field_name, removed_index: removed_index });
     $nested_fields_container = $link.parents(".nested_fields").first()
     $nested_fields_container.before "<input type='hidden' name='#{delete_association_field_name}' value='1' />"
     $nested_fields_container.hide()
     $nested_fields_container.find('input[required]:hidden').removeAttr('required')
-    $.event.trigger("fields_removed.nested_form_fields",{object_class: object_class});
+    $.event.trigger("fields_removed.nested_form_fields",{object_class: object_class, delete_association_field_name: delete_association_field_name, removed_index: removed_index});
     false
 
 $(document).on "page:change", ->

data/lib/nested_form_fields.rb

@@ -23,16 +23,22 @@ module ActionView::Helpers
     end
 
 
-    def add_nested_fields_link association, text = nil, options = {}
-      @template.link_to text || "Add #{association.to_s.singularize.humanize}", '',
-                        class: "#{options[:class]} add_nested_fields_link",
-                        data: { association_path: association_path(association.to_s), object_class: association.to_s.singularize }
+    def add_nested_fields_link association, text = nil, html_options = {}
+      html_class = html_options.delete(:class) || {}
+      html_data = html_options.delete(:data) || {}
+      @template.link_to text || "Add #{association.to_s.singularize.humanize}", '', {
+                        class: "#{html_class} add_nested_fields_link",
+                        data: { association_path: association_path(association.to_s), object_class: association.to_s.singularize }.merge(html_data)
+                        }.merge(html_options)
     end
 
-    def remove_nested_fields_link text = nil, options = {}
-      @template.link_to text || 'x', '',
-                        class: "#{options[:class]} remove_nested_fields_link",
-                        data: { delete_association_field_name: delete_association_field_name, object_class: @object.class.name.underscore.downcase }
+    def remove_nested_fields_link text = nil, html_options = {}
+      html_class = html_options.delete(:class) || {}
+      html_data = html_options.delete(:data) || {}
+      @template.link_to text || 'x', '', {
+                        class: "#{html_class} remove_nested_fields_link",
+                        data: { delete_association_field_name: delete_association_field_name, object_class: @object.class.name.underscore.downcase }.merge(html_data)
+                        }.merge(html_options)
     end
 
 

data/lib/nested_form_fields/version.rb

@@ -1,3 +1,3 @@
 module NestedFormFields
-  VERSION = "0.6"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested_form_fields
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: 0.6.1
 platform: ruby
 authors:
 - Nico Ritsche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails