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

Add the (to be) inserted or (to be) removed html to the event.

Browse Source 
The event gets an extra parameter: for `before-insert` and `after-insert` the inserted piece of html. For `before-remove` and `after-remove` the removed piece of html. This way one can add effects/animations if needed.

The remove code has been refactored (less code duplication), and checks for a possible timeout, which can be set in the `before-remove` callback.
This commit is contained in:
nathanvda 2012-10-18 07:28:29 +02:00
parent 8118a45953
commit bbba9dc4c0
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,13 +7,6 @@
content.replace(reg_exp, with_str); content.replace(reg_exp, with_str);
} }
function trigger_before_removal_callback(node) {
node.trigger('cocoon:before-remove');
}
function trigger_after_removal_callback(node) {
node.trigger('cocoon:after-remove');
}
$('.add_fields').live('click', function(e) { $('.add_fields').live('click', function(e) {
e.preventDefault(); e.preventDefault();
@ -51,33 +44,38 @@
var contentNode = $(new_content); var contentNode = $(new_content);
insertionNode.trigger('cocoon:before-insert'); insertionNode.trigger('cocoon:before-insert', [contentNode]);
// 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); var addedContent = insertionNode[insertionMethod](contentNode);
insertionNode.trigger('cocoon:after-insert'); insertionNode.trigger('cocoon:after-insert', [contentNode]);
}); });
$('.remove_fields.dynamic').live('click', function(e) {
$('.remove_fields.dynamic, .remove_fields.existing').live('click', function(e) {
var $this = $(this); var $this = $(this);
var trigger_node = $this.closest(".nested-fields").parent(); var node_to_delete = $this.closest(".nested-fields");
trigger_before_removal_callback(trigger_node); var trigger_node = node_to_delete.parent();
e.preventDefault(); e.preventDefault();
trigger_node.trigger('cocoon:before-remove', [node_to_delete]);
var timeout = trigger_node.data('remove-timeout') || 0;
setTimeout(function() {
if ($this.hasClass('dynamic')) {
$this.closest(".nested-fields").remove(); $this.closest(".nested-fields").remove();
trigger_after_removal_callback(trigger_node); } else {
});
$('.remove_fields.existing').live('click', function(e) {
var $this = $(this);
var trigger_node = $this.closest(".nested-fields").parent();
trigger_before_removal_callback(trigger_node);
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();
trigger_after_removal_callback(trigger_node); }
trigger_node.trigger('cocoon:after-remove', [node_to_delete]);
}, timeout);
}); });
})(jQuery); })(jQuery);