diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-05-14 11:52:47 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-05-14 11:52:47 +0200 |
| commit | c6a8d7ee3c9803d9944db6f55778810592a36452 (patch) | |
| tree | abb3df79a0eb6d9bb4713ab73da8ddc60d8a7674 /ui/jquery.ui.draggable.js | |
| parent | 41dfb09aeb5df7d53089b58959d21207de63edbe (diff) | |
| parent | d393c8b4cb26ec34878c22202da6ba9393e0094d (diff) | |
| download | jquery-ui-c6a8d7ee3c9803d9944db6f55778810592a36452.tar.gz jquery-ui-c6a8d7ee3c9803d9944db6f55778810592a36452.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.draggable.js')
| -rw-r--r-- | ui/jquery.ui.draggable.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js index 25b256710..84077ed29 100644 --- a/ui/jquery.ui.draggable.js +++ b/ui/jquery.ui.draggable.js @@ -207,8 +207,14 @@ $.widget("ui.draggable", $.ui.mouse, { this.dropped = false; } - //if the original element is removed, don't bother to continue - if((!this.element[0] || !this.element[0].parentNode) && this.options.helper === "original") + //if the original element is no longer in the DOM don't bother to continue (see #8269) + var element = this.element[0], elementInDom = false; + while ( element && (element = element.parentNode) ) { + if (element == document ) { + elementInDom = true; + } + } + if ( !elementInDom && 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))) { |