From 4efe1052ade3d7129d729a4a7efce6d6d93d1711 Mon Sep 17 00:00:00 2001 From: Markus Doits Date: Thu, 2 Jul 2015 15:55:40 +0200 Subject: [PATCH] Provide association name as event attribute --- CHANGELOG.rdoc | 4 ++++ vendor/assets/javascripts/jquery_nested_form.js | 8 ++++---- vendor/assets/javascripts/prototype_nested_form.js | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index a7b43591..b53a9a72 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -1,3 +1,7 @@ +master (unreleased) + +* Provide association name in all events as `event.association` + 0.3.2 (April 5, 2013) * Render blueprints inside form (thanks taavo) diff --git a/vendor/assets/javascripts/jquery_nested_form.js b/vendor/assets/javascripts/jquery_nested_form.js index 406c3051..d2d06767 100644 --- a/vendor/assets/javascripts/jquery_nested_form.js +++ b/vendor/assets/javascripts/jquery_nested_form.js @@ -51,8 +51,8 @@ var field = this.insertFields(content, assoc, link); // bubble up event upto document (through form) field - .trigger({ type: 'nested:fieldAdded', field: field }) - .trigger({ type: 'nested:fieldAdded:' + assoc, field: field }); + .trigger({ type: 'nested:fieldAdded', field: field, association: assoc }) + .trigger({ type: 'nested:fieldAdded:' + assoc, field: field, association: assoc }); return false; }, newId: function() { @@ -77,8 +77,8 @@ field.hide(); field - .trigger({ type: 'nested:fieldRemoved', field: field }) - .trigger({ type: 'nested:fieldRemoved:' + assoc, field: field }); + .trigger({ type: 'nested:fieldRemoved', field: field, association: assoc }) + .trigger({ type: 'nested:fieldRemoved:' + assoc, field: field, association: assoc }); return false; } }; diff --git a/vendor/assets/javascripts/prototype_nested_form.js b/vendor/assets/javascripts/prototype_nested_form.js index 821d1a8d..40ed7d76 100644 --- a/vendor/assets/javascripts/prototype_nested_form.js +++ b/vendor/assets/javascripts/prototype_nested_form.js @@ -48,8 +48,8 @@ document.observe('click', function(e, el) { } else { field = el.insert({ before: content }); } - field.fire('nested:fieldAdded', {field: field}); - field.fire('nested:fieldAdded:' + assoc, {field: field}); + field.fire('nested:fieldAdded', {field: field, association: assoc}); + field.fire('nested:fieldAdded:' + assoc, {field: field, association: assoc}); return false; } }); @@ -62,8 +62,8 @@ document.observe('click', function(e, el) { hidden_field.value = '1'; } var field = el.up('.fields').hide(); - field.fire('nested:fieldRemoved', {field: field}); - field.fire('nested:fieldRemoved:' + assoc, {field: field}); + field.fire('nested:fieldRemoved', {field: field, association: assoc}); + field.fire('nested:fieldRemoved:' + assoc, {field: field, association: assoc}); return false; } });