diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2011-11-17 07:31:03 -0800 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-11-17 07:31:03 -0800 |
| commit | 69f6f585ae745af9d423151c7665b9f56f36d307 (patch) | |
| tree | 8588fac1836d2085bebceea55400c38e898e5428 /ui | |
| parent | a8a0b022cd6d21727900d335e534670165e7ddc2 (diff) | |
| parent | c3c84002898163c3c6625a4fedcddf1434f8e448 (diff) | |
| download | jquery-ui-69f6f585ae745af9d423151c7665b9f56f36d307.tar.gz jquery-ui-69f6f585ae745af9d423151c7665b9f56f36d307.zip | |
Merge pull request #501 from maljub01/master
Fixed ticket #7800 - Draggable helper="clone" doesn't remove the dragged clone if original element is removed upon drop
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/jquery.ui.core.js | 2 | ||||
| -rw-r--r-- | ui/jquery.ui.draggable.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js index 8bcc4c441..f0cf89ba7 100644 --- a/ui/jquery.ui.core.js +++ b/ui/jquery.ui.core.js @@ -255,7 +255,7 @@ $.extend( $.ui, { }, call: function( instance, name, args ) { var set = instance.plugins[ name ]; - if ( !set || !instance.element[ 0 ].parentNode ) { + if ( !set || !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) { return; } diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js index 6475ebd61..92dd13c0d 100644 --- a/ui/jquery.ui.draggable.js +++ b/ui/jquery.ui.draggable.js @@ -208,7 +208,7 @@ $.widget("ui.draggable", $.ui.mouse, { } //if the original element is removed, don't bother to continue - if(!this.element[0] || !this.element[0].parentNode) + if((!this.element[0] || !this.element[0].parentNode) && this.options.helper === "original") return false; if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) { |