summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJared A. Scheel <jared@jaredscheel.com>2012-09-06 12:30:11 -0400
committerScott González <scott.gonzalez@gmail.com>2012-09-06 12:31:04 -0400
commit65bada311322706c870c1af78529c9c23d66bff3 (patch)
treeabf287e71e951821ffa649abd7056baf8d70d442
parent1cbd513aa3f2efa78838fb57ae7251290abec993 (diff)
downloadjquery-ui-65bada311322706c870c1af78529c9c23d66bff3.tar.gz
jquery-ui-65bada311322706c870c1af78529c9c23d66bff3.zip
Draggable: Always clean up iframes. Fixes #8555 - Draggable: iframeFix option leaves iframes in DOM when using a selector.
(cherry picked from commit 19a9d57868636eb1250143ab8e69e6748e6f82f1)
-rw-r--r--ui/jquery.ui.draggable.js9
1 files changed, 4 insertions, 5 deletions
diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index 7e2aea56d..2290b7094 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -237,11 +237,10 @@ $.widget("ui.draggable", $.ui.mouse, {
},
_mouseUp: function(event) {
- if (this.options.iframeFix === true) {
- $("div.ui-draggable-iframeFix").each(function() {
- this.parentNode.removeChild(this);
- }); //Remove frame helpers
- }
+ //Remove frame helpers
+ $("div.ui-draggable-iframeFix").each(function() {
+ this.parentNode.removeChild(this);
+ });
//If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
if( $.ui.ddmanager ) $.ui.ddmanager.dragStop(this, event);