diff options
| author | kborchers <kris.borchers@gmail.com> | 2011-12-01 12:53:35 -0600 |
|---|---|---|
| committer | kborchers <kris.borchers@gmail.com> | 2011-12-01 12:53:35 -0600 |
| commit | 490dc4d36b6a0bf1dac5d8a9ba86aef7c9c27ee9 (patch) | |
| tree | e65043eb657d9232888dcc1435bdd6907f990d15 /ui/jquery.ui.draggable.js | |
| parent | e206e549352684a4c30ad53e38c5544599328f2d (diff) | |
| parent | ce7918fc73c161ab237f052bad070e34250526be (diff) | |
| download | jquery-ui-490dc4d36b6a0bf1dac5d8a9ba86aef7c9c27ee9.tar.gz jquery-ui-490dc4d36b6a0bf1dac5d8a9ba86aef7c9c27ee9.zip | |
Merge branch 'master' into menubar_otherStructures
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))) { |