cocoon 1.2.8 → 1.2.9

data/README.markdown

@@ -216,7 +216,7 @@ This should be called within the form builder.
 - html_options: extra html-options (see [`link_to`](http://api.rubyonrails.org/classes/ActionView/Helpers/UrlHelper.html#method-i-link_to)
   There are some special options, the first three allow to control the placement of the new link-data:
   - `data-association-insertion-traversal` : the jquery traversal method to allow node selection relative to the link. `closest`, `next`, `children`, etc. Default: absolute selection
-  - `data-association-insertion-node` : the jquery selector of the node. Default: parent node
+  - `data-association-insertion-node` : the jquery selector of the node as string, or a function that takes the `link_to_add_association` node as the parameter and returns a node. Default: parent node
   - `data-association-insertion-method` : jquery method that inserts the new data. `before`, `after`, `append`, `prepend`, etc. Default: `before`
   - `data-association-insertion-position` : old method specifying where to insert new data.
       - this setting still works but `data-association-insertion-method` takes precedence. may be removed in a future version.
@@ -441,11 +441,11 @@ $(document).ready(function() {
 });
 ```
 
-The `association-insertion-node` will determine where to add it. You can choose any selector here, or specify this (default it is the parent-container).
+The `association-insertion-node` will determine where to add it. You can choose any selector here, or specify this. Also, you can pass a function that returns an arbitrary node. The default is the parent-container, if you don't specify anything.
 
 The `association-insertion-method` will determine where to add it in relation with the node. Any jQuery DOM Manipulation method can be set but we recommend sticking to any of the following: `before`, `after`, `append`, `prepend`. It is unknown at this time what others would do.
 
-The `association-insertion-traversal` will allow node selection to be relative to the link.
+The `association-insertion-traversal` will allow node selection to be relative to the link. 
 
 For example:
 
@@ -458,6 +458,43 @@ $(document).ready(function() {
 });
 ```
 
+(if you pass `association-insertion-node` as a function, this value will be ignored)
+
+
+Note, if you want to add templates to the specific location which is:
+
+- not a direct parent or sibling of the link
+- the link appears multiple times - for instance, inside a deeply nested form
+
+you need to specify `association-insertion-node` as a function.
+
+
+For example, suppose Task has many SubTasks in the [Example](#examples), and have subtask forms like the following.
+
+```haml
+.row
+  .col-lg-12
+    .add_sub_task= link_to_add_association 'add a new sub task', f, :sub_tasks
+.row
+  .col-lg-12
+    .sub_tasks_form
+      fields_for :sub_tasks do |sub_task_form|
+        = render 'sub_task_fields', f: sub_task_form
+```
+
+Then this will do the thing.
+
+```javascript
+$(document).ready(function() {
+    $(".add_sub_task a").
+      data("association-insertion-method", 'append').
+      data("association-insertion-node", function(link){
+        return link.closest('.row').next('.row').find('.sub_tasks_form')
+      });
+});
+```
+
+
 ### Partial
 
 If no explicit partial name is given, `cocoon` looks for a file named `_<association-object_singular>_fields`.

data/VERSION

@@ -1 +1 @@
-1.2.8
+1.2.9

data/app/assets/javascripts/cocoon.js

@@ -14,6 +14,29 @@
     return '_' + id + '_$1';
   }
 
+  var getInsertionNodeElem = function(insertionNode, insertionTraversal, $this){
+
+    if (!insertionNode){
+      return $this.parent();
+    }
+
+    if (typeof insertionNode == 'function'){
+      if(insertionTraversal){
+        console.warn('association-insertion-traversal is ignored, because association-insertion-node is given as a function.')
+      }
+      return insertionNode($this);
+    }
+
+    if(typeof insertionNode == 'string'){
+      if (insertionTraversal){
+        return $this[insertionTraversal](insertionNode);
+      }else{
+        return insertionNode == "this" ? $this : $(insertionNode);
+      }
+    }
+
+  }
+
   $(document).on('click', '.add_fields', function(e) {
     e.preventDefault();
     var $this                 = $(this),
@@ -52,27 +75,23 @@
       count -= 1;
     }
 
-    if (insertionNode){
-      if (insertionTraversal){
-        insertionNode = $this[insertionTraversal](insertionNode);
-      } else {
-        insertionNode = insertionNode == "this" ? $this : $(insertionNode);
-      }
-    } else {
-      insertionNode = $this.parent();
+    var insertionNodeElem = getInsertionNodeElem(insertionNode, insertionTraversal, $this)
+
+    if( !insertionNodeElem || (insertionNodeElem.length == 0) ){
+      console.warn("Couldn't find the element to insert the template. Make sure your `data-association-insertion-*` on `link_to_add_association` is correct.")
     }
 
     $.each(new_contents, function(i, node) {
       var contentNode = $(node);
 
-      insertionNode.trigger('cocoon:before-insert', [contentNode]);
+      insertionNodeElem.trigger('cocoon:before-insert', [contentNode]);
 
       // allow any of the jquery dom manipulation methods (after, before, append, prepend, etc)
       // to be called on the node.  allows the insertion node to be the parent of the inserted
       // code and doesn't force it to be a sibling like after/before does. default: 'before'
-      var addedContent = insertionNode[insertionMethod](contentNode);
+      var addedContent = insertionNodeElem[insertionMethod](contentNode);
 
-      insertionNode.trigger('cocoon:after-insert', [contentNode]);
+      insertionNodeElem.trigger('cocoon:after-insert', [contentNode]);
     });
   });
 

data/cocoon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cocoon"
-  s.version = "1.2.8"
+  s.version = "1.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Van der Auwera"]
-  s.date = "2016-02-25"
+  s.date = "2016-03-21"
   s.description = "Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven."
   s.email = "nathan@dixis.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoon
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -334,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2685326948987823638
+      hash: 3439139141720742655
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: