dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add bot to createAndPromote.php groups"
[lhc/web/wiklou.git]
/
resources
/
jquery.ui
/
jquery.ui.droppable.js
diff --git
a/resources/jquery.ui/jquery.ui.droppable.js
b/resources/jquery.ui/jquery.ui.droppable.js
index
8cb2bb7
..
f17c222
100644
(file)
--- 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.2
0
+ * jQuery UI Droppable 1.8.2
4
*
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
*
* 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, {
});
$.extend($.ui.droppable, {
- version: "1.8.2
0
"
+ version: "1.8.2
4
"
});
$.ui.intersect = function(draggable, droppable, toleranceMode) {
});
$.ui.intersect = function(draggable, droppable, toleranceMode) {
@@
-260,7
+260,12
@@
$.ui.ddmanager = {
var parentInstance;
if (this.options.greedy) {
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);
if (parent.length) {
parentInstance = $.data(parent[0], 'droppable');
parentInstance.greedyChild = (c == 'isover' ? 1 : 0);