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

fix merge problem

Browse Source
This commit is contained in:
John Bintz 2012-10-25 15:27:25 -04:00
parent b8f373fd5e
commit 511184a267
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@
var contentNode = $(new_content); var contentNode = $(new_content);
insertionNode.trigger('cocoon:before-insert', contentNode); 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
@ -67,7 +67,8 @@
var timeout = trigger_node.data('remove-timeout') || 0; var timeout = trigger_node.data('remove-timeout') || 0;
setTimeout(function() { setTimeout(
function() {
if ($this.hasClass('dynamic')) { if ($this.hasClass('dynamic')) {
$this.closest(".nested-fields").remove(); $this.closest(".nested-fields").remove();
} else { } else {