cocoon 1.0.12 → 1.0.13

data/History.md

@@ -1,5 +1,15 @@
 # Change History / Release Notes
 
+## Version 1.0.13
+
+* A while ago we added the option to add a javascript callback on inserting a new associated object, I now made sure we can add a callback on insertion
+  and on removal of a new item. One example where this was useful for me is visible in the demo project `cocoon_simple_form_demo` where I implemented a
+  `belongs_to` relation, and either select from a list, or add a new element.
+  So: the callback-mechanism has changed, and now the callback is bound to the parent container, instead of the link itself. This is because we can also
+  bind the removal callback there (as the removal link is inserted in the html dynamically).
+
+  For more info, see the `README`.
+
 ## Version 1.0.12
 
 * using "this" in `association-insertion-node` is now possible

data/README.markdown

@@ -135,14 +135,6 @@ It takes four parameters:
 
 Optionally you could also leave out the name and supply a block that is captured to give the name (if you want to do something more complicated).
 
-There is an option to add a callback on insertion. The callback can be added as follows:
-
-    $("#todo_tasks a.add_fields").
-      data("insertion-callback",
-         function() {
-           $(this).find("textarea").autoResize({extraSpace:0}).change();
-         });
-
 
 ### link_to_remove_association
 
@@ -157,9 +149,57 @@ It takes three parameters:
 
 Optionally you could also leave out the name and supply a block that is captured to give the name (if you want to do something more complicated).
 
+### Callbacks (upon insert and remove of items)
+
+There is an option to add a callback on insertion or removal. If in your view you have the following snippet to select an `onwer`
+(we use slim for demonstration purposes)
+
+      #owner
+        #owner_from_list
+          = f.association :owner, :collection => Person.all(:order => 'name'), :prompt => 'Choose an existing owner'
+        = link_to_add_association 'add a new person as owner', f, :owner
+
+This view part will either let you select an owner from the list of persons, or show the fields to add a new person as owner.
+
+
+The callbacks can be added as follows:
+
+    $(document).ready(function() {
+        $('#owner').bind('insertion-callback',
+             function() {
+               $("#owner_from_list").hide();
+               $("#owner a.add_fields").hide();
+             });
+        $('#owner').bind("removal-callback",
+             function() {
+               $("#owner_from_list").show();
+               $("#owner a.add_fields").show();
+             });
+    });
+
+Do note that for the callbacks to work there has to be a surrounding container (div), where you can bind the callbacks to.
+
+### Control the Insertion behaviour
+
+The default insertion location is at the back of the current container. But we have added two `data`-attributes that are read to determine the insertion-node and -location.
+
+For example:
+
+    $(document).ready(function() {
+        $("#owner a.add_fields").
+          data("association-insertion-position", 'before').
+          data("association-insertion-node", 'this');
+    });
+
+
+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-position` will determine where to add it in relation with the node. Only two options: `before` or `after`.
+
+
 ### Partial
 
-The partial should be named `_<association-object_singular>_fields`, and should start with a div of class `.nested-fields`.
+The partial should be named `_<association-object_singular>_fields`, and should start with a container (e.g. `div`) of class `.nested-fields`.
 
 There is no limit to the amount of nesting, though.
 

data/VERSION

@@ -1 +1 @@
-1.0.12
+1.0.13

data/app/assets/javascripts/cocoon.js

@@ -1,10 +1,14 @@
-$(document).ready(function() {
+(function($) {
 
   function replace_in_content(content, regexp_str, with_str) {
     reg_exp = new RegExp(regexp_str);
     content.replace(reg_exp, with_str);
   }
 
+  function trigger_removal_callback(node) {
+    node.parent().parent().trigger('removal-callback');
+  }
+
   $('.add_fields').live('click', function(e) {
     e.preventDefault();
     var assoc   = $(this).data('association'),
@@ -13,6 +17,7 @@ $(document).ready(function() {
         insertionPosition = $(this).data('association-insertion-position'),
         insertionNode = $(this).data('association-insertion-node'),
         insertionCallback = $(this).data('insertion-callback'),
+        removalCallback = $(this).data('removal-callback'),
         regexp_braced = new RegExp('\\[new_' + assoc + '\\]', 'g'),
         regexp_underscord = new RegExp('_new_' + assoc + '_', 'g'),
         new_id  = new Date().getTime(),
@@ -41,21 +46,21 @@ $(document).ready(function() {
     } else {
       insertionNode.before(contentNode);
     }
-    
-    if (insertionCallback){
-      insertionCallback.call(contentNode);
-    }
+
+    $(this).parent().trigger('insertion-callback');
   });
 
   $('.remove_fields.dynamic').live('click', function(e) {
+    trigger_removal_callback($(this));
     e.preventDefault();
     $(this).closest(".nested-fields").remove();
   });
 
   $('.remove_fields.existing').live('click', function(e) {
+    trigger_removal_callback($(this));
     e.preventDefault();
     $(this).prev("input[type=hidden]").val("1");
     $(this).closest(".nested-fields").hide();
   });
 
-});
+})(jQuery);

data/cocoon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cocoon}
-  s.version = "1.0.12"
+  s.version = "1.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Van der Auwera"]
-  s.date = %q{2011-08-25}
+  s.date = %q{2011-10-12}
   s.description = %q{Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven.}
   s.email = %q{nathan@dixis.com}
   s.extra_rdoc_files = [

data/spec/spec_helper.rb

@@ -1,10 +1,17 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
 
+# only start SimpleCov on ruby 1.9.x
+if RUBY_VERSION[0..2].to_f >= 1.9
+  require 'simplecov'
+  SimpleCov.start
+end
+
+
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require "rspec/rails"
-require 'simplecov'
+
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cocoon
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 0
-  - 12
-  version: 1.0.12
+  - 13
+  version: 1.0.13
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-25 00:00:00 +02:00
+date: 2011-10-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency