github-migration/cocoon
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Renamed the triggered events to be more clear and symmetric, and added a before-insert. As discussed in #89.

Browse Source
This commit is contained in:
Nathan Van der Auwera 2012-09-21 00:34:13 +02:00
parent 359e1ac741
commit c69c157aff
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/cocoon.js
View File

@ -5,12 +5,12 @@
content.replace(reg_exp, with_str); content.replace(reg_exp, with_str);
} }
function trigger_removal_callback(node) { function trigger_befofe_removal_callback(node) {
node.trigger('removal-callback'); node.trigger('before-remove.cocoon');
} }
function trigger_after_removal_callback(node) { function trigger_after_removal_callback(node) {
node.trigger('after-removal-callback'); node.trigger('after-remove.cocoon');
} }
$('.add_fields').live('click', function(e) { $('.add_fields').live('click', function(e) {
@ -49,18 +49,20 @@
var contentNode = $(new_content); var contentNode = $(new_content);
insertionNode.trigger('before-insert.cocoon');
// allow any of the jquery dom manipulation methods (after, before, append, prepend, etc) // 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 // 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' // code and doesn't force it to be a sibling like after/before does. default: 'before'
insertionNode[insertionMethod](contentNode); insertionNode[insertionMethod](contentNode);
insertionNode.trigger('insertion-callback'); insertionNode.trigger('after-insert.cocoon');
}); });
$('.remove_fields.dynamic').live('click', function(e) { $('.remove_fields.dynamic').live('click', function(e) {
var $this = $(this); var $this = $(this);
var trigger_node = $this.closest(".nested-fields").parent(); var trigger_node = $this.closest(".nested-fields").parent();
trigger_removal_callback(trigger_node); trigger_before_removal_callback(trigger_node);
e.preventDefault(); e.preventDefault();
$this.closest(".nested-fields").remove(); $this.closest(".nested-fields").remove();
trigger_after_removal_callback(trigger_node); trigger_after_removal_callback(trigger_node);
@ -69,7 +71,7 @@
$('.remove_fields.existing').live('click', function(e) { $('.remove_fields.existing').live('click', function(e) {
var $this = $(this); var $this = $(this);
var trigger_node = $this.closest(".nested-fields").parent().parent(); var trigger_node = $this.closest(".nested-fields").parent().parent();
trigger_removal_callback(trigger_node); trigger_before_removal_callback(trigger_node);
e.preventDefault(); e.preventDefault();
$this.prev("input[type=hidden]").val("1"); $this.prev("input[type=hidden]").val("1");
$this.closest(".nested-fields").hide(); $this.closest(".nested-fields").hide();