diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-11-18 17:13:28 +0100 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-11-18 17:13:28 +0100 |
| commit | d6e4d4705d3d3be01ab92ea4f07a52a59ba10b5a (patch) | |
| tree | 185bf6282643a667a1e69837b106249156f71952 /ui/jquery.ui.draggable.js | |
| parent | 26603de5bafb4fe9e824b28d8f799ed0f7e0604f (diff) | |
| parent | 66f9e12797c16d8fa9078f45401f08f0f200e1bc (diff) | |
| download | jquery-ui-d6e4d4705d3d3be01ab92ea4f07a52a59ba10b5a.tar.gz jquery-ui-d6e4d4705d3d3be01ab92ea4f07a52a59ba10b5a.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.draggable.js')
| -rw-r--r-- | ui/jquery.ui.draggable.js | 2 |
1 files changed, 1 insertions, 1 deletions
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))) { |