diff options
Diffstat (limited to 'resources/jquery.ui/jquery.ui.droppable.js')
| -rw-r--r-- | resources/jquery.ui/jquery.ui.droppable.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/resources/jquery.ui/jquery.ui.droppable.js b/resources/jquery.ui/jquery.ui.droppable.js index 4b98b3ad..f17c2223 100644 --- a/resources/jquery.ui/jquery.ui.droppable.js +++ b/resources/jquery.ui/jquery.ui.droppable.js @@ -1,5 +1,5 @@ /*! - * jQuery UI Droppable 1.8.23 + * jQuery UI Droppable 1.8.24 * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -147,7 +147,7 @@ $.widget("ui.droppable", { }); $.extend($.ui.droppable, { - version: "1.8.23" + version: "1.8.24" }); $.ui.intersect = function(draggable, droppable, toleranceMode) { @@ -260,7 +260,12 @@ $.ui.ddmanager = { var parentInstance; if (this.options.greedy) { - var parent = this.element.parents(':data(droppable):eq(0)'); + // find droppable parents with same scope + var scope = this.options.scope; + var parent = this.element.parents(':data(droppable)').filter(function () { + return $.data(this, 'droppable').options.scope === scope; + }); + if (parent.length) { parentInstance = $.data(parent[0], 'droppable'); parentInstance.greedyChild = (c == 'isover' ? 1 : 0); |